Add latest changes from gitlab-org/gitlab@master

3 files changed, 22 insertions, 13 deletions

diff --git a/spec/features/global_search_spec.rb b/spec/features/global_search_spec.rb
index 666bf3594de..2e63ec2d4f2 100644
--- a/spec/features/global_search_spec.rb
+++ b/spec/features/global_search_spec.rb
@@ -2,14 +2,13 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Global search' do
+RSpec.describe 'Global search', :js do
   include AfterNextHelpers
 
-  let(:user) { create(:user) }
-  let(:project) { create(:project, namespace: user.namespace) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project, namespace: user.namespace) }
 
   before do
-    stub_feature_flags(search_page_vertical_nav: false)
     project.add_maintainer(user)
     sign_in(user)
   end
@@ -42,7 +41,7 @@ RSpec.describe 'Global search' do
       end
     end
 
-    it 'closes the dropdown on blur', :js do
+    it 'closes the dropdown on blur' do
       find('#search').click
       fill_in 'search', with: "a"
 
@@ -59,7 +58,7 @@ RSpec.describe 'Global search' do
       expect(page).to have_no_selector('#js-header-search')
     end
 
-    it 'focuses search input when shortcut "s" is pressed', :js do
+    it 'focuses search input when shortcut "s" is pressed' do
       expect(page).not_to have_selector('#search:focus')
 
       find('body').native.send_key('s')
@@ -74,7 +73,7 @@ RSpec.describe 'Global search' do
       stub_feature_flags(new_header_search: true)
       visit dashboard_projects_path
 
-      # intialize javascript loaded input search input field
+      # initialize javascript loaded input search input field
       find('#search').click
       find('body').click
     end
@@ -84,7 +83,7 @@ RSpec.describe 'Global search' do
       expect(page).to have_selector('#js-header-search')
     end
 
-    it 'focuses search input when shortcut "s" is pressed', :js do
+    it 'focuses search input when shortcut "s" is pressed' do
       expect(page).not_to have_selector('#search:focus')
 
       find('body').native.send_key('s')
diff --git a/spec/features/merge_request/user_sees_diff_spec.rb b/spec/features/merge_request/user_sees_diff_spec.rb
index 2e65183d26f..0bae019793c 100644
--- a/spec/features/merge_request/user_sees_diff_spec.rb
+++ b/spec/features/merge_request/user_sees_diff_spec.rb
@@ -38,6 +38,20 @@ RSpec.describe 'Merge request > User sees diff', :js do
     end
   end
 
+  context 'when linking to a line' do
+    let(:note) { create :diff_note_on_merge_request, project: project, noteable: merge_request }
+    let(:line) { note.diff_file.highlighted_diff_lines.last }
+    let(:line_code) { line.line_code }
+
+    before do
+      visit "#{diffs_project_merge_request_path(project, merge_request)}##{line_code}"
+    end
+
+    it 'shows the linked line' do
+      expect(page).to have_selector("[id='#{line_code}']", visible: true, obscured: false)
+    end
+  end
+
   context 'when merge request has overflow' do
     it 'displays warning' do
       allow(Commit).to receive(:max_diff_options).and_return(max_files: 3)
diff --git a/spec/features/snippets/search_snippets_spec.rb b/spec/features/snippets/search_snippets_spec.rb
index 69b9a0aa64d..d18729d080a 100644
--- a/spec/features/snippets/search_snippets_spec.rb
+++ b/spec/features/snippets/search_snippets_spec.rb
@@ -2,11 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Search Snippets' do
-  before do
-    stub_feature_flags(search_page_vertical_nav: false)
-  end
-
+RSpec.describe 'Search Snippets', :js do
   it 'user searches for snippets by title' do
     public_snippet = create(:personal_snippet, :public, title: 'Beginning and Middle')
     private_snippet = create(:personal_snippet, :private, title: 'Middle and End')