diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:11:53 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:11:53 +0000 |
| commit | 7ea46a9866101f15734b557d812bb52d347f63fb (patch) | |
| tree | c752e2f04dab642e8b3d8d026dd530a7d4c1f229 /spec/support/shared_examples/lib/api | |
| parent | 889bf7a0eea1f4ac7c2ec28cdfded399c0ca8fb9 (diff) | |
| download | gitlab-ce-7ea46a9866101f15734b557d812bb52d347f63fb.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support/shared_examples/lib/api')
| -rw-r--r-- | spec/support/shared_examples/lib/api/ci/runner_shared_examples.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/support/shared_examples/lib/api/ci/runner_shared_examples.rb b/spec/support/shared_examples/lib/api/ci/runner_shared_examples.rb index bdb0316bf5a..c775ca182e6 100644 --- a/spec/support/shared_examples/lib/api/ci/runner_shared_examples.rb +++ b/spec/support/shared_examples/lib/api/ci/runner_shared_examples.rb @@ -1,14 +1,14 @@ # frozen_string_literal: true RSpec.shared_examples 'API::CI::Runner application context metadata' do |api_route| - it 'contains correct context metadata' do + it 'contains correct context metadata', :context_aware do # Avoids popping the context from the thread so we can # check its content after the request. allow(Labkit::Context).to receive(:pop) send_request - Labkit::Context.with_context do |context| + Gitlab::ApplicationContext.with_raw_context do |context| expected_context = { 'meta.caller_id' => api_route, 'meta.user' => job.user.username, |