diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-25 02:46:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-25 02:46:54 +0300 |
commit | db353eb79a55a4035fd4553b8d82cfcfd93ecf46 (patch) | |
tree | a4818a185899210069458e21bbb62f0ce98d4aba /spec | |
parent | ae5079ea12a3ffc8d8b89db738a63fd2978b8e69 (diff) |
Add latest changes from gitlab-org/gitlab@16-2-stable-ee
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab_settings/options_spec.rb | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/spec/lib/gitlab_settings/options_spec.rb b/spec/lib/gitlab_settings/options_spec.rb index abb895032c9..6a53b005025 100644 --- a/spec/lib/gitlab_settings/options_spec.rb +++ b/spec/lib/gitlab_settings/options_spec.rb @@ -12,9 +12,11 @@ RSpec.describe GitlabSettings::Options, :aggregate_failures, feature_category: : it 'returns the unchanged internal hash' do stub_rails_env('production') - expect(Gitlab::ErrorTracking) - .to receive(:track_and_raise_for_dev_exception) - .with(RuntimeError.new("Warning: Do not mutate GitlabSettings::Options objects: `#{method}`"), method: method) + expect(Gitlab::AppJsonLogger) + .to receive(:warn) + .with(hash_including( + message: "Warning: Do not mutate GitlabSettings::Options objects: `#{method}`", + method: method)) .and_call_original expect(options.send(method)).to be_truthy @@ -234,9 +236,11 @@ RSpec.describe GitlabSettings::Options, :aggregate_failures, feature_category: : it 'delegates the method to the internal options hash' do stub_rails_env('production') - expect(Gitlab::ErrorTracking) - .to receive(:track_and_raise_for_dev_exception) - .with(RuntimeError.new('Calling a hash method on GitlabSettings::Options: `delete`'), method: :delete) + expect(Gitlab::AppJsonLogger) + .to receive(:warn) + .with(hash_including( + message: 'Calling a hash method on GitlabSettings::Options: `delete`', + method: :delete)) .and_call_original expect { options.foo.delete('bar') } |