1 files changed, 18 insertions, 12 deletions
diff --git a/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb b/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb
index 497240803d4..0b5a595acce 100644
--- a/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb
+++ b/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb
@@ -1,22 +1,26 @@
 require 'spec_helper'
 
-feature 'Merge immediately', :feature, :js do
+feature 'Merge immediately', :js do
   let(:user) { create(:user) }
-  let(:project) { create(:project, :public) }
+  let(:project) { create(:project, :public, :repository) }
 
-  let(:merge_request) do
+  let!(:merge_request) do
     create(:merge_request_with_diffs, source_project: project,
                                       author: user,
-                                      title: 'Bug NS-04')
+                                      title: 'Bug NS-04',
+                                      head_pipeline: pipeline,
+                                      source_branch: pipeline.ref)
   end
 
   let(:pipeline) do
     create(:ci_pipeline, project: project,
-                         sha: merge_request.diff_head_sha,
-                         ref: merge_request.source_branch)
+                         ref: 'master',
+                         sha: project.repository.commit('master').id)
   end
 
-  before { project.team << [user, :master] }
+  before do
+    project.team << [user, :master]
+  end
 
   context 'when there is active pipeline for merge request' do
     background do
@@ -24,19 +28,21 @@ feature 'Merge immediately', :feature, :js do
     end
 
     before do
-      login_as user
-      visit namespace_project_merge_request_path(merge_request.project.namespace, merge_request.project, merge_request)
+      sign_in user
+      visit project_merge_request_path(merge_request.project, merge_request)
     end
 
     it 'enables merge immediately' do
       page.within '.mr-widget-body' do
         find('.dropdown-toggle').click
 
-        click_link 'Merge immediately'
+        Sidekiq::Testing.fake! do
+          click_link 'Merge immediately'
 
-        expect(find('.js-merge-when-pipeline-succeeds-button')).to have_content('Merge in progress')
+          expect(find('.accept-merge-request.btn-info')).to have_content('Merge in progress')
 
-        wait_for_ajax
+          wait_for_requests
+        end
       end
     end
   end