Add latest changes from gitlab-org/gitlab@16-2-stable-eev16.2.0-rc42

17 files changed, 144 insertions, 74 deletions

diff --git a/spec/support/shared_examples/features/cascading_settings_shared_examples.rb b/spec/support/shared_examples/features/cascading_settings_shared_examples.rb
index cb80751ff49..2bda352c11f 100644
--- a/spec/support/shared_examples/features/cascading_settings_shared_examples.rb
+++ b/spec/support/shared_examples/features/cascading_settings_shared_examples.rb
@@ -24,14 +24,6 @@ RSpec.shared_examples 'a cascading setting' do
 
     include_examples 'subgroup settings are disabled'
 
-    context 'when use_traversal_ids_for_ancestors is disabled' do
-      before do
-        stub_feature_flags(use_traversal_ids_for_ancestors: false)
-      end
-
-      include_examples 'subgroup settings are disabled'
-    end
-
     it 'does not show enforcement checkbox in subgroups' do
       visit subgroup_path
 
diff --git a/spec/support/shared_examples/features/content_editor_shared_examples.rb b/spec/support/shared_examples/features/content_editor_shared_examples.rb
index f70288168d7..254bc3c83ac 100644
--- a/spec/support/shared_examples/features/content_editor_shared_examples.rb
+++ b/spec/support/shared_examples/features/content_editor_shared_examples.rb
@@ -506,6 +506,8 @@ RSpec.shared_examples 'edits content using the content editor' do |params = { wi
       switch_to_content_editor
 
       type_in_content_editor :enter
+
+      stub_feature_flags(disable_all_mention: false)
     end
 
     if params[:with_expanded_references]
@@ -545,12 +547,32 @@ RSpec.shared_examples 'edits content using the content editor' do |params = { wi
       expect(page).to have_text('@abc123')
     end
 
+    context 'when `disable_all_mention` is enabled' do
+      before do
+        stub_feature_flags(disable_all_mention: true)
+      end
+
+      it 'shows suggestions for members with descriptions' do
+        type_in_content_editor '@a'
+
+        expect(find(suggestions_dropdown)).to have_text('abc123')
+        expect(find(suggestions_dropdown)).not_to have_text('All Group Members')
+
+        type_in_content_editor 'bc'
+
+        send_keys [:arrow_down, :enter]
+
+        expect(page).not_to have_css(suggestions_dropdown)
+        expect(page).to have_text('@abc123')
+      end
+    end
+
     it 'shows suggestions for merge requests' do
       type_in_content_editor '!'
 
       expect(find(suggestions_dropdown)).to have_text('My Cool Merge Request')
 
-      send_keys :enter
+      send_keys [:arrow_down, :enter]
 
       expect(page).not_to have_css(suggestions_dropdown)
       expect(page).to have_text('!1')
@@ -561,7 +583,7 @@ RSpec.shared_examples 'edits content using the content editor' do |params = { wi
 
       expect(find(suggestions_dropdown)).to have_text('My Cool Linked Issue')
 
-      send_keys :enter
+      send_keys [:arrow_down, :enter]
 
       expect(page).not_to have_css(suggestions_dropdown)
       expect(page).to have_text('#1')
@@ -572,7 +594,7 @@ RSpec.shared_examples 'edits content using the content editor' do |params = { wi
 
       expect(find(suggestions_dropdown)).to have_text('My Cool Milestone')
 
-      send_keys :enter
+      send_keys [:arrow_down, :enter]
 
       expect(page).not_to have_css(suggestions_dropdown)
       expect(page).to have_text('%My Cool Milestone')
@@ -584,7 +606,7 @@ RSpec.shared_examples 'edits content using the content editor' do |params = { wi
       expect(find(suggestions_dropdown)).to have_text('🙂 slight_smile')
       expect(find(suggestions_dropdown)).to have_text('😸 smile_cat')
 
-      send_keys :enter
+      send_keys [:arrow_down, :enter]
 
       expect(page).not_to have_css(suggestions_dropdown)
 
@@ -614,7 +636,7 @@ RSpec.shared_examples 'edits content using the content editor' do |params = { wi
     end
 
     def dropdown_scroll_top
-      evaluate_script("document.querySelector('#{suggestions_dropdown} .gl-dropdown-inner').scrollTop")
+      evaluate_script("document.querySelector('#{suggestions_dropdown}').scrollTop")
     end
   end
 end
diff --git a/spec/support/shared_examples/features/discussion_comments_shared_example.rb b/spec/support/shared_examples/features/discussion_comments_shared_example.rb
index d6f1efc09fc..430a8ac39d7 100644
--- a/spec/support/shared_examples/features/discussion_comments_shared_example.rb
+++ b/spec/support/shared_examples/features/discussion_comments_shared_example.rb
@@ -3,8 +3,8 @@
 RSpec.shared_examples 'thread comments for commit and snippet' do |resource_name|
   let(:form_selector) { '.js-main-target-form' }
   let(:dropdown_selector) { "#{form_selector} .comment-type-dropdown" }
-  let(:toggle_selector) { "#{dropdown_selector} .gl-dropdown-toggle" }
-  let(:menu_selector) { "#{dropdown_selector} .dropdown-menu" }
+  let(:toggle_selector) { "#{dropdown_selector} .gl-new-dropdown-toggle" }
+  let(:menu_selector) { "#{dropdown_selector} .gl-new-dropdown-contents" }
   let(:submit_selector) { "#{form_selector} .js-comment-submit-button > button:first-child" }
   let(:close_selector) { "#{form_selector} .btn-comment-and-close" }
   let(:comments_selector) { '.timeline > .note.timeline-entry:not(.being-posted)' }
@@ -63,33 +63,6 @@ RSpec.shared_examples 'thread comments for commit and snippet' do |resource_name
       expect(page).not_to have_selector menu_selector
     end
 
-    it 'clicking the ul padding or divider should not change the text' do
-      execute_script("document.querySelector('#{menu_selector}').click()")
-
-      # on issues page, the menu closes when clicking anywhere, on other pages it will
-      # remain open if clicking divider or menu padding, but should not change button action
-      #
-      # if dropdown menu is not toggled (and also not present),
-      # it's "issue-type" dropdown
-      if first(menu_selector, minimum: 0).nil?
-        expect(find(dropdown_selector)).to have_content 'Comment'
-
-        find(toggle_selector).click
-        execute_script("document.querySelector('#{menu_selector} .dropdown-divider').click()")
-      else
-        execute_script("document.querySelector('#{menu_selector}').click()")
-
-        expect(page).to have_selector menu_selector
-        expect(find(dropdown_selector)).to have_content 'Comment'
-
-        execute_script("document.querySelector('#{menu_selector} .dropdown-divider').click()")
-
-        expect(page).to have_selector menu_selector
-      end
-
-      expect(find(dropdown_selector)).to have_content 'Comment'
-    end
-
     describe 'when selecting "Start thread"' do
       before do
         find("#{menu_selector} li", match: :first)
@@ -177,21 +150,27 @@ RSpec.shared_examples 'thread comments for commit and snippet' do |resource_name
 end
 
 RSpec.shared_examples 'thread comments for issue, epic and merge request' do |resource_name|
+  include ContentEditorHelpers
+
   let(:form_selector) { '.js-main-target-form' }
-  let(:dropdown_selector) { "#{form_selector} [data-testid='comment-button']" }
-  let(:submit_button_selector) { "#{dropdown_selector} .split-content-button" }
-  let(:toggle_selector) { "#{dropdown_selector} .dropdown-toggle-split" }
-  let(:menu_selector) { "#{dropdown_selector} .dropdown-menu" }
+  let(:dropdown_selector) { "#{form_selector} .comment-type-dropdown" }
+  let(:toggle_selector) { "#{dropdown_selector} .gl-new-dropdown-toggle" }
+  let(:menu_selector) { "#{dropdown_selector} .gl-new-dropdown-contents" }
+  let(:submit_selector) { "#{form_selector} .js-comment-submit-button > button:first-child" }
   let(:close_selector) { "#{form_selector} .btn-comment-and-close" }
   let(:comments_selector) { '.timeline > .note.timeline-entry:not(.being-posted)' }
   let(:comment) { 'My comment' }
 
+  before do
+    close_rich_text_promo_popover_if_present
+  end
+
   it 'clicking "Comment" will post a comment' do
     expect(page).to have_selector toggle_selector
 
     find("#{form_selector} .note-textarea").send_keys(comment)
 
-    find(submit_button_selector).click
+    find(submit_selector).click
 
     wait_for_all_requests
 
@@ -260,7 +239,7 @@ RSpec.shared_examples 'thread comments for issue, epic and merge request' do |re
 
       describe 'creating a thread' do
         before do
-          find(submit_button_selector).click
+          find(submit_selector).click
           wait_for_requests
 
           find(comments_selector, match: :first)
@@ -284,7 +263,7 @@ RSpec.shared_examples 'thread comments for issue, epic and merge request' do |re
           expect(new_comment).to have_css('.discussion-with-resolve-btn')
         end
 
-        if resource_name =~ /(issue|merge request)/
+        if /(issue|merge request)/.match?(resource_name)
           it 'can be replied to' do
             submit_reply('some text')
 
@@ -366,14 +345,14 @@ RSpec.shared_examples 'thread comments for issue, epic and merge request' do |re
           end
 
           it 'updates the submit button text and closes the dropdown' do
-            button = find(submit_button_selector)
+            button = find(submit_selector)
 
             expect(button).to have_content 'Comment'
 
             expect(page).not_to have_selector menu_selector
           end
 
-          if resource_name =~ /(issue|merge request)/
+          if /(issue|merge request)/.match?(resource_name)
             it 'updates the close button text' do
               expect(find(close_selector)).to have_content "Comment & close #{resource_name}"
             end
@@ -402,7 +381,7 @@ RSpec.shared_examples 'thread comments for issue, epic and merge request' do |re
     end
   end
 
-  if resource_name =~ /(issue|merge request)/
+  if /(issue|merge request)/.match?(resource_name)
     describe "on a closed #{resource_name}" do
       before do
         find("#{form_selector} .js-note-target-close").click
diff --git a/spec/support/shared_examples/features/editable_merge_request_shared_examples.rb b/spec/support/shared_examples/features/editable_merge_request_shared_examples.rb
index 14e53dc8655..f802404518b 100644
--- a/spec/support/shared_examples/features/editable_merge_request_shared_examples.rb
+++ b/spec/support/shared_examples/features/editable_merge_request_shared_examples.rb
@@ -125,7 +125,11 @@ RSpec.shared_examples 'an editable merge request' do
     it 'allows to unselect "Remove source branch"', :js do
       expect(merge_request.merge_params['force_remove_source_branch']).to be_truthy
 
-      visit edit_project_merge_request_path(target_project, merge_request)
+      begin
+        visit edit_project_merge_request_path(target_project, merge_request)
+      rescue Selenium::WebDriver::Error::UnexpectedAlertOpenError
+      end
+
       uncheck 'Delete source branch when merge request is accepted'
 
       click_button 'Save changes'
diff --git a/spec/support/shared_examples/features/inviting_members_shared_examples.rb b/spec/support/shared_examples/features/inviting_members_shared_examples.rb
index 2eca2a72997..178f85cb85b 100644
--- a/spec/support/shared_examples/features/inviting_members_shared_examples.rb
+++ b/spec/support/shared_examples/features/inviting_members_shared_examples.rb
@@ -159,6 +159,40 @@ RSpec.shared_examples 'inviting members' do |snowplow_invite_label|
         end
       end
 
+      context 'when a user already exists, and private email is used' do
+        it 'fails with an error', :js do
+          visit subentity_members_page_path
+
+          invite_member(user2.email, role: role)
+
+          invite_modal = page.find(invite_modal_selector)
+          expect(invite_modal).to have_content "#{user2.email}: Access level should be greater than or equal to " \
+                                               "Developer inherited membership from group #{group.name}"
+
+          page.refresh
+
+          page.within find_invited_member_row(user2.name) do
+            expect(page).to have_content('Developer')
+            expect(page).not_to have_button('Developer')
+          end
+        end
+
+        it 'does not allow inviting of an email that has spaces', :js do
+          visit subentity_members_page_path
+
+          click_on _('Invite members')
+
+          page.within invite_modal_selector do
+            choose_options(role, nil)
+            find(member_dropdown_selector).set("#{user2.email} ")
+            wait_for_requests
+
+            expect(page).to have_content('No matches found')
+            expect(page).not_to have_button("#{user2.email} ")
+          end
+        end
+      end
+
       context 'when there are multiple users invited with errors' do
         let_it_be(:user3) { create(:user) }
 
diff --git a/spec/support/shared_examples/features/milestone_editing_shared_examples.rb b/spec/support/shared_examples/features/milestone_editing_shared_examples.rb
index d21bf62ecfa..53498a1bb39 100644
--- a/spec/support/shared_examples/features/milestone_editing_shared_examples.rb
+++ b/spec/support/shared_examples/features/milestone_editing_shared_examples.rb
@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 RSpec.shared_examples 'milestone handling version conflicts' do
-  it 'warns about version conflict when milestone has been updated in the background' do
+  it 'warns about version conflict when milestone has been updated in the background', :js do
+    wait_for_all_requests
+
     # Update the milestone in the background in order to trigger a version conflict
     milestone.update!(title: "New title")
 
diff --git a/spec/support/shared_examples/features/nav_sidebar_shared_examples.rb b/spec/support/shared_examples/features/nav_sidebar_shared_examples.rb
new file mode 100644
index 00000000000..34821fb9eda
--- /dev/null
+++ b/spec/support/shared_examples/features/nav_sidebar_shared_examples.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'page has active tab' do |title|
+  it "activates #{title} tab" do
+    expect(page).to have_selector('.sidebar-top-level-items > li.active', count: 1)
+    expect(find('.sidebar-top-level-items > li.active')).to have_content(title)
+  end
+end
+
+RSpec.shared_examples 'page has active sub tab' do |title|
+  it "activates #{title} sub tab" do
+    expect(page).to have_selector('.sidebar-sub-level-items  > li.active:not(.fly-out-top-item)', count: 1)
+    expect(find('.sidebar-sub-level-items > li.active:not(.fly-out-top-item)'))
+      .to have_content(title)
+  end
+end
diff --git a/spec/support/shared_examples/features/packages_shared_examples.rb b/spec/support/shared_examples/features/packages_shared_examples.rb
index 5126e849c2e..8e8e7e8ad05 100644
--- a/spec/support/shared_examples/features/packages_shared_examples.rb
+++ b/spec/support/shared_examples/features/packages_shared_examples.rb
@@ -9,7 +9,7 @@ RSpec.shared_examples 'packages list' do |check_project_name: false|
 
       expect(package_row).to have_content(pkg.name)
       expect(package_row).to have_content(pkg.version)
-      expect(package_row).to have_content(pkg.project.path) if check_project_name
+      expect(package_row).to have_content(pkg.project.name) if check_project_name
     end
   end
 
diff --git a/spec/support/shared_examples/features/project_upload_files_shared_examples.rb b/spec/support/shared_examples/features/project_upload_files_shared_examples.rb
index 7737f8a73c5..806ffdad2f1 100644
--- a/spec/support/shared_examples/features/project_upload_files_shared_examples.rb
+++ b/spec/support/shared_examples/features/project_upload_files_shared_examples.rb
@@ -4,8 +4,8 @@ RSpec.shared_examples 'it uploads and commits a new text file' do |drop: false|
   it 'uploads and commits a new text file', :js do
     find('.add-to-tree').click
 
-    page.within('.dropdown-menu') do
-      click_link('Upload file')
+    page.within('.repo-breadcrumb') do
+      click_button('Upload file')
 
       wait_for_requests
     end
@@ -40,8 +40,8 @@ RSpec.shared_examples 'it uploads and commits a new image file' do |drop: false|
   it 'uploads and commits a new image file', :js do
     find('.add-to-tree').click
 
-    page.within('.dropdown-menu') do
-      click_link('Upload file')
+    page.within('.repo-breadcrumb') do
+      click_button('Upload file')
 
       wait_for_requests
     end
@@ -70,8 +70,8 @@ RSpec.shared_examples 'it uploads and commits a new pdf file' do |drop: false|
   it 'uploads and commits a new pdf file', :js do
     find('.add-to-tree').click
 
-    page.within('.dropdown-menu') do
-      click_link('Upload file')
+    page.within('.repo-breadcrumb') do
+      click_button('Upload file')
 
       wait_for_requests
     end
@@ -111,7 +111,7 @@ RSpec.shared_examples 'it uploads and commits a new file to a forked project' do
     wait_for_all_requests
 
     find('.add-to-tree').click
-    click_link('Upload file')
+    click_button('Upload file')
 
     if drop
       find(".upload-dropzone-card").drop(File.join(Rails.root, 'spec', 'fixtures', 'doc_sample.txt'))
@@ -149,7 +149,7 @@ RSpec.shared_examples 'it uploads a file to a sub-directory' do |drop: false|
     end
 
     find('.add-to-tree').click
-    click_link('Upload file')
+    click_button('Upload file')
 
     if drop
       find(".upload-dropzone-card").drop(File.join(Rails.root, 'spec', 'fixtures', 'doc_sample.txt'))
diff --git a/spec/support/shared_examples/features/resolving_discussions_in_issues_shared_examples.rb b/spec/support/shared_examples/features/resolving_discussions_in_issues_shared_examples.rb
index 337b3f3cbd0..7e3b507c1ba 100644
--- a/spec/support/shared_examples/features/resolving_discussions_in_issues_shared_examples.rb
+++ b/spec/support/shared_examples/features/resolving_discussions_in_issues_shared_examples.rb
@@ -24,6 +24,6 @@ RSpec.shared_examples 'creating an issue for a thread' do
     expect(discussion.resolved?).to eq(true)
 
     # Issue title inludes MR title
-    expect(page).to have_content(%Q(Follow-up from "#{merge_request.title}"))
+    expect(page).to have_content(%(Follow-up from "#{merge_request.title}"))
   end
 end
diff --git a/spec/support/shared_examples/features/rss_shared_examples.rb b/spec/support/shared_examples/features/rss_shared_examples.rb
index f6566214e32..a6b9c98923a 100644
--- a/spec/support/shared_examples/features/rss_shared_examples.rb
+++ b/spec/support/shared_examples/features/rss_shared_examples.rb
@@ -2,20 +2,20 @@
 
 RSpec.shared_examples "an autodiscoverable RSS feed with current_user's feed token" do
   it "has an RSS autodiscovery link tag with current_user's feed token" do
-    expect(page).to have_css("link[type*='atom+xml'][href*='feed_token=#{user.feed_token}']", visible: false)
+    expect(page).to have_css("link[type*='atom+xml'][href*='feed_token=glft-'][href*='-#{user.id}']", visible: false)
   end
 end
 
 RSpec.shared_examples "it has an RSS button with current_user's feed token" do
   it "shows the RSS button with current_user's feed token" do
     expect(page)
-      .to have_css("a:has([data-testid='rss-icon'])[href*='feed_token=#{user.feed_token}']")
+      .to have_css("a:has([data-testid='rss-icon'])[href*='feed_token=glft-'][href*='-#{user.id}']")
   end
 end
 
 RSpec.shared_examples "it has an RSS link with current_user's feed token" do
   it "shows the RSS link with current_user's feed token" do
-    expect(page).to have_link 'Subscribe to RSS feed', href: /feed_token=#{user.feed_token}/
+    expect(page).to have_link 'Subscribe to RSS feed', href: /feed_token=glft-.*-#{user.id}/
   end
 end
 
@@ -51,11 +51,17 @@ RSpec.shared_examples "updates atom feed link" do |type|
     auto_discovery_params = CGI.parse(URI.parse(auto_discovery_link[:href]).query)
 
     expected = {
-      'feed_token' => [user.feed_token],
       'assignee_id' => [user.id.to_s]
     }
 
     expect(params).to include(expected)
+    feed_token_param = params['feed_token']
+    expect(feed_token_param).to match([Gitlab::Auth::AuthFinders::PATH_DEPENDENT_FEED_TOKEN_REGEX])
+    expect(feed_token_param.first).to end_with(user.id.to_s)
+
     expect(auto_discovery_params).to include(expected)
+    feed_token_param = auto_discovery_params['feed_token']
+    expect(feed_token_param).to match([Gitlab::Auth::AuthFinders::PATH_DEPENDENT_FEED_TOKEN_REGEX])
+    expect(feed_token_param.first).to end_with(user.id.to_s)
   end
 end
diff --git a/spec/support/shared_examples/features/sidebar/sidebar_due_date_shared_examples.rb b/spec/support/shared_examples/features/sidebar/sidebar_due_date_shared_examples.rb
index 206116d66c8..865f5aff476 100644
--- a/spec/support/shared_examples/features/sidebar/sidebar_due_date_shared_examples.rb
+++ b/spec/support/shared_examples/features/sidebar/sidebar_due_date_shared_examples.rb
@@ -26,7 +26,7 @@ RSpec.shared_examples 'date sidebar widget' do
 
         wait_for_requests
 
-        expect(page).to have_content(today.to_s(:medium))
+        expect(page).to have_content(today.to_fs(:medium))
         expect(due_date_value.text).to have_content Time.current.strftime('%b %-d, %Y')
       end
     end
diff --git a/spec/support/shared_examples/features/wiki/user_creates_wiki_page_shared_examples.rb b/spec/support/shared_examples/features/wiki/user_creates_wiki_page_shared_examples.rb
index ed885d7a226..c3df89c8002 100644
--- a/spec/support/shared_examples/features/wiki/user_creates_wiki_page_shared_examples.rb
+++ b/spec/support/shared_examples/features/wiki/user_creates_wiki_page_shared_examples.rb
@@ -6,6 +6,7 @@
 
 RSpec.shared_examples 'User creates wiki page' do
   include WikiHelpers
+  include ContentEditorHelpers
 
   before do
     sign_in(user)
@@ -18,6 +19,7 @@ RSpec.shared_examples 'User creates wiki page' do
       wait_for_svg_to_be_loaded(example)
 
       click_link "Create your first page"
+      close_rich_text_promo_popover_if_present
     end
 
     it 'shows all available formats in the dropdown' do
@@ -190,6 +192,7 @@ RSpec.shared_examples 'User creates wiki page' do
     context "via the `new wiki page` page", :js do
       it "creates a page with a single word" do
         click_link("New page")
+        close_rich_text_promo_popover_if_present
 
         page.within(".wiki-form") do
           fill_in(:wiki_title, with: "foo")
@@ -208,6 +211,7 @@ RSpec.shared_examples 'User creates wiki page' do
 
       it "creates a page with spaces in the name", :js do
         click_link("New page")
+        close_rich_text_promo_popover_if_present
 
         page.within(".wiki-form") do
           fill_in(:wiki_title, with: "Spaces in the name")
@@ -226,6 +230,7 @@ RSpec.shared_examples 'User creates wiki page' do
 
       it "creates a page with hyphens in the name", :js do
         click_link("New page")
+        close_rich_text_promo_popover_if_present
 
         page.within(".wiki-form") do
           fill_in(:wiki_title, with: "hyphens-in-the-name")
@@ -249,6 +254,7 @@ RSpec.shared_examples 'User creates wiki page' do
       context 'when a server side validation error is returned' do
         it "still displays edit form", :js do
           click_link("New page")
+          close_rich_text_promo_popover_if_present
 
           page.within(".wiki-form") do
             fill_in(:wiki_title, with: "home")
@@ -266,6 +272,7 @@ RSpec.shared_examples 'User creates wiki page' do
 
     it "shows the emoji autocompletion dropdown", :js do
       click_link("New page")
+      close_rich_text_promo_popover_if_present
 
       page.within(".wiki-form") do
         find("#wiki_content").native.send_keys("")
diff --git a/spec/support/shared_examples/features/wiki/user_previews_wiki_changes_shared_examples.rb b/spec/support/shared_examples/features/wiki/user_previews_wiki_changes_shared_examples.rb
index ca68df9a89b..827c875494a 100644
--- a/spec/support/shared_examples/features/wiki/user_previews_wiki_changes_shared_examples.rb
+++ b/spec/support/shared_examples/features/wiki/user_previews_wiki_changes_shared_examples.rb
@@ -5,6 +5,8 @@
 #   user
 
 RSpec.shared_examples 'User previews wiki changes' do
+  include ContentEditorHelpers
+
   let(:wiki_page) { build(:wiki_page, wiki: wiki) }
 
   before do
@@ -74,6 +76,7 @@ RSpec.shared_examples 'User previews wiki changes' do
     before do
       wiki_page.create # rubocop:disable Rails/SaveBang
       visit wiki_page_path(wiki, wiki_page, action: :edit)
+      close_rich_text_promo_popover_if_present
     end
 
     it_behaves_like 'relative links' do
diff --git a/spec/support/shared_examples/features/wiki/user_updates_wiki_page_shared_examples.rb b/spec/support/shared_examples/features/wiki/user_updates_wiki_page_shared_examples.rb
index 91cacaf9209..d06f04db1ce 100644
--- a/spec/support/shared_examples/features/wiki/user_updates_wiki_page_shared_examples.rb
+++ b/spec/support/shared_examples/features/wiki/user_updates_wiki_page_shared_examples.rb
@@ -6,6 +6,8 @@
 
 RSpec.shared_examples 'User updates wiki page' do
   include WikiHelpers
+  include ContentEditorHelpers
+
   let(:diagramsnet_url) { 'https://embed.diagrams.net' }
 
   before do
@@ -21,6 +23,7 @@ RSpec.shared_examples 'User updates wiki page' do
       wait_for_svg_to_be_loaded(example)
 
       click_link "Create your first page"
+      close_rich_text_promo_popover_if_present
     end
 
     it 'redirects back to the home edit page' do
@@ -67,6 +70,7 @@ RSpec.shared_examples 'User updates wiki page' do
       visit(wiki_path(wiki))
 
       click_link('Edit')
+      close_rich_text_promo_popover_if_present
     end
 
     it 'updates a page', :js do
@@ -126,10 +130,6 @@ RSpec.shared_examples 'User updates wiki page' do
       expect(page).to have_content('Updated Wiki Content')
     end
 
-    it 'focuses on the content field', :js do
-      expect(page).to have_selector '.note-textarea:focus'
-    end
-
     it 'cancels editing of a page' do
       page.within(:css, '.wiki-form .form-actions') do
         click_on('Cancel')
@@ -164,6 +164,7 @@ RSpec.shared_examples 'User updates wiki page' do
 
     before do
       visit wiki_page_path(wiki, wiki_page, action: :edit)
+      close_rich_text_promo_popover_if_present
     end
 
     it 'moves the page to the root folder', :js do
@@ -234,6 +235,7 @@ RSpec.shared_examples 'User updates wiki page' do
       stub_application_setting(wiki_page_max_content_bytes: 10)
 
       visit wiki_page_path(wiki_page.wiki, wiki_page, action: :edit)
+      close_rich_text_promo_popover_if_present
     end
 
     it 'allows changing the title if the content does not change', :js do
diff --git a/spec/support/shared_examples/features/wiki/user_views_wiki_page_shared_examples.rb b/spec/support/shared_examples/features/wiki/user_views_wiki_page_shared_examples.rb
index 767caffd417..3ee7725305e 100644
--- a/spec/support/shared_examples/features/wiki/user_views_wiki_page_shared_examples.rb
+++ b/spec/support/shared_examples/features/wiki/user_views_wiki_page_shared_examples.rb
@@ -6,6 +6,7 @@
 
 RSpec.shared_examples 'User views a wiki page' do
   include WikiHelpers
+  include ContentEditorHelpers
 
   let(:path) { 'image.png' }
   let(:wiki_page) do
@@ -269,6 +270,7 @@ RSpec.shared_examples 'User views a wiki page' do
     wait_for_svg_to_be_loaded
 
     click_link "Create your first page"
+    close_rich_text_promo_popover_if_present
 
     expect(page).to have_content('Create New Page')
   end
diff --git a/spec/support/shared_examples/features/work_items_shared_examples.rb b/spec/support/shared_examples/features/work_items_shared_examples.rb
index 128bd28410c..4c15b682458 100644
--- a/spec/support/shared_examples/features/work_items_shared_examples.rb
+++ b/spec/support/shared_examples/features/work_items_shared_examples.rb
@@ -166,7 +166,8 @@ RSpec.shared_examples 'work items comments' do |type|
 end
 
 RSpec.shared_examples 'work items assignees' do
-  it 'successfully assigns the current user by searching' do
+  it 'successfully assigns the current user by searching',
+    quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/413074' do
     # The button is only when the mouse is over the input
     find('[data-testid="work-item-assignees-input"]').fill_in(with: user.username)
     wait_for_requests