Add latest changes from gitlab-org/gitlab@master

3 files changed, 3 insertions, 2 deletions

diff --git a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
index dc551158895..89f6b4237a4 100644
--- a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
+++ b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
@@ -316,7 +316,7 @@ RSpec.describe 'Projects > Show > User sees setup shortcut buttons' do
           visit project_path(project)
 
           page.within('.project-buttons') do
-            expect(page).to have_link('Add Kubernetes cluster', href: new_project_cluster_path(project))
+            expect(page).to have_link('Add Kubernetes cluster', href: project_clusters_path(project))
           end
         end
 
diff --git a/spec/helpers/search_helper_spec.rb b/spec/helpers/search_helper_spec.rb
index 17dcbab09bb..457c9c0f5de 100644
--- a/spec/helpers/search_helper_spec.rb
+++ b/spec/helpers/search_helper_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 
 RSpec.describe SearchHelper do
   include MarkupHelper
+  include BadgesHelper
 
   # Override simple_sanitize for our testing purposes
   def simple_sanitize(str)
diff --git a/spec/presenters/project_presenter_spec.rb b/spec/presenters/project_presenter_spec.rb
index 27b777dec5f..e4a08bd56c8 100644
--- a/spec/presenters/project_presenter_spec.rb
+++ b/spec/presenters/project_presenter_spec.rb
@@ -554,7 +554,7 @@ RSpec.describe ProjectPresenter do
           expect(presenter.kubernetes_cluster_anchor_data).to have_attributes(
             is_link: false,
             label: a_string_including('Add Kubernetes cluster'),
-            link: presenter.new_project_cluster_path(project)
+            link: presenter.project_clusters_path(project)
           )
         end
       end