1 files changed, 9 insertions, 10 deletions
diff --git a/spec/features/merge_request/user_sees_deployment_widget_spec.rb b/spec/features/merge_request/user_sees_deployment_widget_spec.rb
index f744d7941f5..a298ead43db 100644
--- a/spec/features/merge_request/user_sees_deployment_widget_spec.rb
+++ b/spec/features/merge_request/user_sees_deployment_widget_spec.rb
@@ -3,15 +3,19 @@ require 'rails_helper'
 describe 'Merge request > User sees deployment widget', :js do
   describe 'when deployed to an environment' do
     let(:user) { create(:user) }
-    let(:project) { merge_request.target_project }
-    let(:merge_request) { create(:merge_request, :merged) }
+    let(:project) { create(:project, :repository) }
+    let(:merge_request) { create(:merge_request, :merged, source_project: project) }
     let(:environment) { create(:environment, project: project) }
     let(:role) { :developer }
-    let(:sha) { project.commit('master').id }
-    let!(:deployment) { create(:deployment, environment: environment, sha: sha) }
+    let(:ref) { merge_request.target_branch }
+    let(:sha) { project.commit(ref).id }
+    let(:pipeline) { create(:ci_pipeline_without_jobs, sha: sha, project: project, ref: ref) }
+    let(:build)    { create(:ci_build, :success, pipeline: pipeline) }
+    let!(:deployment) { create(:deployment, environment: environment, sha: sha, ref: ref, deployable: build) }
     let!(:manual) { }
 
     before do
+      merge_request.update!(merge_commit_sha: sha)
       project.add_user(user, role)
       sign_in(user)
       visit project_merge_request_path(project, merge_request)
@@ -26,15 +30,10 @@ describe 'Merge request > User sees deployment widget', :js do
     end
 
     context 'with stop action' do
-      let(:pipeline) { create(:ci_pipeline, project: project) }
-      let(:build) { create(:ci_build, pipeline: pipeline) }
       let(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'close_app') }
-      let(:deployment) do
-        create(:deployment, environment: environment, ref: merge_request.target_branch,
-                            sha: sha, deployable: build, on_stop: 'close_app')
-      end
 
       before do
+        deployment.update!(on_stop: manual.name)
         wait_for_requests
       end