Add latest changes from gitlab-org/gitlab@master

4 files changed, 55 insertions, 19 deletions

diff --git a/spec/requests/api/graphql/project/grafana_integration_spec.rb b/spec/requests/api/graphql/project/grafana_integration_spec.rb
index 688959e622d..9b24698f40c 100644
--- a/spec/requests/api/graphql/project/grafana_integration_spec.rb
+++ b/spec/requests/api/graphql/project/grafana_integration_spec.rb
@@ -45,7 +45,6 @@ RSpec.describe 'Getting Grafana Integration' do
 
       it_behaves_like 'a working graphql query'
 
-      specify { expect(integration_data['token']).to eql grafana_integration.masked_token }
       specify { expect(integration_data['grafanaUrl']).to eql grafana_integration.grafana_url }
 
       specify do
diff --git a/spec/requests/api/graphql/project/issue/designs/notes_spec.rb b/spec/requests/api/graphql/project/issue/designs/notes_spec.rb
index e25453510d5..a671ddc7ab1 100644
--- a/spec/requests/api/graphql/project/issue/designs/notes_spec.rb
+++ b/spec/requests/api/graphql/project/issue/designs/notes_spec.rb
@@ -30,7 +30,7 @@ RSpec.describe 'Getting designs related to an issue' do
 
     post_graphql(query(note_fields), current_user: nil)
 
-    designs_data = graphql_data['project']['issue']['designs']['designs']
+    designs_data = graphql_data['project']['issue']['designCollection']['designs']
     design_data = designs_data['nodes'].first
     note_data = design_data['notes']['nodes'].first
 
@@ -56,7 +56,7 @@ RSpec.describe 'Getting designs related to an issue' do
         'issue',
         { iid: design.issue.iid.to_s },
         query_graphql_field(
-          'designs', {}, design_node
+          'designCollection', {}, design_node
         )
       )
     )
diff --git a/spec/requests/api/lint_spec.rb b/spec/requests/api/lint_spec.rb
index 94ec83e2dce..aecbcfb5b5a 100644
--- a/spec/requests/api/lint_spec.rb
+++ b/spec/requests/api/lint_spec.rb
@@ -9,12 +9,13 @@ RSpec.describe API::Lint do
         File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml'))
       end
 
-      it 'passes validation' do
+      it 'passes validation without warnings or errors' do
         post api('/ci/lint'), params: { content: yaml_content }
 
         expect(response).to have_gitlab_http_status(:ok)
         expect(json_response).to be_an Hash
         expect(json_response['status']).to eq('valid')
+        expect(json_response['warnings']).to eq([])
         expect(json_response['errors']).to eq([])
       end
 
@@ -26,6 +27,20 @@ RSpec.describe API::Lint do
       end
     end
 
+    context 'with valid .gitlab-ci.yaml with warnings' do
+      let(:yaml_content) { { job: { script: 'ls', rules: [{ when: 'always' }] } }.to_yaml }
+
+      it 'passes validation but returns warnings' do
+        post api('/ci/lint'), params: { content: yaml_content }
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(json_response['status']).to eq('valid')
+        expect(json_response['warnings']).not_to be_empty
+        expect(json_response['status']).to eq('valid')
+        expect(json_response['errors']).to eq([])
+      end
+    end
+
     context 'with an invalid .gitlab_ci.yml' do
       context 'with invalid syntax' do
         let(:yaml_content) { 'invalid content' }
@@ -35,6 +50,7 @@ RSpec.describe API::Lint do
 
           expect(response).to have_gitlab_http_status(:ok)
           expect(json_response['status']).to eq('invalid')
+          expect(json_response['warnings']).to eq([])
           expect(json_response['errors']).to eq(['Invalid configuration format'])
         end
 
@@ -54,6 +70,7 @@ RSpec.describe API::Lint do
 
           expect(response).to have_gitlab_http_status(:ok)
           expect(json_response['status']).to eq('invalid')
+          expect(json_response['warnings']).to eq([])
           expect(json_response['errors']).to eq(['jobs config should contain at least one visible job'])
         end
 
@@ -82,7 +99,18 @@ RSpec.describe API::Lint do
     let(:project) { create(:project, :repository) }
     let(:dry_run) { nil }
 
-    RSpec.shared_examples 'valid config' do
+    RSpec.shared_examples 'valid config with warnings' do
+      it 'passes validation with warnings' do
+        ci_lint
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(json_response['valid']).to eq(true)
+        expect(json_response['errors']).to eq([])
+        expect(json_response['warnings']).not_to be_empty
+      end
+    end
+
+    RSpec.shared_examples 'valid config without warnings' do
       it 'passes validation' do
         ci_lint
 
@@ -94,6 +122,7 @@ RSpec.describe API::Lint do
         expect(json_response).to be_an Hash
         expect(json_response['merged_yaml']).to eq(expected_yaml)
         expect(json_response['valid']).to eq(true)
+        expect(json_response['warnings']).to eq([])
         expect(json_response['errors']).to eq([])
       end
     end
@@ -105,6 +134,7 @@ RSpec.describe API::Lint do
         expect(response).to have_gitlab_http_status(:ok)
         expect(json_response['merged_yaml']).to eq(yaml_content)
         expect(json_response['valid']).to eq(false)
+        expect(json_response['warnings']).to eq([])
         expect(json_response['errors']).to eq(['jobs config should contain at least one visible job'])
       end
     end
@@ -157,6 +187,7 @@ RSpec.describe API::Lint do
             expect(response).to have_gitlab_http_status(:ok)
             expect(json_response['merged_yaml']).to eq(nil)
             expect(json_response['valid']).to eq(false)
+            expect(json_response['warnings']).to eq([])
             expect(json_response['errors']).to eq(['Insufficient permissions to create a new pipeline'])
           end
         end
@@ -186,7 +217,7 @@ RSpec.describe API::Lint do
             )
           end
 
-          it_behaves_like 'valid config'
+          it_behaves_like 'valid config without warnings'
         end
       end
     end
@@ -242,13 +273,19 @@ RSpec.describe API::Lint do
         context 'when running as dry run' do
           let(:dry_run) { true }
 
-          it_behaves_like 'valid config'
+          it_behaves_like 'valid config without warnings'
         end
 
         context 'when running static validation' do
           let(:dry_run) { false }
 
-          it_behaves_like 'valid config'
+          it_behaves_like 'valid config without warnings'
+        end
+
+        context 'With warnings' do
+          let(:yaml_content) { { job: { script: 'ls', rules: [{ when: 'always' }] } }.to_yaml }
+
+          it_behaves_like 'valid config with warnings'
         end
       end
 
diff --git a/spec/requests/git_http_spec.rb b/spec/requests/git_http_spec.rb
index a3bfa7ea33c..dc735e3714d 100644
--- a/spec/requests/git_http_spec.rb
+++ b/spec/requests/git_http_spec.rb
@@ -433,7 +433,7 @@ RSpec.describe 'Git HTTP requests' do
           let(:path) { "#{redirect.path}.git" }
 
           it 'downloads get status 200 for redirects' do
-            clone_get(path, {})
+            clone_get(path)
 
             expect(response).to have_gitlab_http_status(:ok)
           end
@@ -465,7 +465,7 @@ RSpec.describe 'Git HTTP requests' do
                   path: "/#{path}/info/refs?service=git-upload-pack"
                 })
 
-                clone_get(path, env)
+                clone_get(path, **env)
 
                 expect(response).to have_gitlab_http_status(:forbidden)
               end
@@ -493,7 +493,7 @@ RSpec.describe 'Git HTTP requests' do
                 it "rejects pulls with 401 Unauthorized for unknown projects (no project existence information leak)" do
                   user.block
 
-                  download('doesnt/exist.git', env) do |response|
+                  download('doesnt/exist.git', **env) do |response|
                     expect(response).to have_gitlab_http_status(:unauthorized)
                   end
                 end
@@ -693,7 +693,7 @@ RSpec.describe 'Git HTTP requests' do
                 end
 
                 it 'downloads get status 200' do
-                  clone_get(path, env)
+                  clone_get(path, **env)
 
                   expect(response).to have_gitlab_http_status(:ok)
                 end
@@ -745,7 +745,7 @@ RSpec.describe 'Git HTTP requests' do
             # We know for sure it is not an information leak since pulls using
             # the build token must be allowed.
             it "rejects pushes with 403 Forbidden" do
-              push_get(path, env)
+              push_get(path, **env)
 
               expect(response).to have_gitlab_http_status(:forbidden)
               expect(response.body).to eq(git_access_error(:auth_upload))
@@ -754,7 +754,7 @@ RSpec.describe 'Git HTTP requests' do
             # We are "authenticated" as CI using a valid token here. But we are
             # not authorized to see any other project, so return "not found".
             it "rejects pulls for other project with 404 Not Found" do
-              clone_get("#{other_project.full_path}.git", env)
+              clone_get("#{other_project.full_path}.git", **env)
 
               expect(response).to have_gitlab_http_status(:not_found)
               expect(response.body).to eq(git_access_error(:project_not_found))
@@ -777,7 +777,7 @@ RSpec.describe 'Git HTTP requests' do
                 let(:project) { create(:project) }
 
                 it 'rejects pulls with 404 Not Found' do
-                  clone_get path, env
+                  clone_get(path, **env)
 
                   expect(response).to have_gitlab_http_status(:not_found)
                   expect(response.body).to eq(git_access_error(:no_repo))
@@ -785,7 +785,7 @@ RSpec.describe 'Git HTTP requests' do
               end
 
               it 'rejects pushes with 403 Forbidden' do
-                push_get path, env
+                push_get(path, **env)
 
                 expect(response).to have_gitlab_http_status(:forbidden)
                 expect(response.body).to eq(git_access_error(:auth_upload))
@@ -889,7 +889,7 @@ RSpec.describe 'Git HTTP requests' do
           end
 
           it "responds with status 200" do
-            clone_get(path, env) do |response|
+            clone_get(path, **env) do |response|
               expect(response).to have_gitlab_http_status(:ok)
             end
           end
@@ -913,7 +913,7 @@ RSpec.describe 'Git HTTP requests' do
     end
 
     it 'blocks git access when the user did not accept terms', :aggregate_failures do
-      clone_get(path, env) do |response|
+      clone_get(path, **env) do |response|
         expect(response).to have_gitlab_http_status(:forbidden)
       end
 
@@ -932,7 +932,7 @@ RSpec.describe 'Git HTTP requests' do
       end
 
       it 'allows clones' do
-        clone_get(path, env) do |response|
+        clone_get(path, **env) do |response|
           expect(response).to have_gitlab_http_status(:ok)
         end
       end