Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-12-12 03:09:52 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-12-12 03:09:52 +0300
commita0b872fdb47770058ebae1f3fbbe40b782642f77 (patch)
tree8006d42b47778709652501208f23ed1205bb79d5 /spec/support/import_export
parent87911fabb2cfd90c22d160d4d2cee7d2bf47dedd (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.rb5
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