diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-15 18:09:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-15 18:09:20 +0300 |
commit | 9440c17f554424cc77aff8afadc61adbe23524d1 (patch) | |
tree | bc2b4213d845e5fd6d43eb71d21cfce28c81e440 /spec/features/snippets | |
parent | 3e0c035fe3a10436be36b4e22a4986479821b8e4 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/snippets')
-rw-r--r-- | spec/features/snippets/notes_on_personal_snippets_spec.rb | 6 | ||||
-rw-r--r-- | spec/features/snippets/user_creates_snippet_spec.rb | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/spec/features/snippets/notes_on_personal_snippets_spec.rb b/spec/features/snippets/notes_on_personal_snippets_spec.rb index 97bb4c23d25..8d55a7a64f4 100644 --- a/spec/features/snippets/notes_on_personal_snippets_spec.rb +++ b/spec/features/snippets/notes_on_personal_snippets_spec.rb @@ -4,6 +4,7 @@ require 'spec_helper' RSpec.describe 'Comments on personal snippets', :js do include NoteInteractionHelpers + include Spec::Support::Helpers::ModalHelpers let_it_be(:snippet) { create(:personal_snippet, :public) } let_it_be(:other_note) { create(:note_on_personal_snippet) } @@ -18,7 +19,6 @@ RSpec.describe 'Comments on personal snippets', :js do end before do - stub_feature_flags(bootstrap_confirmation_modals: false) sign_in user visit snippet_path(snippet) @@ -142,9 +142,11 @@ RSpec.describe 'Comments on personal snippets', :js do open_more_actions_dropdown(snippet_notes[0]) page.within("#notes-list li#note_#{snippet_notes[0].id}") do - accept_confirm { click_on 'Delete comment' } + click_on 'Delete comment' end + accept_gl_confirm(button_text: 'Delete comment') + wait_for_requests expect(page).not_to have_selector("#notes-list li#note_#{snippet_notes[0].id}") diff --git a/spec/features/snippets/user_creates_snippet_spec.rb b/spec/features/snippets/user_creates_snippet_spec.rb index c682ad06977..628468a2abe 100644 --- a/spec/features/snippets/user_creates_snippet_spec.rb +++ b/spec/features/snippets/user_creates_snippet_spec.rb @@ -16,7 +16,6 @@ RSpec.describe 'User creates snippet', :js do let(:snippet_title_field) { 'snippet-title' } before do - stub_feature_flags(bootstrap_confirmation_modals: false) sign_in(user) visit new_snippet_path |