Automatic merge of gitlab-org/gitlab-ce master

spec/features/commits/user_uses_quick_actions_spec.rb

@@ -22,27 +22,6 @@ describe 'Commit > User uses quick actions', :js do
     let(:tag_message) { 'Stable release' }
     let(:truncated_commit_sha) { Commit.truncate_sha(commit.sha) }
 
-    it 'tags this commit' do
-      add_note("/tag #{tag_name} #{tag_message}")
-
-      expect(page).to have_content 'Commands applied'
-      expect(page).to have_content "tagged commit #{truncated_commit_sha}"
-      expect(page).to have_content tag_name
-
-      visit project_tag_path(project, tag_name)
-      expect(page).to have_content tag_name
-      expect(page).to have_content tag_message
-      expect(page).to have_content truncated_commit_sha
-    end
-
-    describe 'preview', :js do
-      it 'removes quick action from note and explains it' do
-        preview_note("/tag #{tag_name} #{tag_message}")
-
-        expect(page).not_to have_content '/tag'
-        expect(page).to have_content %{Tags this commit to #{tag_name} with "#{tag_message}"}
-        expect(page).to have_content tag_name
-      end
-    end
+    it_behaves_like 'tag quick action'
   end
 end

spec/features/merge_request/user_uses_quick_actions_spec.rb

@@ -56,6 +56,8 @@ describe 'Merge request > User uses quick actions', :js do
       project.add_maintainer(user)
     end
 
+    it_behaves_like 'merge quick action'
+
     describe 'toggling the WIP prefix in the title from note' do
       context 'when the current user can toggle the WIP prefix' do
         before do
@@ -103,74 +105,6 @@ describe 'Merge request > User uses quick actions', :js do
       end
     end
 
-    describe 'merging the MR from the note' do
-      context 'when the current user can merge the MR' do
-        before do
-          sign_in(user)
-          visit project_merge_request_path(project, merge_request)
-        end
-
-        it 'merges the MR' do
-          add_note("/merge")
-
-          expect(page).to have_content 'Commands applied'
-
-          expect(merge_request.reload).to be_merged
-        end
-      end
-
-      context 'when the head diff changes in the meanwhile' do
-        before do
-          merge_request.source_branch = 'another_branch'
-          merge_request.save
-          sign_in(user)
-          visit project_merge_request_path(project, merge_request)
-        end
-
-        it 'does not merge the MR' do
-          add_note("/merge")
-
-          expect(page).not_to have_content 'Your commands have been executed!'
-
-          expect(merge_request.reload).not_to be_merged
-        end
-      end
-
-      context 'when the current user cannot merge the MR' do
-        before do
-          project.add_guest(guest)
-          sign_in(guest)
-          visit project_merge_request_path(project, merge_request)
-        end
-
-        it 'does not merge the MR' do
-          add_note("/merge")
-
-          expect(page).not_to have_content 'Your commands have been executed!'
-
-          expect(merge_request.reload).not_to be_merged
-        end
-      end
-    end
-
-    describe 'adding a due date from note' do
-      before do
-        sign_in(user)
-        visit project_merge_request_path(project, merge_request)
-      end
-
-      it_behaves_like 'due quick action not available'
-    end
-
-    describe 'removing a due date from note' do
-      before do
-        sign_in(user)
-        visit project_merge_request_path(project, merge_request)
-      end
-
-      it_behaves_like 'remove_due_date action not available'
-    end
-
     describe '/target_branch command in merge request' do
       let(:another_project) { create(:project, :public, :repository) }
       let(:new_url_opts) { { merge_request: { source_branch: 'feature' } } }

spec/support/shared_examples/quick_actions/commit/tag_quick_action_shared_examples.rb

 # frozen_string_literal: true
 
 shared_examples 'tag quick action' do
+  context "post note to existing commit" do
+    it 'tags this commit' do
+      add_note("/tag #{tag_name} #{tag_message}")
+
+      expect(page).to have_content 'Commands applied'
+      expect(page).to have_content "tagged commit #{truncated_commit_sha}"
+      expect(page).to have_content tag_name
+
+      visit project_tag_path(project, tag_name)
+      expect(page).to have_content tag_name
+      expect(page).to have_content tag_message
+      expect(page).to have_content truncated_commit_sha
+    end
+  end
+
+  context 'preview', :js do
+    it 'removes quick action from note and explains it' do
+      preview_note("/tag #{tag_name} #{tag_message}")
+
+      expect(page).not_to have_content '/tag'
+      expect(page).to have_content %{Tags this commit to #{tag_name} with "#{tag_message}"}
+      expect(page).to have_content tag_name
+    end
+  end
 end

spec/support/shared_examples/quick_actions/merge_request/merge_quick_action_shared_examples.rb

 # frozen_string_literal: true
 
 shared_examples 'merge quick action' do
+  context 'when the current user can merge the MR' do
+    before do
+      sign_in(user)
+      visit project_merge_request_path(project, merge_request)
+    end
+
+    it 'merges the MR' do
+      add_note("/merge")
+
+      expect(page).to have_content 'Commands applied'
+
+      expect(merge_request.reload).to be_merged
+    end
+  end
+
+  context 'when the head diff changes in the meanwhile' do
+    before do
+      merge_request.source_branch = 'another_branch'
+      merge_request.save
+      sign_in(user)
+      visit project_merge_request_path(project, merge_request)
+    end
+
+    it 'does not merge the MR' do
+      add_note("/merge")
+
+      expect(page).not_to have_content 'Your commands have been executed!'
+
+      expect(merge_request.reload).not_to be_merged
+    end
+  end
+
+  context 'when the current user cannot merge the MR' do
+    before do
+      project.add_guest(guest)
+      sign_in(guest)
+      visit project_merge_request_path(project, merge_request)
+    end
+
+    it 'does not merge the MR' do
+      add_note("/merge")
+
+      expect(page).not_to have_content 'Your commands have been executed!'
+
+      expect(merge_request.reload).not_to be_merged
+    end
+  end
 end