summaryrefslogtreecommitdiff
path: root/spec/features/projects
diff options
context:
space:
mode:
authorJarka Kadlecova <jarka@gitlab.com>2017-05-29 11:29:43 +0200
committerJarka Kadlecova <jarka@gitlab.com>2017-06-01 07:47:15 +0200
commit6fad5640e73837ba148b0ed005205adff91d8a4e (patch)
treee30f52bb72741da710b3bd2c1e45540bd8943fd3 /spec/features/projects
parentb71025c014babf9663e0451ad21eabde91570259 (diff)
downloadgitlab-ce-6fad5640e73837ba148b0ed005205adff91d8a4e.tar.gz
fix failing specs
Diffstat (limited to 'spec/features/projects')
-rw-r--r--spec/features/projects/services/jira_service_spec.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/features/projects/services/jira_service_spec.rb b/spec/features/projects/services/jira_service_spec.rb
index d40c332be6f..3d951d6b3e3 100644
--- a/spec/features/projects/services/jira_service_spec.rb
+++ b/spec/features/projects/services/jira_service_spec.rb
@@ -35,7 +35,7 @@ feature 'Setup Jira service', :feature, :js do
click_link('JIRA')
fill_form
click_button('Test settings and save changes')
- wait_for_ajax
+ wait_for_requests
expect(page).to have_content('JIRA activated.')
expect(current_path).to eq(namespace_project_settings_integrations_path(project.namespace, project))
@@ -51,12 +51,12 @@ feature 'Setup Jira service', :feature, :js do
click_link('JIRA')
fill_form
click_button('Test settings and save changes')
- wait_for_ajax
+ wait_for_requests
expect(page).to have_content('Test failed.Save anyway')
- click_on('Save anyway')
- wait_for_ajax
+ find('.flash-alert .flash-action').trigger('click')
+ wait_for_requests
expect(page).to have_content('JIRA activated.')
expect(current_path).to eq(namespace_project_settings_integrations_path(project.namespace, project))