summaryrefslogtreecommitdiff
path: root/spec/tasks
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-11 06:09:46 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-11 06:09:46 +0000
commit55733b19c526145cceb120e8bb874d476a84383a (patch)
treedcde3cfb905516cd1f07ab364a94aff5fddff391 /spec/tasks
parentea99abb145ed193c2ac5d19efbff3b8990a54c9c (diff)
downloadgitlab-ce-55733b19c526145cceb120e8bb874d476a84383a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/tasks')
-rw-r--r--spec/tasks/gitlab/import_export/import_rake_spec.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/tasks/gitlab/import_export/import_rake_spec.rb b/spec/tasks/gitlab/import_export/import_rake_spec.rb
index 14e53273a5b..3a819d23299 100644
--- a/spec/tasks/gitlab/import_export/import_rake_spec.rb
+++ b/spec/tasks/gitlab/import_export/import_rake_spec.rb
@@ -6,7 +6,8 @@ describe 'gitlab:import_export:import rake task' do
let(:username) { 'root' }
let(:namespace_path) { username }
let!(:user) { create(:user, username: username) }
- let(:task_params) { [username, namespace_path, project_name, archive_path] }
+ let(:measurement_enabled) { false }
+ let(:task_params) { [username, namespace_path, project_name, archive_path, measurement_enabled] }
let(:project) { Project.find_by_full_path("#{namespace_path}/#{project_name}") }
before do
@@ -68,6 +69,8 @@ describe 'gitlab:import_export:import rake task' do
subject
end
+
+ it_behaves_like 'import measurement'
end
context 'when project import is invalid' do