Code review comments appliedfj-fix-subgroup-search-url

1 files changed, 10 insertions, 12 deletions

diff --git a/spec/features/search/user_uses_header_search_field_spec.rb b/spec/features/search/user_uses_header_search_field_spec.rb
index 05617a026f6..7ddd5c12cdf 100644
--- a/spec/features/search/user_uses_header_search_field_spec.rb
+++ b/spec/features/search/user_uses_header_search_field_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'User uses header search field' do
+describe 'User uses header search field', :js do
   include FilteredSearchHelpers
 
   let(:project) { create(:project) }
@@ -16,7 +16,7 @@ describe 'User uses header search field' do
       visit(url)
     end
 
-    it 'starts searching by pressing the enter key', :js do
+    it 'starts searching by pressing the enter key' do
       fill_in('search', with: 'gitlab')
       find('#search').native.send_keys(:enter)
 
@@ -25,7 +25,7 @@ describe 'User uses header search field' do
       end
     end
 
-    context 'when clicking the search field', :js do
+    context 'when clicking the search field' do
       before do
         page.find('#search').click
         wait_for_all_requests
@@ -35,7 +35,7 @@ describe 'User uses header search field' do
         expect(page).to have_selector('.dropdown-header', text: /#{scope_name}/i)
       end
 
-      context 'when clicking issues', :js do
+      context 'when clicking issues' do
         let!(:issue) { create(:issue, project: project, author: user, assignees: [user]) }
 
         it 'shows assigned issues' do
@@ -55,7 +55,7 @@ describe 'User uses header search field' do
         end
       end
 
-      context 'when clicking merge requests', :js do
+      context 'when clicking merge requests' do
         let!(:merge_request) { create(:merge_request, source_project: project, author: user, assignees: [user]) }
 
         it 'shows assigned merge requests' do
@@ -76,10 +76,10 @@ describe 'User uses header search field' do
       end
     end
 
-    context 'when entering text into the search field', :js do
+    context 'when entering text into the search field' do
       before do
         page.within('.search-input-wrap') do
-          fill_in('search', with: scope_name[0..3])
+          fill_in('search', with: scope_name.first(4))
         end
       end
 
@@ -89,7 +89,7 @@ describe 'User uses header search field' do
     end
   end
 
-  context 'when user is in a global scope', :js do
+  context 'when user is in a global scope' do
     include_examples 'search field examples' do
       let(:url) { root_path }
       let(:scope_name) { 'All GitLab' }
@@ -103,13 +103,12 @@ describe 'User uses header search field' do
     end
   end
 
-  context 'when user is in a group scope', :js do
+  context 'when user is in a group scope' do
     let(:group) { create(:group) }
     let(:project) { create(:project, namespace: group) }
 
     before do
       group.add_maintainer(user)
-      project.project_group_links.create(group: group)
     end
 
     include_examples 'search field examples' do
@@ -118,7 +117,7 @@ describe 'User uses header search field' do
     end
   end
 
-  context 'when user is in a subgroup scope', :js do
+  context 'when user is in a subgroup scope' do
     let(:group) { create(:group) }
     let(:subgroup) { create(:group, :public, parent: group) }
     let(:project) { create(:project, namespace: subgroup) }
@@ -126,7 +125,6 @@ describe 'User uses header search field' do
     before do
       group.add_owner(user)
       subgroup.add_owner(user)
-      project.project_group_links.create(group: subgroup)
     end
 
     include_examples 'search field examples' do