Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

3 files changed, 10 insertions, 10 deletions

diff --git a/spec/requests/api/graphql/mutations/design_management/delete_spec.rb b/spec/requests/api/graphql/mutations/design_management/delete_spec.rb
index 1dffb86b344..1f43f113e65 100644
--- a/spec/requests/api/graphql/mutations/design_management/delete_spec.rb
+++ b/spec/requests/api/graphql/mutations/design_management/delete_spec.rb
@@ -53,7 +53,7 @@ RSpec.describe "deleting designs" do
 
   context 'the designs list contains filenames we cannot find' do
     it_behaves_like 'a failed request' do
-      let(:designs) { %w/foo bar baz/.map { |fn| instance_double('file', filename: fn) } }
+      let(:designs) { %w/foo bar baz/.map { |fn| double('file', filename: fn) } }
       let(:the_error) { a_string_matching %r/filenames were not found/ }
     end
   end
diff --git a/spec/requests/api/graphql/mutations/issues/set_crm_contacts_spec.rb b/spec/requests/api/graphql/mutations/issues/set_crm_contacts_spec.rb
index 3da702c55d7..2da69509ad6 100644
--- a/spec/requests/api/graphql/mutations/issues/set_crm_contacts_spec.rb
+++ b/spec/requests/api/graphql/mutations/issues/set_crm_contacts_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe 'Setting issues crm contacts' do
 
   let(:issue) { create(:issue, project: project) }
   let(:operation_mode) { Types::MutationOperationModeEnum.default_mode }
-  let(:crm_contact_ids) { [global_id_of(contacts[1]), global_id_of(contacts[2])] }
+  let(:contact_ids) { [global_id_of(contacts[1]), global_id_of(contacts[2])] }
   let(:does_not_exist_or_no_permission) { "The resource that you are attempting to access does not exist or you don't have permission to perform this action" }
 
   let(:mutation) do
@@ -20,7 +20,7 @@ RSpec.describe 'Setting issues crm contacts' do
       project_path: issue.project.full_path,
       iid: issue.iid.to_s,
       operation_mode: operation_mode,
-      crm_contact_ids: crm_contact_ids
+      contact_ids: contact_ids
     }
 
     graphql_mutation(:issue_set_crm_contacts, variables,
@@ -83,7 +83,7 @@ RSpec.describe 'Setting issues crm contacts' do
     end
 
     context 'append' do
-      let(:crm_contact_ids) { [global_id_of(contacts[3])] }
+      let(:contact_ids) { [global_id_of(contacts[3])] }
       let(:operation_mode) { Types::MutationOperationModeEnum.enum[:append] }
 
       it 'updates the issue with correct contacts' do
@@ -95,7 +95,7 @@ RSpec.describe 'Setting issues crm contacts' do
     end
 
     context 'remove' do
-      let(:crm_contact_ids) { [global_id_of(contacts[0])] }
+      let(:contact_ids) { [global_id_of(contacts[0])] }
       let(:operation_mode) { Types::MutationOperationModeEnum.enum[:remove] }
 
       it 'updates the issue with correct contacts' do
@@ -107,7 +107,7 @@ RSpec.describe 'Setting issues crm contacts' do
     end
 
     context 'when the contact does not exist' do
-      let(:crm_contact_ids) { ["gid://gitlab/CustomerRelations::Contact/#{non_existing_record_id}"] }
+      let(:contact_ids) { ["gid://gitlab/CustomerRelations::Contact/#{non_existing_record_id}"] }
 
       it 'returns expected error' do
         post_graphql_mutation(mutation, current_user: user)
@@ -120,7 +120,7 @@ RSpec.describe 'Setting issues crm contacts' do
     context 'when the contact belongs to a different group' do
       let(:group2) { create(:group) }
       let(:contact) { create(:contact, group: group2) }
-      let(:crm_contact_ids) { [global_id_of(contact)] }
+      let(:contact_ids) { [global_id_of(contact)] }
 
       before do
         group2.add_reporter(user)
@@ -137,7 +137,7 @@ RSpec.describe 'Setting issues crm contacts' do
     context 'when attempting to add more than 6' do
       let(:operation_mode) { Types::MutationOperationModeEnum.enum[:append] }
       let(:gid) { global_id_of(contacts[0]) }
-      let(:crm_contact_ids) { [gid, gid, gid, gid, gid, gid, gid] }
+      let(:contact_ids) { [gid, gid, gid, gid, gid, gid, gid] }
 
       it 'returns expected error' do
         post_graphql_mutation(mutation, current_user: user)
@@ -149,7 +149,7 @@ RSpec.describe 'Setting issues crm contacts' do
 
     context 'when trying to remove non-existent contact' do
       let(:operation_mode) { Types::MutationOperationModeEnum.enum[:remove] }
-      let(:crm_contact_ids) { ["gid://gitlab/CustomerRelations::Contact/#{non_existing_record_id}"] }
+      let(:contact_ids) { ["gid://gitlab/CustomerRelations::Contact/#{non_existing_record_id}"] }
 
       it 'raises expected error' do
         post_graphql_mutation(mutation, current_user: user)
diff --git a/spec/requests/api/graphql/mutations/user_callouts/create_spec.rb b/spec/requests/api/graphql/mutations/user_callouts/create_spec.rb
index 716983f01d2..28a46583d2a 100644
--- a/spec/requests/api/graphql/mutations/user_callouts/create_spec.rb
+++ b/spec/requests/api/graphql/mutations/user_callouts/create_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe 'Create a user callout' do
 
   let_it_be(:current_user) { create(:user) }
 
-  let(:feature_name) { ::UserCallout.feature_names.each_key.first }
+  let(:feature_name) { ::Users::Callout.feature_names.each_key.first }
 
   let(:input) do
     {