diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-01-14 16:06:40 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-01-14 16:06:40 +0000 |
| commit | 31af7daf788f3f65d630ab4e5d8bae4bd5607807 (patch) | |
| tree | 538e3b0123fe8a96c31988ad1990f7fc06e2f20d /spec/controllers | |
| parent | c01c487cf0a32fb9c3c4122e714de9d397caafbc (diff) | |
| parent | 660dcd5b7c038f86002ddecf3562e1b7018e143c (diff) | |
| download | gitlab-ce-31af7daf788f3f65d630ab4e5d8bae4bd5607807.tar.gz | |
Merge branch 'sh-fix-bitbucket-server-error-handling' into 'master'
Fix Bitbucket Server importer error handling
Closes #56154
See merge request gitlab-org/gitlab-ce!24343
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/import/bitbucket_server_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/import/bitbucket_server_controller_spec.rb b/spec/controllers/import/bitbucket_server_controller_spec.rb index 73195463a50..bb282db5a41 100644 --- a/spec/controllers/import/bitbucket_server_controller_spec.rb +++ b/spec/controllers/import/bitbucket_server_controller_spec.rb @@ -78,7 +78,7 @@ describe Import::BitbucketServerController do end it "returns an error when the server can't be contacted" do - expect(client).to receive(:repo).with(project_key, repo_slug).and_raise(BitbucketServer::Client::ServerError) + expect(client).to receive(:repo).with(project_key, repo_slug).and_raise(::BitbucketServer::Connection::ConnectionError) post :create, params: { project: project_key, repository: repo_slug }, format: :json |