1 files changed, 27 insertions, 24 deletions
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 291cccd72db..80041d2e859 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Issue do
+RSpec.describe Issue do
   include ExternalAuthorizationServiceHelpers
 
   describe "Associations" do
@@ -95,29 +95,6 @@ describe Issue do
     end
   end
 
-  describe 'locking' do
-    using RSpec::Parameterized::TableSyntax
-
-    where(:lock_version) do
-      [
-        [0],
-        ["0"]
-      ]
-    end
-
-    with_them do
-      it 'works when an issue has a NULL lock_version' do
-        issue = create(:issue)
-
-        described_class.where(id: issue.id).update_all('lock_version = NULL')
-
-        issue.update!(lock_version: lock_version, title: 'locking test')
-
-        expect(issue.reload.title).to eq('locking test')
-      end
-    end
-  end
-
   describe '.simple_sorts' do
     it 'includes all keys' do
       expect(described_class.simple_sorts.keys).to include(
@@ -406,6 +383,22 @@ describe Issue do
     end
   end
 
+  describe '#from_service_desk?' do
+    subject { issue.from_service_desk? }
+
+    context 'when issue author is support bot' do
+      let(:issue) { create(:issue, author: ::User.support_bot) }
+
+      it { is_expected.to be_truthy }
+    end
+
+    context 'when issue author is not support bot' do
+      let(:issue) { create(:issue) }
+
+      it { is_expected.to be_falsey }
+    end
+  end
+
   describe '#suggested_branch_name' do
     let(:repository) { double }
 
@@ -1002,6 +995,16 @@ describe Issue do
     end
   end
 
+  describe '.service_desk' do
+    it 'returns the service desk issue' do
+      service_desk_issue = create(:issue, author: ::User.support_bot)
+      regular_issue = create(:issue)
+
+      expect(described_class.service_desk).to include(service_desk_issue)
+      expect(described_class.service_desk).not_to include(regular_issue)
+    end
+  end
+
   it_behaves_like 'throttled touch' do
     subject { create(:issue, updated_at: 1.hour.ago) }
   end