Automatic merge of gitlab-org/gitlab-ce master

spec/features/issues/user_uses_quick_actions_spec.rb

@@ -60,34 +60,7 @@ describe 'Issues > User uses quick actions', :js do
     it_behaves_like 'remove_due_date quick action'
     it_behaves_like 'duplicate quick action'
     it_behaves_like 'create_merge_request quick action'
-
-    describe 'adding a due date from note' do
-      let(:issue) { create(:issue, project: project) }
-
-      it_behaves_like 'due quick action available and date can be added'
-
-      context 'when the current user cannot update the due date' do
-        let(:guest) { create(:user) }
-        before do
-          project.add_guest(guest)
-          gitlab_sign_out
-          sign_in(guest)
-          visit project_issue_path(project, issue)
-        end
-
-        it_behaves_like 'due quick action not available'
-      end
-    end
-
-    describe 'toggling the WIP prefix from the title from note' do
-      let(:issue) { create(:issue, project: project) }
-
-      it 'does not recognize the command nor create a note' do
-        add_note("/wip")
-
-        expect(page).not_to have_content '/wip'
-      end
-    end
+    it_behaves_like 'due quick action'
 
     describe 'adding a weight from a note' do
       let(:issue) { create(:issue, project: project) }

spec/support/shared_examples/quick_actions/issue/due_quick_action_shared_examples.rb

 # frozen_string_literal: true
 
-shared_examples 'due quick action not available' do
-  it 'does not set the due date' do
-    add_note('/due 2016-08-28')
-
-    expect(page).not_to have_content 'Commands applied'
-    expect(page).not_to have_content '/due 2016-08-28'
-  end
-end
-
-shared_examples 'due quick action available and date can be added' do
+shared_examples 'due quick action' do
+  context 'due quick action available and date can be added' do
     it 'sets the due date accordingly' do
       add_note('/due 2016-08-28')
 
@@ -22,4 +14,22 @@ shared_examples 'due quick action available and date can be added' do
         expect(page).to have_content 'Aug 28, 2016'
       end
     end
+  end
+
+  context 'due quick action not available' do
+    let(:guest) { create(:user) }
+    before do
+      project.add_guest(guest)
+      gitlab_sign_out
+      sign_in(guest)
+      visit project_issue_path(project, issue)
+    end
+
+    it 'does not set the due date' do
+      add_note('/due 2016-08-28')
+
+      expect(page).not_to have_content 'Commands applied'
+      expect(page).not_to have_content '/due 2016-08-28'
+    end
+  end
 end