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
ef53ee8b
Commit
ef53ee8b
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
06a27dc3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
7 deletions
+4
-7
ee/spec/requests/api/namespaces_spec.rb
ee/spec/requests/api/namespaces_spec.rb
+1
-1
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.
ee/spec/requests/api/namespaces_spec.rb
View file @
ef53ee8b
...
@@ -266,7 +266,7 @@ describe API::Namespaces do
...
@@ -266,7 +266,7 @@ describe API::Namespaces do
context
'when authenticated as an admin'
do
context
'when authenticated as an admin'
do
context
'when namespace is not found'
do
context
'when namespace is not found'
do
it
'returns a 404 error'
do
it
'returns a 404 error'
,
:quarantine
do
do_put
(
1111
,
admin
,
params
)
do_put
(
1111
,
admin
,
params
)
expect
(
response
).
to
have_gitlab_http_status
(
404
)
expect
(
response
).
to
have_gitlab_http_status
(
404
)
...
...
spec/features/admin/admin_users_spec.rb
View file @
ef53ee8b
...
@@ -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 @
ef53ee8b
...
@@ -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