diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-24 17:18:36 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-24 17:18:36 +0300 |
| commit | f82377b89ff008c7593cf3aeffc76ba073515e3c (patch) | |
| tree | 7094e9333294e484c53e3c39769d7839fc277afb /features/steps/dashboard/todos.rb | |
| parent | ead94db602f6f2e4d3b790bd4c7e645494d72318 (diff) | |
| parent | 2338785ec9fcacc43ba2098ab1485fca292c06cc (diff) | |
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 'features/steps/dashboard/todos.rb')
| -rw-r--r-- | features/steps/dashboard/todos.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/features/steps/dashboard/todos.rb b/features/steps/dashboard/todos.rb index 13fd3239e86..4a33babe3bd 100644 --- a/features/steps/dashboard/todos.rb +++ b/features/steps/dashboard/todos.rb @@ -3,7 +3,7 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps include SharedPaths include SharedProject include SharedUser - include WaitForAjax + include WaitForRequests step '"John Doe" is a developer of project "Shop"' do project.team << [john_doe, :developer] @@ -140,7 +140,7 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps step 'I should be directed to the corresponding page' do page.should have_css('.identifier', text: 'Merge request !1') # Merge request page loads and issues a number of Ajax requests - wait_for_ajax + wait_for_requests end def should_see_todo(position, title, body, state: :pending) |