diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-28 07:21:04 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-28 07:21:04 +0000 |
commit | fa4d08ed81b1ebbc4f242c498d02bc91d507a92a (patch) | |
tree | 3e57124db9c088a9134166cd224231ea18109404 /spec/models | |
parent | 50910755c65ab77317bbf75427c3fe966103e622 (diff) | |
parent | aa2b3ff1e4c8bb725a96ed55906d142300ccf017 (diff) | |
download | gitlab-ce-fa4d08ed81b1ebbc4f242c498d02bc91d507a92a.tar.gz |
Merge branch '32483-jira-error' into 'master'
Display specific error message when JIRA test fails
Closes #32483
See merge request !13100
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/project_services/jira_service_spec.rb | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/spec/models/project_services/jira_service_spec.rb b/spec/models/project_services/jira_service_spec.rb index c9e8d7e194d..8f34b44930e 100644 --- a/spec/models/project_services/jira_service_spec.rb +++ b/spec/models/project_services/jira_service_spec.rb @@ -197,21 +197,38 @@ describe JiraService do ) end - def test_settings(api_url) + def test_settings(api_url = nil) + api_url ||= 'jira.example.com' test_url = "http://#{api_url}/rest/api/2/serverInfo" WebMock.stub_request(:get, test_url).with(basic_auth: %w(jira_username jira_password)).to_return(body: { url: 'http://url' }.to_json ) - jira_service.test_settings + jira_service.test(nil) end - it 'tries to get JIRA project with URL when API URL not set' do - test_settings('jira.example.com') + context 'when the test succeeds' do + it 'tries to get JIRA project with URL when API URL not set' do + test_settings('jira.example.com') + end + + it 'returns correct result' do + expect(test_settings).to eq( { success: true, result: { 'url' => 'http://url' } }) + end + + it 'tries to get JIRA project with API URL if set' do + jira_service.update(api_url: 'http://jira.api.com') + test_settings('jira.api.com') + end end - it 'tries to get JIRA project with API URL if set' do - jira_service.update(api_url: 'http://jira.api.com') - test_settings('jira.api.com') + context 'when the test fails' do + it 'returns result with the error' do + test_url = 'http://jira.example.com/rest/api/2/serverInfo' + WebMock.stub_request(:get, test_url).with(basic_auth: %w(jira_username jira_password)) + .to_raise(JIRA::HTTPError.new(double(message: 'Some specific failure.'))) + + expect(jira_service.test(nil)).to eq( { success: false, result: 'Some specific failure.' }) + end end end |