diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-12 03:09:52 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-12 03:09:52 +0300 |
commit | a0b872fdb47770058ebae1f3fbbe40b782642f77 (patch) | |
tree | 8006d42b47778709652501208f23ed1205bb79d5 /spec/support/import_export | |
parent | 87911fabb2cfd90c22d160d4d2cee7d2bf47dedd (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support/import_export')
-rw-r--r-- | spec/support/import_export/common_util.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/support/import_export/common_util.rb b/spec/support/import_export/common_util.rb index ae951ea35af..a6b395ad4d5 100644 --- a/spec/support/import_export/common_util.rb +++ b/spec/support/import_export/common_util.rb @@ -70,9 +70,12 @@ module ImportExport ) end - def get_shared_env(path:) + def get_shared_env(path:, logger: nil) + logger ||= double(info: true, warn: true, error: true) + instance_double(Gitlab::ImportExport::Shared).tap do |shared| allow(shared).to receive(:export_path).and_return(path) + allow(shared).to receive(:logger).and_return(logger) end end |