Commit 98eb956c authored by Rémy Coutable's avatar Rémy Coutable

Put some flaky specs in quarantine

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 8b2592ee
...@@ -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