Put some flaky specs in quarantine
Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
parent
8b2592ee74
commit
98eb956cb0
2 changed files with 3 additions and 6 deletions
|
@ -34,14 +34,11 @@ describe "Admin::Users" do
|
|||
expect(page).to have_button('Delete user and contributions')
|
||||
end
|
||||
|
||||
describe "view extra user information", :js do
|
||||
it 'does not have the user popover open' do
|
||||
describe "view extra user information" do
|
||||
it 'shows the user popover on hover', :js, :quarantine do
|
||||
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.hover
|
||||
|
||||
expect(page).to have_selector('#__BV_popover_1__')
|
||||
|
|
|
@ -104,7 +104,7 @@ describe MergeRequests::MergeToRefService do
|
|||
it_behaves_like 'MergeService for target ref'
|
||||
end
|
||||
|
||||
context 'when merge commit with squash' do
|
||||
context 'when merge commit with squash', :quarantine do
|
||||
before do
|
||||
merge_request.update!(squash: true, source_branch: 'master', target_branch: 'feature')
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue