diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-05-24 14:18:36 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-05-24 14:18:36 +0000 |
commit | f82377b89ff008c7593cf3aeffc76ba073515e3c (patch) | |
tree | 7094e9333294e484c53e3c39769d7839fc277afb /spec/features/cycle_analytics_spec.rb | |
parent | ead94db602f6f2e4d3b790bd4c7e645494d72318 (diff) | |
parent | 2338785ec9fcacc43ba2098ab1485fca292c06cc (diff) | |
download | gitlab-ce-f82377b89ff008c7593cf3aeffc76ba073515e3c.tar.gz |
Merge branch 'wait-for-ajax-handling-all-js-requests' into 'master'
Use wait_for_requests for checking Vue resource and $.ajax requests [CE]
Closes #31946 and #31555
See merge request !11451
Diffstat (limited to 'spec/features/cycle_analytics_spec.rb')
-rw-r--r-- | spec/features/cycle_analytics_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/features/cycle_analytics_spec.rb b/spec/features/cycle_analytics_spec.rb index 1c829e91c20..b416bbd3c79 100644 --- a/spec/features/cycle_analytics_spec.rb +++ b/spec/features/cycle_analytics_spec.rb @@ -17,7 +17,7 @@ feature 'Cycle Analytics', feature: true, js: true do login_as(user) visit namespace_project_cycle_analytics_path(project.namespace, project) - wait_for_ajax + wait_for_requests end it 'shows introductory message' do @@ -72,7 +72,7 @@ feature 'Cycle Analytics', feature: true, js: true do project.team << [user, :master] login_as(user) visit namespace_project_cycle_analytics_path(project.namespace, project) - wait_for_ajax + wait_for_requests end it 'shows the content in Spanish' do @@ -95,7 +95,7 @@ feature 'Cycle Analytics', feature: true, js: true do login_as(guest) visit namespace_project_cycle_analytics_path(project.namespace, project) - wait_for_ajax + wait_for_requests end it 'needs permissions to see restricted stages' do @@ -139,6 +139,6 @@ feature 'Cycle Analytics', feature: true, js: true do def click_stage(stage_name) find('.stage-nav li', text: stage_name).click - wait_for_ajax + wait_for_requests end end |