summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorLuke Bennett <lukeeeebennettplus@gmail.com>2016-08-17 13:33:44 +0100
committerLuke Bennett <lukeeeebennettplus@gmail.com>2016-08-17 13:35:20 +0100
commit8691561016338a58e314cdaa69911523b35c6df4 (patch)
treebb50f891801ab54f69aada07429cb9ba7e7b6e37 /features
parentc0a722a223e50efeab5ed3f10523d83806a09215 (diff)
downloadgitlab-ce-8691561016338a58e314cdaa69911523b35c6df4.tar.gz
Now waits for All issuables to load when clickedremove-sleep-calls-from-phantom-update-spinach-specs
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/issues/issues.rb2
-rw-r--r--features/steps/project/merge_requests.rb2
2 files changed, 4 insertions, 0 deletions
diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb
index 35f166c7c08..056462a7152 100644
--- a/features/steps/project/issues/issues.rb
+++ b/features/steps/project/issues/issues.rb
@@ -45,6 +45,8 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
step 'I click link "All"' do
click_link "All"
+ # Waits for load
+ expect(find('.issues-state-filters > .active')).to have_content 'All'
end
step 'I click link "Release 0.4"' do
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index f3d78780da3..9778ff4a6c7 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -22,6 +22,8 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step 'I click link "All"' do
click_link "All"
+ # Waits for load
+ expect(find('.issues-state-filters > .active')).to have_content 'All'
end
step 'I click link "Merged"' do