Merge branch '40085-add-a-create_merge_request-quick-action' into 'master'

Resolve "Add a `/create_merge_request` quick action"

Closes #40085

See merge request gitlab-org/gitlab-ce!22485

1 files changed, 9 insertions, 1 deletions

diff --git a/spec/services/merge_requests/create_from_issue_service_spec.rb b/spec/services/merge_requests/create_from_issue_service_spec.rb
index b1882df732d..393299cce00 100644
--- a/spec/services/merge_requests/create_from_issue_service_spec.rb
+++ b/spec/services/merge_requests/create_from_issue_service_spec.rb
@@ -61,7 +61,15 @@ describe MergeRequests::CreateFromIssueService do
       expect(project.repository.branch_exists?(custom_source_branch)).to be_truthy
     end
 
-    it 'creates a system note' do
+    it 'creates the new_merge_request system note' do
+      expect(SystemNoteService).to receive(:new_merge_request).with(issue, project, user, instance_of(MergeRequest))
+
+      service.execute
+    end
+
+    it 'creates the new_issue_branch system note when the branch could be created but the merge_request cannot be created' do
+      project.project_feature.update!(merge_requests_access_level: ProjectFeature::DISABLED)
+
       expect(SystemNoteService).to receive(:new_issue_branch).with(issue, project, user, issue.to_branch_name)
 
       service.execute