Add latest changes from gitlab-org/gitlab@13-0-stable-ee

4 files changed, 71 insertions, 27 deletions

diff --git a/spec/requests/api/graphql/mutations/snippets/create_spec.rb b/spec/requests/api/graphql/mutations/snippets/create_spec.rb
index cef7fc5cbe3..e1e5fe22887 100644
--- a/spec/requests/api/graphql/mutations/snippets/create_spec.rb
+++ b/spec/requests/api/graphql/mutations/snippets/create_spec.rb
@@ -13,6 +13,7 @@ describe 'Creating a Snippet' do
   let(:file_name) { 'Initial file_name' }
   let(:visibility_level) { 'public' }
   let(:project_path) { nil }
+  let(:uploaded_files) { nil }
 
   let(:mutation) do
     variables = {
@@ -21,7 +22,8 @@ describe 'Creating a Snippet' do
       visibility_level: visibility_level,
       file_name: file_name,
       title: title,
-      project_path: project_path
+      project_path: project_path,
+      uploaded_files: uploaded_files
     }
 
     graphql_mutation(:create_snippet, variables)
@@ -31,6 +33,8 @@ describe 'Creating a Snippet' do
     graphql_mutation_response(:create_snippet)
   end
 
+  subject { post_graphql_mutation(mutation, current_user: current_user) }
+
   context 'when the user does not have permission' do
     let(:current_user) { nil }
 
@@ -39,7 +43,7 @@ describe 'Creating a Snippet' do
 
     it 'does not create the Snippet' do
       expect do
-        post_graphql_mutation(mutation, current_user: current_user)
+        subject
       end.not_to change { Snippet.count }
     end
 
@@ -48,7 +52,7 @@ describe 'Creating a Snippet' do
 
       it 'does not create the snippet when the user is not authorized' do
         expect do
-          post_graphql_mutation(mutation, current_user: current_user)
+          subject
         end.not_to change { Snippet.count }
       end
     end
@@ -60,12 +64,12 @@ describe 'Creating a Snippet' do
     context 'with PersonalSnippet' do
       it 'creates the Snippet' do
         expect do
-          post_graphql_mutation(mutation, current_user: current_user)
+          subject
         end.to change { Snippet.count }.by(1)
       end
 
       it 'returns the created Snippet' do
-        post_graphql_mutation(mutation, current_user: current_user)
+        subject
 
         expect(mutation_response['snippet']['blob']['richData']).to be_nil
         expect(mutation_response['snippet']['blob']['plainData']).to match(content)
@@ -86,12 +90,12 @@ describe 'Creating a Snippet' do
 
       it 'creates the Snippet' do
         expect do
-          post_graphql_mutation(mutation, current_user: current_user)
+          subject
         end.to change { Snippet.count }.by(1)
       end
 
       it 'returns the created Snippet' do
-        post_graphql_mutation(mutation, current_user: current_user)
+        subject
 
         expect(mutation_response['snippet']['blob']['richData']).to be_nil
         expect(mutation_response['snippet']['blob']['plainData']).to match(content)
@@ -106,7 +110,7 @@ describe 'Creating a Snippet' do
         let(:project_path) { 'foobar' }
 
         it 'returns an an error' do
-          post_graphql_mutation(mutation, current_user: current_user)
+          subject
           errors = json_response['errors']
 
           expect(errors.first['message']).to eq(Gitlab::Graphql::Authorize::AuthorizeResource::RESOURCE_ACCESS_ERROR)
@@ -117,7 +121,7 @@ describe 'Creating a Snippet' do
         it 'returns an an error' do
           project.project_feature.update_attribute(:snippets_access_level, ProjectFeature::DISABLED)
 
-          post_graphql_mutation(mutation, current_user: current_user)
+          subject
           errors = json_response['errors']
 
           expect(errors.first['message']).to eq(Gitlab::Graphql::Authorize::AuthorizeResource::RESOURCE_ACCESS_ERROR)
@@ -132,15 +136,41 @@ describe 'Creating a Snippet' do
 
       it 'does not create the Snippet' do
         expect do
-          post_graphql_mutation(mutation, current_user: current_user)
+          subject
         end.not_to change { Snippet.count }
       end
 
       it 'does not return Snippet' do
-        post_graphql_mutation(mutation, current_user: current_user)
+        subject
 
         expect(mutation_response['snippet']).to be_nil
       end
     end
+
+    context 'when there uploaded files' do
+      shared_examples 'expected files argument' do |file_value, expected_value|
+        let(:uploaded_files) { file_value }
+
+        it do
+          expect(::Snippets::CreateService).to receive(:new).with(nil, user, hash_including(files: expected_value))
+
+          subject
+        end
+      end
+
+      it_behaves_like 'expected files argument', nil, nil
+      it_behaves_like 'expected files argument', %w(foo bar), %w(foo bar)
+      it_behaves_like 'expected files argument', 'foo', %w(foo)
+
+      context 'when files has an invalid value' do
+        let(:uploaded_files) { [1] }
+
+        it 'returns an error' do
+          subject
+
+          expect(json_response['errors']).to be
+        end
+      end
+    end
   end
 end
diff --git a/spec/requests/api/graphql/mutations/snippets/destroy_spec.rb b/spec/requests/api/graphql/mutations/snippets/destroy_spec.rb
index 351d2db8973..cb9aeea74b2 100644
--- a/spec/requests/api/graphql/mutations/snippets/destroy_spec.rb
+++ b/spec/requests/api/graphql/mutations/snippets/destroy_spec.rb
@@ -6,9 +6,10 @@ describe 'Destroying a Snippet' do
   include GraphqlHelpers
 
   let(:current_user) { snippet.author }
+  let(:snippet_gid) { snippet.to_global_id.to_s }
   let(:mutation) do
     variables = {
-      id: snippet.to_global_id.to_s
+      id: snippet_gid
     }
 
     graphql_mutation(:destroy_snippet, variables)
@@ -49,9 +50,11 @@ describe 'Destroying a Snippet' do
   end
 
   describe 'PersonalSnippet' do
-    it_behaves_like 'graphql delete actions' do
-      let_it_be(:snippet) { create(:personal_snippet) }
-    end
+    let_it_be(:snippet) { create(:personal_snippet) }
+
+    it_behaves_like 'graphql delete actions'
+
+    it_behaves_like 'when the snippet is not found'
   end
 
   describe 'ProjectSnippet' do
@@ -85,5 +88,7 @@ describe 'Destroying a Snippet' do
         end
       end
     end
+
+    it_behaves_like 'when the snippet is not found'
   end
 end
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 05e3f7e6806..6d4dce3f6f1 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,9 +10,11 @@ describe 'Mark snippet as spam', :do_not_mock_admin_mode do
   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 }
   let(:mutation) do
     variables = {
-      id: snippet.to_global_id.to_s
+      id: snippet_gid
     }
 
     graphql_mutation(:mark_as_spam_snippet, variables)
@@ -23,13 +25,15 @@ describe 'Mark snippet as spam', :do_not_mock_admin_mode do
   end
 
   shared_examples 'does not mark the snippet as spam' do
-    it do
+    specify do
       expect do
         post_graphql_mutation(mutation, current_user: current_user)
       end.not_to change { snippet.reload.user_agent_detail.submitted }
     end
   end
 
+  it_behaves_like 'when the snippet is not found'
+
   context 'when the user does not have permission' do
     let(:current_user) { other_user }
 
diff --git a/spec/requests/api/graphql/mutations/snippets/update_spec.rb b/spec/requests/api/graphql/mutations/snippets/update_spec.rb
index 1035e3346e1..968ea5aed52 100644
--- a/spec/requests/api/graphql/mutations/snippets/update_spec.rb
+++ b/spec/requests/api/graphql/mutations/snippets/update_spec.rb
@@ -15,9 +15,10 @@ describe 'Updating a Snippet' do
   let(:updated_file_name) { 'Updated file_name' }
   let(:current_user) { snippet.author }
 
+  let(:snippet_gid) { GitlabSchema.id_from_object(snippet).to_s }
   let(:mutation) do
     variables = {
-      id: GitlabSchema.id_from_object(snippet).to_s,
+      id: snippet_gid,
       content: updated_content,
       description: updated_description,
       visibility_level: 'public',
@@ -90,16 +91,18 @@ describe 'Updating a Snippet' do
   end
 
   describe 'PersonalSnippet' do
-    it_behaves_like 'graphql update actions' do
-      let(:snippet) do
-        create(:personal_snippet,
-               :private,
-               file_name: original_file_name,
-               title: original_title,
-               content: original_content,
-               description: original_description)
-      end
+    let(:snippet) do
+      create(:personal_snippet,
+             :private,
+             file_name: original_file_name,
+             title: original_title,
+             content: original_content,
+             description: original_description)
     end
+
+    it_behaves_like 'graphql update actions'
+
+    it_behaves_like 'when the snippet is not found'
   end
 
   describe 'ProjectSnippet' do
@@ -142,5 +145,7 @@ describe 'Updating a Snippet' do
         end
       end
     end
+
+    it_behaves_like 'when the snippet is not found'
   end
 end