Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42

3 files changed, 8 insertions, 55 deletions

diff --git a/spec/requests/api/graphql/mutations/snippets/create_spec.rb b/spec/requests/api/graphql/mutations/snippets/create_spec.rb
index 214c804c519..9a3cea3ca14 100644
--- a/spec/requests/api/graphql/mutations/snippets/create_spec.rb
+++ b/spec/requests/api/graphql/mutations/snippets/create_spec.rb
@@ -17,7 +17,6 @@ RSpec.describe 'Creating a Snippet' do
   let(:actions) { [{ action: action }.merge(file_1), { action: action }.merge(file_2)] }
   let(:project_path) { nil }
   let(:uploaded_files) { nil }
-  let(:spam_mutation_vars) { {} }
   let(:mutation_vars) do
     {
       description: description,
@@ -26,7 +25,7 @@ RSpec.describe 'Creating a Snippet' do
       project_path: project_path,
       uploaded_files: uploaded_files,
       blob_actions: actions
-    }.merge(spam_mutation_vars)
+    }
   end
 
   let(:mutation) do
@@ -77,21 +76,6 @@ RSpec.describe 'Creating a Snippet' do
 
         expect(mutation_response['snippet']).to be_nil
       end
-
-      context 'when snippet_spam flag is disabled' do
-        before do
-          stub_feature_flags(snippet_spam: false)
-        end
-
-        it 'passes disable_spam_action_service param to service' do
-          expect(::Snippets::CreateService)
-            .to receive(:new)
-                  .with(project: anything, current_user: anything, params: hash_including(disable_spam_action_service: true))
-                  .and_call_original
-
-          subject
-        end
-      end
     end
 
     shared_examples 'creates snippet' do
@@ -101,8 +85,8 @@ RSpec.describe 'Creating a Snippet' do
         end.to change { Snippet.count }.by(1)
 
         snippet = Snippet.last
-        created_file_1 = snippet.repository.blob_at('HEAD', file_1[:filePath])
-        created_file_2 = snippet.repository.blob_at('HEAD', file_2[:filePath])
+        created_file_1 = snippet.repository.blob_at(snippet.default_branch, file_1[:filePath])
+        created_file_2 = snippet.repository.blob_at(snippet.default_branch, file_2[:filePath])
 
         expect(created_file_1.data).to match(file_1[:content])
         expect(created_file_2.data).to match(file_2[:content])
@@ -121,15 +105,6 @@ RSpec.describe 'Creating a Snippet' do
       it_behaves_like 'snippet edit usage data counters'
 
       it_behaves_like 'a mutation which can mutate a spammable' do
-        let(:captcha_response) { 'abc123' }
-        let(:spam_log_id) { 1234 }
-        let(:spam_mutation_vars) do
-          {
-            captcha_response: captcha_response,
-            spam_log_id: spam_log_id
-          }
-        end
-
         let(:service) { Snippets::CreateService }
       end
     end
@@ -190,7 +165,7 @@ RSpec.describe 'Creating a Snippet' do
 
         it do
           expect(::Snippets::CreateService).to receive(:new)
-            .with(project: nil, current_user: user, params: hash_including(files: expected_value))
+            .with(project: nil, current_user: user, params: hash_including(files: expected_value), spam_params: instance_of(::Spam::SpamParams))
             .and_return(double(execute: creation_response))
 
           subject
diff --git a/spec/requests/api/graphql/mutations/snippets/mark_as_spam_spec.rb b/spec/requests/api/graphql/mutations/snippets/mark_as_spam_spec.rb
index 4d499310591..43d846cb297 100644
--- a/spec/requests/api/graphql/mutations/snippets/mark_as_spam_spec.rb
+++ b/spec/requests/api/graphql/mutations/snippets/mark_as_spam_spec.rb
@@ -10,6 +10,7 @@ RSpec.describe 'Mark snippet as spam' do
   let_it_be(:other_user) { create(:user) }
   let_it_be(:snippet) { create(:personal_snippet) }
   let_it_be(:user_agent_detail) { create(:user_agent_detail, subject: snippet) }
+
   let(:current_user) { snippet.author }
 
   let(:snippet_gid) { snippet.to_global_id.to_s }
diff --git a/spec/requests/api/graphql/mutations/snippets/update_spec.rb b/spec/requests/api/graphql/mutations/snippets/update_spec.rb
index 77efb786dcb..eb7e6f840fe 100644
--- a/spec/requests/api/graphql/mutations/snippets/update_spec.rb
+++ b/spec/requests/api/graphql/mutations/snippets/update_spec.rb
@@ -9,6 +9,7 @@ RSpec.describe 'Updating a Snippet' do
   let_it_be(:original_description) { 'Initial description' }
   let_it_be(:original_title) { 'Initial title' }
   let_it_be(:original_file_name) { 'Initial file_name' }
+
   let(:updated_content) { 'Updated content' }
   let(:updated_description) { 'Updated description' }
   let(:updated_title) { 'Updated_title' }
@@ -16,7 +17,6 @@ RSpec.describe 'Updating a Snippet' do
   let(:updated_file) { 'CHANGELOG' }
   let(:deleted_file) { 'README' }
   let(:snippet_gid) { GitlabSchema.id_from_object(snippet).to_s }
-  let(:spam_mutation_vars) { {} }
   let(:mutation_vars) do
     {
       id: snippet_gid,
@@ -27,7 +27,7 @@ RSpec.describe 'Updating a Snippet' do
         { action: :update, filePath: updated_file, content: updated_content },
         { action: :delete, filePath: deleted_file }
       ]
-    }.merge(spam_mutation_vars)
+    }
   end
 
   let(:mutation) do
@@ -82,21 +82,6 @@ RSpec.describe 'Updating a Snippet' do
         end
       end
 
-      context 'when snippet_spam flag is disabled' do
-        before do
-          stub_feature_flags(snippet_spam: false)
-        end
-
-        it 'passes disable_spam_action_service param to service' do
-          expect(::Snippets::UpdateService)
-            .to receive(:new)
-                  .with(project: anything, current_user: anything, params: hash_including(disable_spam_action_service: true))
-                  .and_call_original
-
-          subject
-        end
-      end
-
       context 'when there are ActiveRecord validation errors' do
         let(:updated_title) { '' }
 
@@ -125,15 +110,6 @@ RSpec.describe 'Updating a Snippet' do
       end
 
       it_behaves_like 'a mutation which can mutate a spammable' do
-        let(:captcha_response) { 'abc123' }
-        let(:spam_log_id) { 1234 }
-        let(:spam_mutation_vars) do
-          {
-            captcha_response: captcha_response,
-            spam_log_id: spam_log_id
-          }
-        end
-
         let(:service) { Snippets::UpdateService }
       end
 
@@ -164,6 +140,7 @@ RSpec.describe 'Updating a Snippet' do
 
   describe 'ProjectSnippet' do
     let_it_be(:project) { create(:project, :private) }
+
     let(:snippet) do
       create(:project_snippet,
              :private,