Incorporate feedback

2 files changed, 20 insertions, 13 deletions

diff --git a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
index 8638539173b..a62d88cde86 100644
--- a/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
+++ b/spec/services/merge_requests/merge_when_build_succeeds_service_spec.rb
@@ -3,37 +3,38 @@ require 'spec_helper'
 describe MergeRequests::MergeWhenBuildSucceedsService do
   let(:user)          { create(:user) }
   let(:merge_request) { create(:merge_request) }
-  let(:mr_merge_if_green_enabled) { create(:merge_request, merge_when_build_succeeds: true,
-                                          source_branch: "source_branch", target_branch: project.default_branch,
-                                          source_project: project, target_project: project, state: "opened") }
-  let(:ci_commit) { create(:ci_commit_with_one_job, ref: mr_merge_if_green_enabled.source_branch) }
+
+  let(:mr_merge_if_green_enabled) do
+    create(:merge_request, merge_when_build_succeeds: true, merge_user: user,
+                           source_branch: "source_branch", target_branch: project.default_branch,
+                           source_project: project, target_project: project, state: "opened")
+  end
+
   let(:project) { create(:project) }
+  let(:ci_commit) { create(:ci_commit_with_one_job, ref: mr_merge_if_green_enabled.source_branch, gl_project: project) }
   let(:service) { MergeRequests::MergeWhenBuildSucceedsService.new(project, user, commit_message: 'Awesome message') }
 
-  before do
-    project.ci_commits = [ci_commit]
-    project.save!
-  end
   describe "#execute" do
     context 'first time enabling' do
       before do
         allow(merge_request).to receive(:ci_commit).and_return(ci_commit)
+        service.execute(merge_request)
       end
 
       it 'sets the params, merge_user, and flag' do
-        service.execute(merge_request)
-
         expect(merge_request).to be_valid
         expect(merge_request.merge_when_build_succeeds).to be_truthy
         expect(merge_request.merge_params).to eq commit_message: 'Awesome message'
         expect(merge_request.merge_user).to be user
+      end
 
+      it 'creates a system note' do
         note = merge_request.notes.last
-        expect(note.note).to include 'Enabled an automatic merge when the build for'
+        expect(note.note).to match /Enabled an automatic merge when the build for (\w+\/\w+@)?[0-9a-z]{8}/
       end
     end
 
-    context 'allready approved' do
+    context 'already approved' do
       let(:service) { MergeRequests::MergeWhenBuildSucceedsService.new(project, user, new_key: true) }
       let(:build)   { create(:ci_build, ref: mr_merge_if_green_enabled.source_branch) }
 
@@ -74,5 +75,10 @@ describe MergeRequests::MergeWhenBuildSucceedsService do
       expect(mr_merge_if_green_enabled.merge_params).to eq({})
       expect(mr_merge_if_green_enabled.merge_user).to be nil
     end
+
+    it 'Posts a system note' do
+      note = mr_merge_if_green_enabled.notes.last
+      expect(note.note).to include 'Cancelled the automatic merge'
+    end
   end
 end
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb
index 18b2659c1f6..9a8174f95fd 100644
--- a/spec/services/merge_requests/refresh_service_spec.rb
+++ b/spec/services/merge_requests/refresh_service_spec.rb
@@ -18,7 +18,8 @@ describe MergeRequests::RefreshService do
                               source_branch: 'master',
                               target_branch: 'feature',
                               target_project: @project,
-                              merge_when_build_succeeds: true)
+                              merge_when_build_succeeds: true,
+                              merge_user: @user)
 
       @fork_merge_request = create(:merge_request,
                                    source_project: @fork_project,