diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-11 03:08:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-11 03:08:28 +0300 |
commit | 7873bb3c1a2870761c243ea4ebe96f249ad5a319 (patch) | |
tree | 89ddef4a2e4b9cb47d41f6ff8ff68bda8777c938 /spec/tasks | |
parent | 667f6fbc8df6c23f69bc6adba15204f8559bcc3a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/tasks')
-rw-r--r-- | spec/tasks/gitlab/import_export/import_rake_spec.rb | 36 |
1 files changed, 6 insertions, 30 deletions
diff --git a/spec/tasks/gitlab/import_export/import_rake_spec.rb b/spec/tasks/gitlab/import_export/import_rake_spec.rb index 18b89912b9f..b824ede03b2 100644 --- a/spec/tasks/gitlab/import_export/import_rake_spec.rb +++ b/spec/tasks/gitlab/import_export/import_rake_spec.rb @@ -76,37 +76,13 @@ describe 'gitlab:import_export:import rake task', :sidekiq do let(:not_imported_message) { /Total number of not imported relations: 1/ } let(:error) { /Validation failed: Notes is invalid/ } - context 'when import_graceful_failures feature flag is enabled' do - before do - stub_feature_flags(import_graceful_failures: true) - end - - it 'performs project import successfully' do - expect { subject }.to output(not_imported_message).to_stdout - expect { subject }.not_to raise_error - - expect(project.merge_requests).to be_empty - expect(project.import_state.last_error).to be_nil - expect(project.import_state.status).to eq('finished') - end - end - - context 'when import_graceful_failures feature flag is disabled' do - before do - stub_feature_flags(import_graceful_failures: false) - end - - it 'fails project import with an error' do - # Catch exit call, and raise exception instead - expect_any_instance_of(GitlabProjectImport).to receive(:exit) - .with(1).and_raise(SystemExit) - - expect { subject }.to raise_error(SystemExit).and output(error).to_stdout + it 'performs project import successfully' do + expect { subject }.to output(not_imported_message).to_stdout + expect { subject }.not_to raise_error - expect(project.merge_requests).to be_empty - expect(project.import_state.last_error).to match(error) - expect(project.import_state.status).to eq('failed') - end + expect(project.merge_requests).to be_empty + expect(project.import_state.last_error).to be_nil + expect(project.import_state.status).to eq('finished') end end end |