1 files changed, 6 insertions, 4 deletions
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