1 files changed, 33 insertions, 6 deletions

diff --git a/spec/features/search_spec.rb b/spec/features/search_spec.rb
index a6560a81096..2fda7758407 100644
--- a/spec/features/search_spec.rb
+++ b/spec/features/search_spec.rb
@@ -2,11 +2,10 @@ require 'spec_helper'
 
 describe "Search", feature: true  do
   include FilteredSearchHelpers
-  include WaitForAjax
 
   let(:user) { create(:user) }
-  let(:project) { create(:project, namespace: user.namespace) }
-  let!(:issue) { create(:issue, project: project, assignee: user) }
+  let(:project) { create(:empty_project, namespace: user.namespace) }
+  let!(:issue) { create(:issue, project: project, assignees: [user]) }
   let!(:issue2) { create(:issue, project: project, author: user) }
 
   before do
@@ -21,13 +20,14 @@ describe "Search", feature: true  do
 
   context 'search filters', js: true do
     let(:group) { create(:group) }
+    let!(:group_project) { create(:empty_project, group: group) }
 
     before do
       group.add_owner(user)
     end
 
     it 'shows group name after filtering' do
-      find('.js-search-group-dropdown').click
+      find('.js-search-group-dropdown').trigger('click')
       wait_for_ajax
 
       page.within '.search-holder' do
@@ -37,9 +37,27 @@ describe "Search", feature: true  do
       expect(find('.js-search-group-dropdown')).to have_content(group.name)
     end
 
+    it 'filters by group projects after filtering by group' do
+      find('.js-search-group-dropdown').trigger('click')
+      wait_for_ajax
+
+      page.within '.search-holder' do
+        click_link group.name
+      end
+
+      expect(find('.js-search-group-dropdown')).to have_content(group.name)
+
+      page.within('.project-filter') do
+        find('.js-search-project-dropdown').trigger('click')
+        wait_for_ajax
+
+        expect(page).to have_link(group_project.name_with_namespace)
+      end
+    end
+
     it 'shows project name after filtering' do
       page.within('.project-filter') do
-        find('.js-search-project-dropdown').click
+        find('.js-search-project-dropdown').trigger('click')
         wait_for_ajax
 
         click_link project.name_with_namespace
@@ -62,6 +80,7 @@ describe "Search", feature: true  do
 
   context 'search for comments' do
     context 'when comment belongs to a invalid commit' do
+      let(:project) { create(:project, :repository) }
       let(:note) { create(:note_on_commit, author: user, project: project, commit_id: project.repository.commit.id, note: 'Bug here') }
 
       before { note.update_attributes(commit_id: 12345678) }
@@ -103,6 +122,7 @@ describe "Search", feature: true  do
     end
 
     it 'finds a commit' do
+      project = create(:project, :repository) { |p| p.add_reporter(user) }
       visit namespace_project_path(project.namespace, project)
 
       page.within '.search' do
@@ -116,16 +136,19 @@ describe "Search", feature: true  do
     end
 
     it 'finds a code' do
+      project = create(:project, :repository) { |p| p.add_reporter(user) }
       visit namespace_project_path(project.namespace, project)
 
       page.within '.search' do
-        fill_in 'search', with: 'def'
+        fill_in 'search', with: 'application.js'
         click_button 'Go'
       end
 
       click_link "Code"
 
       expect(page).to have_selector('.file-content .code')
+
+      expect(page).to have_selector("span.line[lang='javascript']")
     end
   end
 
@@ -162,6 +185,8 @@ describe "Search", feature: true  do
       end
 
       context 'click the links in the category search dropdown', js: true do
+        let!(:merge_request) { create(:merge_request, source_project: project, author: user, assignee: user) }
+
         before do
           page.find('#search').click
         end
@@ -218,6 +243,8 @@ describe "Search", feature: true  do
   end
 
   describe 'search for commits' do
+    let(:project) { create(:project, :repository) }
+
     before do
       visit search_path(project_id: project.id)
     end