summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-04-18 09:22:36 +0100
committerPhil Hughes <me@iamphill.com>2016-04-26 09:03:04 +0100
commitf5bea9df5325fe136042fb32fe282cc04c2ec91a (patch)
tree96948c969b3aa3fee140e60f71793c5d40cdd3f8 /features
parent262a3dd482680466b5bdc3fa1b94e06491e7a906 (diff)
downloadgitlab-ce-f5bea9df5325fe136042fb32fe282cc04c2ec91a.tar.gz
Fixed tests
Diffstat (limited to 'features')
-rw-r--r--features/search.feature5
-rw-r--r--features/steps/search.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/features/search.feature b/features/search.feature
index 3cd52810e59..a946a836525 100644
--- a/features/search.feature
+++ b/features/search.feature
@@ -30,11 +30,13 @@ Feature: Search
Then I should see "Foo" link in the search results
And I should not see "Bar" link in the search results
+ @javascript
Scenario: I should see project code I am looking for
When I click project "Shop" link
And I search for "rspec"
Then I should see code results for project "Shop"
+ @javascript
Scenario: I should see project issues
And project has issues
When I click project "Shop" link
@@ -43,6 +45,7 @@ Feature: Search
Then I should see "Foo" link in the search results
And I should not see "Bar" link in the search results
+ @javascript
Scenario: I should see project merge requests
And project has merge requests
When I click project "Shop" link
@@ -51,6 +54,7 @@ Feature: Search
Then I should see "Foo" link in the search results
And I should not see "Bar" link in the search results
+ @javascript
Scenario: I should see project milestones
And project has milestones
When I click project "Shop" link
@@ -59,6 +63,7 @@ Feature: Search
Then I should see "Foo" link in the search results
And I should not see "Bar" link in the search results
+ @javascript
Scenario: I should see Wiki blobs
And project has Wiki content
When I click project "Shop" link
diff --git a/features/steps/search.rb b/features/steps/search.rb
index 0ad837ebe1d..f885baf8453 100644
--- a/features/steps/search.rb
+++ b/features/steps/search.rb
@@ -35,6 +35,7 @@ class Spinach::Features::Search < Spinach::FeatureSteps
end
step 'I click project "Shop" link' do
+ click_button 'Project'
page.within '.project-filter' do
click_link project.name_with_namespace
end