Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

3 files changed, 19 insertions, 2 deletions

diff --git a/spec/requests/api/ci/runner/jobs_artifacts_spec.rb b/spec/requests/api/ci/runner/jobs_artifacts_spec.rb
index 71be0c30f5a..4d8da50f8f0 100644
--- a/spec/requests/api/ci/runner/jobs_artifacts_spec.rb
+++ b/spec/requests/api/ci/runner/jobs_artifacts_spec.rb
@@ -242,7 +242,7 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state do
             }
 
             expect { authorize_artifacts_with_token_in_headers(artifact_type: :lsif) }
-              .to change { Gitlab::UsageDataCounters::HLLRedisCounter.unique_events(tracking_params) }
+              .to change { Gitlab::UsageDataCounters::HLLRedisCounter.unique_events(**tracking_params) }
               .by(1)
           end
         end
diff --git a/spec/requests/api/ci/runner/jobs_put_spec.rb b/spec/requests/api/ci/runner/jobs_put_spec.rb
index cbefaa2c321..e9d793d5a22 100644
--- a/spec/requests/api/ci/runner/jobs_put_spec.rb
+++ b/spec/requests/api/ci/runner/jobs_put_spec.rb
@@ -61,6 +61,23 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state do
           expect(response.header).not_to have_key('X-GitLab-Trace-Update-Interval')
         end
 
+        context 'when runner sends an unrecognized field in a payload' do
+          ##
+          # This test case is here to ensure that the API used to communicate
+          # runner with GitLab can evolve.
+          #
+          # In case of adding new features on the Runner side we do not want
+          # GitLab-side to reject requests containing unrecognizable fields in
+          # a payload, because runners can be updated before a new version of
+          # GitLab is installed.
+          #
+          it 'ignores unrecognized fields' do
+            update_job(state: 'success', 'unknown': 'something')
+
+            expect(job.reload).to be_success
+          end
+        end
+
         context 'when failure_reason is script_failure' do
           before do
             update_job(state: 'failed', failure_reason: 'script_failure')
diff --git a/spec/requests/api/ci/runner/jobs_trace_spec.rb b/spec/requests/api/ci/runner/jobs_trace_spec.rb
index 1980c1a9f51..5b7a33d23d8 100644
--- a/spec/requests/api/ci/runner/jobs_trace_spec.rb
+++ b/spec/requests/api/ci/runner/jobs_trace_spec.rb
@@ -135,7 +135,7 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state do
                 patch_the_trace
               end
 
-              it 'returns Forbidden ' do
+              it 'returns Forbidden' do
                 expect(response).to have_gitlab_http_status(:forbidden)
               end
             end