diff options
| author | Phil Hughes <me@iamphill.com> | 2016-04-18 09:22:36 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-04-26 09:03:04 +0100 |
| commit | f5bea9df5325fe136042fb32fe282cc04c2ec91a (patch) | |
| tree | 96948c969b3aa3fee140e60f71793c5d40cdd3f8 | |
| parent | 262a3dd482680466b5bdc3fa1b94e06491e7a906 (diff) | |
| download | gitlab-ce-f5bea9df5325fe136042fb32fe282cc04c2ec91a.tar.gz | |
Fixed tests
| -rw-r--r-- | app/assets/stylesheets/pages/search.scss | 8 | ||||
| -rw-r--r-- | features/search.feature | 5 | ||||
| -rw-r--r-- | features/steps/search.rb | 1 |
3 files changed, 12 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss index 2b2ba2c7862..0252f464133 100644 --- a/app/assets/stylesheets/pages/search.scss +++ b/app/assets/stylesheets/pages/search.scss @@ -156,12 +156,15 @@ .search-holder { @media (min-width: $screen-sm-min) { display: -webkit-flex; - display: flex; + display: -ms-flexbox; + display: flex; } .search-field-holder { + -webkit-flex: 1 0 auto; + -ms-flex: 1 0 auto; + flex: 1 0 auto; position: relative; - width: 100%; margin-right: 0; @media (min-width: $screen-sm-min) { @@ -203,6 +206,7 @@ .dropdown-menu-toggle { width: 100%; margin-top: 5px; + border-radius: $border-radius-base; @media (min-width: $screen-sm-min) { width: 160px; 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 |