Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 4 insertions, 4 deletions

diff --git a/spec/controllers/projects/services_controller_spec.rb b/spec/controllers/projects/services_controller_spec.rb
index 488a34b74df..d8fb3b226ed 100644
--- a/spec/controllers/projects/services_controller_spec.rb
+++ b/spec/controllers/projects/services_controller_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe Projects::ServicesController do
   describe '#test' do
     context 'when can_test? returns false' do
       it 'renders 404' do
-        allow_any_instance_of(Service).to receive(:can_test?).and_return(false)
+        allow_any_instance_of(Integration).to receive(:can_test?).and_return(false)
 
         put :test, params: project_params
 
@@ -271,7 +271,7 @@ RSpec.describe Projects::ServicesController do
           expect(response).to redirect_to(edit_project_service_path(project, service))
           expected_alert = "You can now manage your Prometheus settings on the <a href=\"#{project_settings_operations_path(project)}\">Operations</a> page. Fields on this page has been deprecated."
 
-          expect(response).to set_flash.now[:alert].to(expected_alert)
+          expect(controller).to set_flash.now[:alert].to(expected_alert)
         end
 
         it 'does not modify service' do
@@ -317,7 +317,7 @@ RSpec.describe Projects::ServicesController do
 
         it 'renders deprecation warning notice' do
           expected_alert = "You can now manage your Prometheus settings on the <a href=\"#{project_settings_operations_path(project)}\">Operations</a> page. Fields on this page has been deprecated."
-          expect(response).to set_flash.now[:alert].to(expected_alert)
+          expect(controller).to set_flash.now[:alert].to(expected_alert)
         end
       end
 
@@ -328,7 +328,7 @@ RSpec.describe Projects::ServicesController do
         end
 
         it 'does not render deprecation warning notice' do
-          expect(response).not_to set_flash.now[:alert]
+          expect(controller).not_to set_flash.now[:alert]
         end
       end
     end