Commit cd69e0d9 authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch 'ee-quarantine-flaky-specs' into 'master'

[EE] Put some flaky specs in quarantine

See merge request gitlab-org/gitlab-ee!11505
parents 39d01237 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)
......
...@@ -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__')
......
...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment