summaryrefslogtreecommitdiff
path: root/spec/features/projects
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-07-28 07:21:04 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-07-28 07:21:04 +0000
commitfa4d08ed81b1ebbc4f242c498d02bc91d507a92a (patch)
tree3e57124db9c088a9134166cd224231ea18109404 /spec/features/projects
parent50910755c65ab77317bbf75427c3fe966103e622 (diff)
parentaa2b3ff1e4c8bb725a96ed55906d142300ccf017 (diff)
downloadgitlab-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/features/projects')
-rw-r--r--spec/features/projects/services/jira_service_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/projects/services/jira_service_spec.rb b/spec/features/projects/services/jira_service_spec.rb
index d0e26cc7dac..ecaa69c49dd 100644
--- a/spec/features/projects/services/jira_service_spec.rb
+++ b/spec/features/projects/services/jira_service_spec.rb
@@ -62,7 +62,7 @@ feature 'Setup Jira service', :js do
click_button('Test settings and save changes')
wait_for_requests
- expect(find('.flash-container-page')).to have_content 'Test failed.'
+ expect(find('.flash-container-page')).to have_content 'Test failed. message'
expect(find('.flash-container-page')).to have_content 'Save anyway'
find('.flash-alert .flash-action').trigger('click')