diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-17 00:11:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-17 00:11:53 +0300 |
| commit | 7ea46a9866101f15734b557d812bb52d347f63fb (patch) | |
| tree | c752e2f04dab642e8b3d8d026dd530a7d4c1f229 /spec/requests/api | |
| parent | 889bf7a0eea1f4ac7c2ec28cdfded399c0ca8fb9 (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 522030652bd..7e670724c11 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), @@ -122,7 +122,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), |