summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-08-12 12:47:17 +0100
committerAlfredo Sumaran <alfredo@gitlab.com>2016-08-13 00:57:40 -0500
commitc617cbfcd66a5ded22041e06b5e68454c7145029 (patch)
tree02bbf498457548a8de2ea4b4dcbc9438b56e0f94 /features
parenta0cd87d175a2e2c7a19595f7fa4d250309850a35 (diff)
downloadgitlab-ce-c617cbfcd66a5ded22041e06b5e68454c7145029.tar.gz
Fixed filtering tests
Diffstat (limited to 'features')
-rw-r--r--features/steps/dashboard/event_filters.rb15
-rw-r--r--features/steps/project/issues/issues.rb3
2 files changed, 5 insertions, 13 deletions
diff --git a/features/steps/dashboard/event_filters.rb b/features/steps/dashboard/event_filters.rb
index c9896cbc24a..2708e191f75 100644
--- a/features/steps/dashboard/event_filters.rb
+++ b/features/steps/dashboard/event_filters.rb
@@ -5,38 +5,26 @@ class Spinach::Features::EventFilters < Spinach::FeatureSteps
include SharedProject
step 'I should see push event' do
- wait_for_ajax
- sleep 1
expect(page).to have_selector('span.pushed')
end
step 'I should not see push event' do
- wait_for_ajax
- sleep 1
expect(page).not_to have_selector('span.pushed')
end
step 'I should see new member event' do
- wait_for_ajax
- sleep 1
expect(page).to have_selector('span.joined')
end
step 'I should not see new member event' do
- wait_for_ajax
- sleep 1
expect(page).not_to have_selector('span.joined')
end
step 'I should see merge request event' do
- wait_for_ajax
- sleep 1
expect(page).to have_selector('span.accepted')
end
step 'I should not see merge request event' do
- wait_for_ajax
- sleep 1
expect(page).not_to have_selector('span.accepted')
end
@@ -86,13 +74,16 @@ class Spinach::Features::EventFilters < Spinach::FeatureSteps
When 'I click "push" event filter' do
click_link("push_event_filter")
+ sleep 1
end
When 'I click "team" event filter' do
click_link("team_event_filter")
+ sleep 1
end
When 'I click "merge" event filter' do
click_link("merged_event_filter")
+ sleep 1
end
end
diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb
index c1592e1d142..daee90b3767 100644
--- a/features/steps/project/issues/issues.rb
+++ b/features/steps/project/issues/issues.rb
@@ -354,7 +354,8 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
end
def filter_issue(text)
+ sleep 1
fill_in 'issue_search', with: text
- find('#issue_search').native.send_keys(:return)
+ sleep 1
end
end