Commit f5bea9df authored by Phil Hughes's avatar Phil Hughes

Fixed tests

parent 262a3dd4
...@@ -156,12 +156,15 @@ ...@@ -156,12 +156,15 @@
.search-holder { .search-holder {
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
display: -webkit-flex; display: -webkit-flex;
display: -ms-flexbox;
display: flex; display: flex;
} }
.search-field-holder { .search-field-holder {
-webkit-flex: 1 0 auto;
-ms-flex: 1 0 auto;
flex: 1 0 auto;
position: relative; position: relative;
width: 100%;
margin-right: 0; margin-right: 0;
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
...@@ -203,6 +206,7 @@ ...@@ -203,6 +206,7 @@
.dropdown-menu-toggle { .dropdown-menu-toggle {
width: 100%; width: 100%;
margin-top: 5px; margin-top: 5px;
border-radius: $border-radius-base;
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
width: 160px; width: 160px;
......
...@@ -30,11 +30,13 @@ Feature: Search ...@@ -30,11 +30,13 @@ Feature: Search
Then I should see "Foo" link in the search results Then I should see "Foo" link in the search results
And I should not see "Bar" 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 Scenario: I should see project code I am looking for
When I click project "Shop" link When I click project "Shop" link
And I search for "rspec" And I search for "rspec"
Then I should see code results for project "Shop" Then I should see code results for project "Shop"
@javascript
Scenario: I should see project issues Scenario: I should see project issues
And project has issues And project has issues
When I click project "Shop" link When I click project "Shop" link
...@@ -43,6 +45,7 @@ Feature: Search ...@@ -43,6 +45,7 @@ Feature: Search
Then I should see "Foo" link in the search results Then I should see "Foo" link in the search results
And I should not see "Bar" link in the search results And I should not see "Bar" link in the search results
@javascript
Scenario: I should see project merge requests Scenario: I should see project merge requests
And project has merge requests And project has merge requests
When I click project "Shop" link When I click project "Shop" link
...@@ -51,6 +54,7 @@ Feature: Search ...@@ -51,6 +54,7 @@ Feature: Search
Then I should see "Foo" link in the search results Then I should see "Foo" link in the search results
And I should not see "Bar" link in the search results And I should not see "Bar" link in the search results
@javascript
Scenario: I should see project milestones Scenario: I should see project milestones
And project has milestones And project has milestones
When I click project "Shop" link When I click project "Shop" link
...@@ -59,6 +63,7 @@ Feature: Search ...@@ -59,6 +63,7 @@ Feature: Search
Then I should see "Foo" link in the search results Then I should see "Foo" link in the search results
And I should not see "Bar" link in the search results And I should not see "Bar" link in the search results
@javascript
Scenario: I should see Wiki blobs Scenario: I should see Wiki blobs
And project has Wiki content And project has Wiki content
When I click project "Shop" link When I click project "Shop" link
......
...@@ -35,6 +35,7 @@ class Spinach::Features::Search < Spinach::FeatureSteps ...@@ -35,6 +35,7 @@ class Spinach::Features::Search < Spinach::FeatureSteps
end end
step 'I click project "Shop" link' do step 'I click project "Shop" link' do
click_button 'Project'
page.within '.project-filter' do page.within '.project-filter' do
click_link project.name_with_namespace click_link project.name_with_namespace
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment