summaryrefslogtreecommitdiff
path: root/spec/support/import_export
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-11 18:10:13 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-11 18:10:13 +0000
commite58ce90f147742c314b9cc08c2d1c0b585e39cf9 (patch)
tree467a1716bb63f4061e57b824c0e07532ca2fba4c /spec/support/import_export
parent62cd7010ef91dcaa5a5a36790985053db0b38671 (diff)
downloadgitlab-ce-e58ce90f147742c314b9cc08c2d1c0b585e39cf9.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support/import_export')
-rw-r--r--spec/support/import_export/common_util.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/support/import_export/common_util.rb b/spec/support/import_export/common_util.rb
index a6b395ad4d5..5fb6af99b79 100644
--- a/spec/support/import_export/common_util.rb
+++ b/spec/support/import_export/common_util.rb
@@ -20,11 +20,11 @@ module ImportExport
def setup_reader(reader)
if reader == :ndjson_reader && Feature.enabled?(:project_import_ndjson, default_enabled: true)
- allow_any_instance_of(Gitlab::ImportExport::JSON::LegacyReader::File).to receive(:exist?).and_return(false)
- allow_any_instance_of(Gitlab::ImportExport::JSON::NdjsonReader).to receive(:exist?).and_return(true)
+ allow_any_instance_of(Gitlab::ImportExport::Json::LegacyReader::File).to receive(:exist?).and_return(false)
+ allow_any_instance_of(Gitlab::ImportExport::Json::NdjsonReader).to receive(:exist?).and_return(true)
else
- allow_any_instance_of(Gitlab::ImportExport::JSON::LegacyReader::File).to receive(:exist?).and_return(true)
- allow_any_instance_of(Gitlab::ImportExport::JSON::NdjsonReader).to receive(:exist?).and_return(false)
+ allow_any_instance_of(Gitlab::ImportExport::Json::LegacyReader::File).to receive(:exist?).and_return(true)
+ allow_any_instance_of(Gitlab::ImportExport::Json::NdjsonReader).to receive(:exist?).and_return(false)
end
end