Save search options when switch between filter

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

2 files changed, 20 insertions, 4 deletions

diff --git a/features/search.feature b/features/search.feature
index b174d973122..54708c17575 100644
--- a/features/search.feature
+++ b/features/search.feature
@@ -24,6 +24,23 @@ Feature: Search
     And I should not see "Bar" link
 
   Scenario: I should see project code I am looking for
-    When I search for "rspec"
-    And I click project "Shop" link
+    When I click project "Shop" link
+    And I search for "rspec"
     Then I should see code results for project "Shop"
+
+  Scenario: I should see project issues
+    And project has issues
+    When I click project "Shop" link
+    And I search for "Foo"
+    And I click "Issues" link
+    Then I should see "Foo" link
+    And I should not see "Bar" link
+
+  Scenario: I should see project merge requests
+    And project has merge requests
+    When I click project "Shop" link
+    And I search for "Foo"
+    And I click "Merge requests" link
+    Then I should see "Foo" link
+    And I should not see "Bar" link
+
diff --git a/features/steps/project/search_code.rb b/features/steps/project/search_code.rb
index affa7d3b43b..55218b6e745 100644
--- a/features/steps/project/search_code.rb
+++ b/features/steps/project/search_code.rb
@@ -6,7 +6,6 @@ class ProjectSearchCode < Spinach::FeatureSteps
   step 'I search for term "coffee"' do
     fill_in "search", with: "coffee"
     click_button "Go"
-    click_link 'Repository Code'
   end
 
   step 'I should see files from repository containing "coffee"' do
@@ -15,6 +14,6 @@ class ProjectSearchCode < Spinach::FeatureSteps
   end
 
   step 'I should see empty result' do
-    page.should have_content "We couldn't find any matching code"
+    page.should have_content "We couldn't find any matching"
   end
 end