From 23b35e0592b55d91e4d77ae9c758750ea13ab892 Mon Sep 17 00:00:00 2001 From: Bob Van Landuyt Date: Thu, 20 Jun 2019 18:15:09 +0200 Subject: Use next_instance_of instead of any_instance_of For prepended classes, we need to use `expect_next_instance_of` instead of RSpecs `any_instance_of` variants. --- spec/controllers/admin/application_settings_controller_spec.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/spec/controllers/admin/application_settings_controller_spec.rb b/spec/controllers/admin/application_settings_controller_spec.rb index c7f814c58c0..5ad5f9cdeea 100644 --- a/spec/controllers/admin/application_settings_controller_spec.rb +++ b/spec/controllers/admin/application_settings_controller_spec.rb @@ -120,7 +120,9 @@ describe Admin::ApplicationSettingsController do describe 'verify panel actions' do shared_examples 'renders correct panels' do it 'renders correct action on error' do - allow_any_instance_of(ApplicationSettings::UpdateService).to receive(:execute).and_return(false) + expect_next_instance_of(ApplicationSettings::UpdateService) do |service| + allow(service).to receive(:execute).and_return(false) + end patch action, params: { application_setting: { unused_param: true } } @@ -128,7 +130,10 @@ describe Admin::ApplicationSettingsController do end it 'redirects to same panel on success' do - allow_any_instance_of(ApplicationSettings::UpdateService).to receive(:execute).and_return(true) + expect_next_instance_of(ApplicationSettings::UpdateService) do |service| + allow(service).to receive(:execute).and_return(true) + end + referer_path = public_send("#{action}_admin_application_settings_path") request.env["HTTP_REFERER"] = referer_path -- cgit v1.2.1