3 files changed, 24 insertions, 2 deletions
diff --git a/spec/services/issues/close_service_spec.rb b/spec/services/issues/close_service_spec.rb
index 1f6118e9fcc..344da5a6582 100644
--- a/spec/services/issues/close_service_spec.rb
+++ b/spec/services/issues/close_service_spec.rb
@@ -279,7 +279,7 @@ RSpec.describe Issues::CloseService do
 
       it 'verifies the number of queries' do
         recorded = ActiveRecord::QueryRecorder.new { close_issue }
-        expected_queries = 32
+        expected_queries = 30
 
         expect(recorded.count).to be <= expected_queries
         expect(recorded.cached_count).to eq(0)
diff --git a/spec/services/issues/create_service_spec.rb b/spec/services/issues/create_service_spec.rb
index 6b7b72d83fc..3934ca04a00 100644
--- a/spec/services/issues/create_service_spec.rb
+++ b/spec/services/issues/create_service_spec.rb
@@ -47,6 +47,14 @@ RSpec.describe Issues::CreateService do
           due_date: Date.tomorrow }
       end
 
+      it 'works if base work item types were not created yet' do
+        WorkItems::Type.delete_all
+
+        expect do
+          issue
+        end.to change(Issue, :count).by(1)
+      end
+
       it 'creates the issue with the given params' do
         expect(Issuable::CommonSystemNotesService).to receive_message_chain(:new, :execute)
 
diff --git a/spec/services/issues/set_crm_contacts_service_spec.rb b/spec/services/issues/set_crm_contacts_service_spec.rb
index b0befb9f77c..5613cc49cc5 100644
--- a/spec/services/issues/set_crm_contacts_service_spec.rb
+++ b/spec/services/issues/set_crm_contacts_service_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe Issues::SetCrmContactsService do
   let_it_be(:user) { create(:user) }
   let_it_be(:group) { create(:group, :crm_enabled) }
-  let_it_be(:project) { create(:project, group: create(:group, parent: group)) }
+  let_it_be(:project) { create(:project, group: create(:group, :crm_enabled, parent: group)) }
   let_it_be(:contacts) { create_list(:contact, 4, group: group) }
   let_it_be(:issue, reload: true) { create(:issue, project: project) }
   let_it_be(:issue_contact_1) do
@@ -58,6 +58,20 @@ RSpec.describe Issues::SetCrmContactsService do
         group.add_reporter(user)
       end
 
+      context 'but the crm setting is disabled' do
+        let(:params) { { replace_ids: [contacts[1].id, contacts[2].id] } }
+        let(:subgroup_with_crm_disabled) { create(:group, parent: group) }
+        let(:project_with_crm_disabled) { create(:project, group: subgroup_with_crm_disabled) }
+        let(:issue_with_crm_disabled) { create(:issue, project: project_with_crm_disabled) }
+
+        it 'returns expected error response' do
+          response = described_class.new(project: project_with_crm_disabled, current_user: user, params: params).execute(issue_with_crm_disabled)
+
+          expect(response).to be_error
+          expect(response.message).to eq('You have insufficient permissions to set customer relations contacts for this issue')
+        end
+      end
+
       context 'when the contact does not exist' do
         let(:params) { { replace_ids: [non_existing_record_id] } }