diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /spec/support/shared_examples/uploaders | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'spec/support/shared_examples/uploaders')
-rw-r--r-- | spec/support/shared_examples/uploaders/workers/object_storage/migrate_uploads_shared_examples.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/support/shared_examples/uploaders/workers/object_storage/migrate_uploads_shared_examples.rb b/spec/support/shared_examples/uploaders/workers/object_storage/migrate_uploads_shared_examples.rb index f143cbc7165..5a9a3dfc2d2 100644 --- a/spec/support/shared_examples/uploaders/workers/object_storage/migrate_uploads_shared_examples.rb +++ b/spec/support/shared_examples/uploaders/workers/object_storage/migrate_uploads_shared_examples.rb @@ -63,7 +63,7 @@ RSpec.shared_examples 'uploads migration worker' do if success > 0 it 'outputs the reports' do - expect(Rails.logger).to receive(:info).with(%r{Migrated #{success}/#{total} files}) + expect(Gitlab::AppLogger).to receive(:info).with(%r{Migrated #{success}/#{total} files}) perform(uploads) end @@ -71,7 +71,7 @@ RSpec.shared_examples 'uploads migration worker' do if failures > 0 it 'outputs upload failures' do - expect(Rails.logger).to receive(:warn).with(/Error .* I am a teapot/) + expect(Gitlab::AppLogger).to receive(:warn).with(/Error .* I am a teapot/) perform(uploads) end |