diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-09 18:08:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-09 18:08:59 +0300 |
| commit | 6f2b1c32f3ccf422575f591b42372534502dcd72 (patch) | |
| tree | 2ed532687d73e290f07c760825c02a2ecbaa5416 /spec/requests/api | |
| parent | b90d8b54a4d623e52cf1d4318023e3b18d13dd5b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/requests/api')
| -rw-r--r-- | spec/requests/api/api_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/api/api_spec.rb b/spec/requests/api/api_spec.rb index e1050d0b5f7..4eae5678184 100644 --- a/spec/requests/api/api_spec.rb +++ b/spec/requests/api/api_spec.rb @@ -105,7 +105,7 @@ RSpec.describe API::API do it 'logs all application context fields' do allow_any_instance_of(Gitlab::GrapeLogging::Loggers::ContextLogger).to receive(:parameters) do - Labkit::Context.current.to_h.tap do |log_context| + Gitlab::ApplicationContext.current.tap do |log_context| expect(log_context).to match('correlation_id' => an_instance_of(String), 'meta.caller_id' => '/api/:version/projects/:id/issues', 'meta.remote_ip' => an_instance_of(String), @@ -121,7 +121,7 @@ RSpec.describe API::API do it 'skips fields that do not apply' do allow_any_instance_of(Gitlab::GrapeLogging::Loggers::ContextLogger).to receive(:parameters) do - Labkit::Context.current.to_h.tap do |log_context| + Gitlab::ApplicationContext.current.tap do |log_context| expect(log_context).to match('correlation_id' => an_instance_of(String), 'meta.caller_id' => '/api/:version/users', 'meta.remote_ip' => an_instance_of(String), |