diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-25 12:07:44 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-25 12:07:44 +0000 |
commit | 5005c6e61f4d04cb6ad155b3910461cc77927dc3 (patch) | |
tree | 5e37c632ca5886d9071521303720066719351c7e /spec/controllers/import | |
parent | 6121eccf2bb21ac30a5c6c5b386e1bd3ddb17c91 (diff) | |
download | gitlab-ce-5005c6e61f4d04cb6ad155b3910461cc77927dc3.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/import')
-rw-r--r-- | spec/controllers/import/bulk_imports_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/import/bulk_imports_controller_spec.rb b/spec/controllers/import/bulk_imports_controller_spec.rb index 8f74d210667..4385342e1c6 100644 --- a/spec/controllers/import/bulk_imports_controller_spec.rb +++ b/spec/controllers/import/bulk_imports_controller_spec.rb @@ -149,7 +149,7 @@ RSpec.describe Import::BulkImportsController do context 'when connection error occurs' do before do allow(controller).to receive(:client).and_return(client) - allow(client).to receive(:get).and_raise(BulkImports::Clients::HTTP::ConnectionError) + allow(client).to receive(:get).and_raise(BulkImports::Error) end it 'returns 422' do |