Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
98eb956c
Commit
98eb956c
authored
Apr 24, 2019
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Put some flaky specs in quarantine
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
8b2592ee
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
spec/features/admin/admin_users_spec.rb
spec/features/admin/admin_users_spec.rb
+2
-5
spec/services/merge_requests/merge_to_ref_service_spec.rb
spec/services/merge_requests/merge_to_ref_service_spec.rb
+1
-1
No files found.
spec/features/admin/admin_users_spec.rb
View file @
98eb956c
...
@@ -34,14 +34,11 @@ describe "Admin::Users" do
...
@@ -34,14 +34,11 @@ describe "Admin::Users" do
expect
(
page
).
to
have_button
(
'Delete user and contributions'
)
expect
(
page
).
to
have_button
(
'Delete user and contributions'
)
end
end
describe
"view extra user information"
,
:js
do
describe
"view extra user information"
do
it
'
does not have the user popover open'
do
it
'
shows the user popover on hover'
,
:js
,
:quarantine
do
expect
(
page
).
not_to
have_selector
(
'#__BV_popover_1__'
)
expect
(
page
).
not_to
have_selector
(
'#__BV_popover_1__'
)
end
it
'shows the user popover on hover'
do
first_user_link
=
page
.
first
(
'.js-user-link'
)
first_user_link
=
page
.
first
(
'.js-user-link'
)
first_user_link
.
hover
first_user_link
.
hover
expect
(
page
).
to
have_selector
(
'#__BV_popover_1__'
)
expect
(
page
).
to
have_selector
(
'#__BV_popover_1__'
)
...
...
spec/services/merge_requests/merge_to_ref_service_spec.rb
View file @
98eb956c
...
@@ -104,7 +104,7 @@ describe MergeRequests::MergeToRefService do
...
@@ -104,7 +104,7 @@ describe MergeRequests::MergeToRefService do
it_behaves_like
'MergeService for target ref'
it_behaves_like
'MergeService for target ref'
end
end
context
'when merge commit with squash'
do
context
'when merge commit with squash'
,
:quarantine
do
before
do
before
do
merge_request
.
update!
(
squash:
true
,
source_branch:
'master'
,
target_branch:
'feature'
)
merge_request
.
update!
(
squash:
true
,
source_branch:
'master'
,
target_branch:
'feature'
)
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment