1 files changed, 48 insertions, 53 deletions

diff --git a/spec/features/issues/user_uses_slash_commands_spec.rb b/spec/features/issues/user_uses_slash_commands_spec.rb
index d14c319707c..4b63cc844f3 100644
--- a/spec/features/issues/user_uses_slash_commands_spec.rb
+++ b/spec/features/issues/user_uses_slash_commands_spec.rb
@@ -1,9 +1,9 @@
 require 'rails_helper'
 
-feature 'Issues > User uses slash commands', feature: true, js: true do
-  include SlashCommandsHelpers
+feature 'Issues > User uses quick actions', js: true do
+  include QuickActionsHelpers
 
-  it_behaves_like 'issuable record that supports slash commands in its description and notes', :issue do
+  it_behaves_like 'issuable record that supports quick actions in its description and notes', :issue do
     let(:issuable) { create(:issue, project: project) }
   end
 
@@ -13,14 +13,24 @@ feature 'Issues > User uses slash commands', feature: true, js: true do
 
     before do
       project.team << [user, :master]
-      login_with(user)
-      visit namespace_project_issue_path(project.namespace, project, issue)
+      sign_in(user)
+      visit project_issue_path(project, issue)
     end
 
     after do
       wait_for_requests
     end
 
+    describe 'time tracking' do
+      let(:issue) { create(:issue, project: project) }
+
+      before do
+        visit project_issue_path(project, issue)
+      end
+
+      it_behaves_like 'issuable time tracker'
+    end
+
     describe 'adding a due date from note' do
       let(:issue) { create(:issue, project: project) }
 
@@ -41,9 +51,9 @@ feature 'Issues > User uses slash commands', feature: true, js: true do
         let(:guest) { create(:user) }
         before do
           project.team << [guest, :guest]
-          logout
-          login_with(guest)
-          visit namespace_project_issue_path(project.namespace, project, issue)
+          gitlab_sign_out
+          sign_in(guest)
+          visit project_issue_path(project, issue)
         end
 
         it 'does not create a note, and sets the due date accordingly' do
@@ -81,9 +91,9 @@ feature 'Issues > User uses slash commands', feature: true, js: true do
         let(:guest) { create(:user) }
         before do
           project.team << [guest, :guest]
-          logout
-          login_with(guest)
-          visit namespace_project_issue_path(project.namespace, project, issue)
+          gitlab_sign_out
+          sign_in(guest)
+          visit project_issue_path(project, issue)
         end
 
         it 'does not create a note, and sets the due date accordingly' do
@@ -99,65 +109,50 @@ feature 'Issues > User uses slash commands', feature: true, js: true do
       end
     end
 
-    describe 'Issuable time tracking' do
+    describe 'toggling the WIP prefix from the title from note' do
       let(:issue) { create(:issue, project: project) }
 
-      before do
-        project.team << [user, :developer]
-      end
-
-      context 'Issue' do
-        before do
-          visit namespace_project_issue_path(project.namespace, project, issue)
-        end
-
-        it_behaves_like 'issuable time tracker'
-      end
-
-      context 'Merge Request' do
-        let(:merge_request) { create(:merge_request, source_project: project) }
-
-        before do
-          visit namespace_project_merge_request_path(project.namespace, project, merge_request)
-        end
+      it 'does not recognize the command nor create a note' do
+        write_note("/wip")
 
-        it_behaves_like 'issuable time tracker'
+        expect(page).not_to have_content '/wip'
       end
     end
 
-    describe 'Issuable time tracking' do
+    describe 'mark issue as duplicate' do
       let(:issue) { create(:issue, project: project) }
+      let(:original_issue) { create(:issue, project: project) }
 
-      before do
-        project.team << [user, :developer]
-      end
+      context 'when the current user can update issues' do
+        it 'does not create a note, and marks the issue as a duplicate' do
+          write_note("/duplicate ##{original_issue.to_reference}")
 
-      context 'Issue' do
-        before do
-          visit namespace_project_issue_path(project.namespace, project, issue)
-        end
+          expect(page).not_to have_content "/duplicate #{original_issue.to_reference}"
+          expect(page).to have_content 'Commands applied'
+          expect(page).to have_content "marked this issue as a duplicate of #{original_issue.to_reference}"
 
-        it_behaves_like 'issuable time tracker'
+          expect(issue.reload).to be_closed
+        end
       end
 
-      context 'Merge Request' do
-        let(:merge_request) { create(:merge_request, source_project: project) }
-
+      context 'when the current user cannot update the issue' do
+        let(:guest) { create(:user) }
         before do
-          visit namespace_project_merge_request_path(project.namespace, project, merge_request)
+          project.team << [guest, :guest]
+          gitlab_sign_out
+          sign_in(guest)
+          visit project_issue_path(project, issue)
         end
 
-        it_behaves_like 'issuable time tracker'
-      end
-    end
-
-    describe 'toggling the WIP prefix from the title from note' do
-      let(:issue) { create(:issue, project: project) }
+        it 'does not create a note, and does not mark the issue as a duplicate' do
+          write_note("/duplicate ##{original_issue.to_reference}")
 
-      it 'does not recognize the command nor create a note' do
-        write_note("/wip")
+          expect(page).to have_content "/duplicate ##{original_issue.to_reference}"
+          expect(page).not_to have_content 'Commands applied'
+          expect(page).not_to have_content "marked this issue as a duplicate of #{original_issue.to_reference}"
 
-        expect(page).not_to have_content '/wip'
+          expect(issue.reload).to be_open
+        end
       end
     end
   end