1 files changed, 17 insertions, 8 deletions
diff --git a/spec/features/merge_request/user_merges_immediately_spec.rb b/spec/features/merge_request/user_merges_immediately_spec.rb
index d47968ebc6b..5fe9947d0df 100644
--- a/spec/features/merge_request/user_merges_immediately_spec.rb
+++ b/spec/features/merge_request/user_merges_immediately_spec.rb
@@ -3,20 +3,28 @@
 require 'spec_helper'
 
 RSpec.describe 'Merge requests > User merges immediately', :js, feature_category: :code_review_workflow do
+  include ContentEditorHelpers
+
   let(:project) { create(:project, :public, :repository) }
   let(:user) { project.creator }
   let!(:merge_request) do
-    create(:merge_request_with_diffs, source_project: project,
-                                      author: user,
-                                      title: 'Bug NS-04',
-                                      head_pipeline: pipeline,
-                                      source_branch: pipeline.ref)
+    create(
+      :merge_request_with_diffs,
+      source_project: project,
+      author: user,
+      title: 'Bug NS-04',
+      head_pipeline: pipeline,
+      source_branch: pipeline.ref
+    )
   end
 
   let(:pipeline) do
-    create(:ci_pipeline, project: project,
-                         ref: 'master',
-                         sha: project.repository.commit('master').id)
+    create(
+      :ci_pipeline,
+      project: project,
+      ref: 'master',
+      sha: project.repository.commit('master').id
+    )
   end
 
   context 'when there is active pipeline for merge request' do
@@ -25,6 +33,7 @@ RSpec.describe 'Merge requests > User merges immediately', :js, feature_category
       project.add_maintainer(user)
       sign_in(user)
       visit project_merge_request_path(project, merge_request)
+      close_rich_text_promo_popover_if_present
     end
 
     it 'enables merge immediately' do