summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-04-02 09:07:47 -0700
committerStan Hu <stanhu@gmail.com>2017-04-02 09:11:59 -0700
commit6bffef880df8768798781d049eb629be834f5cfe (patch)
treee4fd466ad6986fa4f9d245e7b294394629d9de17 /features
parent9fc17f6f4abdb04f3cf1b60b87bd67b894a19c39 (diff)
downloadgitlab-ce-6bffef880df8768798781d049eb629be834f5cfe.tar.gz
Add a wait_for_ajax call to ensure Todos page cleans up properlysh-fix-todos-spinach-failure
Potentially fixes intermittent failures such as https://gitlab.com/gitlab-org/gitlab-ce/builds/13484375
Diffstat (limited to 'features')
-rw-r--r--features/steps/dashboard/todos.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/features/steps/dashboard/todos.rb b/features/steps/dashboard/todos.rb
index 7bd3c7ee653..3225e19995b 100644
--- a/features/steps/dashboard/todos.rb
+++ b/features/steps/dashboard/todos.rb
@@ -3,6 +3,7 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
include SharedPaths
include SharedProject
include SharedUser
+ include WaitForAjax
step '"John Doe" is a developer of project "Shop"' do
project.team << [john_doe, :developer]
@@ -138,6 +139,8 @@ 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
end
def should_see_todo(position, title, body, state: :pending)