Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into consolidate-page-widths-part02consolidate-page-widths-part02

1 files changed, 52 insertions, 0 deletions

diff --git a/spec/services/quick_actions/interpret_service_spec.rb b/spec/services/quick_actions/interpret_service_spec.rb
index bf1c157c4a2..06cad9c00d2 100644
--- a/spec/services/quick_actions/interpret_service_spec.rb
+++ b/spec/services/quick_actions/interpret_service_spec.rb
@@ -272,6 +272,28 @@ describe QuickActions::InterpretService do
       end
     end
 
+    shared_examples 'lock command' do
+      let(:issue) { create(:issue, project: project, discussion_locked: false) }
+      let(:merge_request) { create(:merge_request, source_project: project, discussion_locked: false) }
+
+      it 'returns discussion_locked: true if content contains /lock' do
+        _, updates = service.execute(content, issuable)
+
+        expect(updates).to eq(discussion_locked: true)
+      end
+    end
+
+    shared_examples 'unlock command' do
+      let(:issue) { create(:issue, project: project, discussion_locked: true) }
+      let(:merge_request) { create(:merge_request, source_project: project, discussion_locked: true) }
+
+      it 'returns discussion_locked: true if content contains /unlock' do
+        _, updates = service.execute(content, issuable)
+
+        expect(updates).to eq(discussion_locked: false)
+      end
+    end
+
     shared_examples 'empty command' do
       it 'populates {} if content contains an unsupported command' do
         _, updates = service.execute(content, issuable)
@@ -786,6 +808,26 @@ describe QuickActions::InterpretService do
       let(:issuable) { issue }
     end
 
+    it_behaves_like 'lock command' do
+      let(:content) { '/lock' }
+      let(:issuable) { issue }
+    end
+
+    it_behaves_like 'lock command' do
+      let(:content) { '/lock' }
+      let(:issuable) { merge_request }
+    end
+
+    it_behaves_like 'unlock command' do
+      let(:content) { '/unlock' }
+      let(:issuable) { issue }
+    end
+
+    it_behaves_like 'unlock command' do
+      let(:content) { '/unlock' }
+      let(:issuable) { merge_request }
+    end
+
     context '/todo' do
       let(:content) { '/todo' }
 
@@ -961,6 +1003,16 @@ describe QuickActions::InterpretService do
         let(:content) { '/duplicate #{issue.to_reference}' }
         let(:issuable) { issue }
       end
+
+      it_behaves_like 'empty command' do
+        let(:content) { '/lock' }
+        let(:issuable) { issue }
+      end
+
+      it_behaves_like 'empty command' do
+        let(:content) { '/unlock' }
+        let(:issuable) { issue }
+      end
     end
 
     context '/award command' do