Updated tests

5 files changed, 11 insertions, 8 deletions

diff --git a/features/dashboard/dashboard.feature b/features/dashboard/dashboard.feature
index db73309804c..1f4c9020731 100644
--- a/features/dashboard/dashboard.feature
+++ b/features/dashboard/dashboard.feature
@@ -7,6 +7,7 @@ Feature: Dashboard
     And project "Shop" has CI enabled
     And project "Shop" has CI build
     And project "Shop" has labels: "bug", "feature", "enhancement"
+    And project "Shop" has issue: "bug report"
     And I visit dashboard page
 
   Scenario: I should see projects list
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index 0e97e4d5954..21768c15c17 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -89,13 +89,6 @@ Feature: Project Merge Requests
     Then The list should be sorted by "Oldest updated"
 
   @javascript
-  Scenario: Visiting Issues after being sorted the list
-    Given I visit project "Shop" merge requests page
-    And I sort the list by "Oldest updated"
-    And I visit project "Shop" issues page
-    Then The list should be sorted by "Oldest updated"
-
-  @javascript
   Scenario: Visiting Merge Requests from a differente Project after sorting
     Given I visit project "Shop" merge requests page
     And I sort the list by "Oldest updated"
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb
index b3411c03118..0b4920883b8 100644
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
@@ -223,6 +223,11 @@ module SharedProject
     create(:label, project: project, title: 'enhancement')
   end
 
+  step 'project "Shop" has issue: "bug report"' do
+    project = Project.find_by(name: "Shop")
+    create(:issue, project: project, title: "bug report")
+  end
+
   step 'project "Shop" has CI enabled' do
     project = Project.find_by(name: "Shop")
     project.enable_ci
diff --git a/spec/features/issues/filter_issues_spec.rb b/spec/features/issues/filter_issues_spec.rb
index 006a06b8235..4b9b5394b61 100644
--- a/spec/features/issues/filter_issues_spec.rb
+++ b/spec/features/issues/filter_issues_spec.rb
@@ -7,6 +7,7 @@ describe 'Filter issues', feature: true do
   let!(:user)      { create(:user)}
   let!(:milestone) { create(:milestone, project: project) }
   let!(:label)     { create(:label, project: project) }
+  let!(:issue1)    { create(:issue, project: project) }
 
   before do
     project.team << [user, :master]
@@ -196,6 +197,7 @@ describe 'Filter issues', feature: true do
         page.within '.labels-filter' do
           click_link 'bug'
         end
+        find('.dropdown-menu-close-icon').click
 
         page.within '.issues-list' do
           expect(page).to have_selector('.issue', count: 1)
@@ -287,7 +289,7 @@ describe 'Filter issues', feature: true do
       wait_for_ajax
 
       page.within '.issues-list' do
-        expect(first('.issue')).to have_content('Frontend')
+        expect(page).to have_content('Frontend')
       end
     end
   end
diff --git a/spec/features/search_spec.rb b/spec/features/search_spec.rb
index 85923f0a19d..d0a301038c4 100644
--- a/spec/features/search_spec.rb
+++ b/spec/features/search_spec.rb
@@ -3,6 +3,8 @@ require 'spec_helper'
 describe "Search", feature: true  do
   let(:user) { create(:user) }
   let(:project) { create(:project, namespace: user.namespace) }
+  let!(:issue) { create(:issue, project: project, assignee: user) }
+  let!(:issue2) { create(:issue, project: project, author: user) }
 
   before do
     login_with(user)