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

2 files changed, 60 insertions, 2 deletions

diff --git a/spec/features/issues/user_creates_branch_and_merge_request_spec.rb b/spec/features/issues/user_creates_branch_and_merge_request_spec.rb
index 297cd808460..32bc851f00f 100644
--- a/spec/features/issues/user_creates_branch_and_merge_request_spec.rb
+++ b/spec/features/issues/user_creates_branch_and_merge_request_spec.rb
@@ -76,7 +76,7 @@ describe 'User creates branch and merge request on issue page', :js do
 
           visit project_issue_path(project, issue)
 
-          expect(page).to have_content('created branch 1-cherry-coloured-funk')
+          expect(page).to have_content("created merge request !1 to address this issue")
           expect(page).to have_content('mentioned in merge request !1')
         end
 
@@ -106,7 +106,7 @@ describe 'User creates branch and merge request on issue page', :js do
 
           visit project_issue_path(project, issue)
 
-          expect(page).to have_content('created branch custom-branch-name')
+          expect(page).to have_content("created merge request !1 to address this issue")
           expect(page).to have_content('mentioned in merge request !1')
         end
 
diff --git a/spec/features/issues/user_uses_quick_actions_spec.rb b/spec/features/issues/user_uses_quick_actions_spec.rb
index 5926e442f24..27cffdc5f8b 100644
--- a/spec/features/issues/user_uses_quick_actions_spec.rb
+++ b/spec/features/issues/user_uses_quick_actions_spec.rb
@@ -303,5 +303,63 @@ describe 'Issues > User uses quick actions', :js do
         end
       end
     end
+
+    describe 'create a merge request starting from an issue' do
+      let(:project) { create(:project, :public, :repository) }
+      let(:issue) { create(:issue, project: project) }
+
+      def expect_mr_quickaction(success)
+        expect(page).to have_content 'Commands applied'
+
+        if success
+          expect(page).to have_content 'created merge request'
+        else
+          expect(page).not_to have_content 'created merge request'
+        end
+      end
+
+      it "doesn't create a merge request when the branch name is invalid" do
+        add_note("/create_merge_request invalid branch name")
+
+        wait_for_requests
+
+        expect_mr_quickaction(false)
+      end
+
+      it "doesn't create a merge request when a branch with that name already exists" do
+        add_note("/create_merge_request feature")
+
+        wait_for_requests
+
+        expect_mr_quickaction(false)
+      end
+
+      it 'creates a new merge request using issue iid and title as branch name when the branch name is empty' do
+        add_note("/create_merge_request")
+
+        wait_for_requests
+
+        expect_mr_quickaction(true)
+
+        created_mr = project.merge_requests.last
+        expect(created_mr.source_branch).to eq(issue.to_branch_name)
+
+        visit project_merge_request_path(project, created_mr)
+        expect(page).to have_content %{WIP: Resolve "#{issue.title}"}
+      end
+
+      it 'creates a merge request using the given branch name' do
+        branch_name = '1-feature'
+        add_note("/create_merge_request #{branch_name}")
+
+        expect_mr_quickaction(true)
+
+        created_mr = project.merge_requests.last
+        expect(created_mr.source_branch).to eq(branch_name)
+
+        visit project_merge_request_path(project, created_mr)
+        expect(page).to have_content %{WIP: Resolve "#{issue.title}"}
+      end
+    end
   end
 end