From d1f64363b1bcf9664882a66bd6277691e90c7031 Mon Sep 17 00:00:00 2001 From: Luke Imhoff Date: Tue, 20 Oct 2015 15:13:50 -0500 Subject: [PATCH] .any_instance -> *_any_isntance_of() MSP-13484 --- spec/lib/metasploit/framework/login_scanner/vnc_spec.rb | 6 +++--- spec/lib/msf/core/encoded_payload_spec.rb | 5 +++-- spec/support/shared/examples/msf/module_manager/cache.rb | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/spec/lib/metasploit/framework/login_scanner/vnc_spec.rb b/spec/lib/metasploit/framework/login_scanner/vnc_spec.rb index ca224b9d62..cfcb5ab234 100644 --- a/spec/lib/metasploit/framework/login_scanner/vnc_spec.rb +++ b/spec/lib/metasploit/framework/login_scanner/vnc_spec.rb @@ -24,14 +24,14 @@ RSpec.describe Metasploit::Framework::LoginScanner::VNC do end it 'returns a connection_error result when the handshake fails' do - expect(Rex::Proto::RFB::Client.any_instance).to receive(:handshake).and_return false + expect_any_instance_of(Rex::Proto::RFB::Client).to receive(:handshake).and_return false result = login_scanner.attempt_login(test_cred) expect(result.status).to eq Metasploit::Model::Login::Status::UNABLE_TO_CONNECT end it 'returns a failed result when authentication fails' do - expect(Rex::Proto::RFB::Client.any_instance).to receive(:handshake).and_return true - expect(Rex::Proto::RFB::Client.any_instance).to receive(:authenticate).with(private).and_return false + expect_any_instance_of(Rex::Proto::RFB::Client).to receive(:handshake).and_return true + expect_any_instance_of(Rex::Proto::RFB::Client).to receive(:authenticate).with(private).and_return false result = login_scanner.attempt_login(test_cred) expect(result.status).to eq Metasploit::Model::Login::Status::INCORRECT end diff --git a/spec/lib/msf/core/encoded_payload_spec.rb b/spec/lib/msf/core/encoded_payload_spec.rb index 18f126fda0..827dfd833d 100644 --- a/spec/lib/msf/core/encoded_payload_spec.rb +++ b/spec/lib/msf/core/encoded_payload_spec.rb @@ -62,9 +62,10 @@ RSpec.describe Msf::EncodedPayload do end context 'when passed a valid payload instance' do - # don't ever actually generate payload bytes - before { described_class.any_instance.stub(:generate) } + before(:each) do + allow_any_instance_of(described_class).to receive(:generate) + end it 'returns an Msf::EncodedPayload instance' do expect(encoded_payload).to be_a(described_class) diff --git a/spec/support/shared/examples/msf/module_manager/cache.rb b/spec/support/shared/examples/msf/module_manager/cache.rb index ab4a3f83fd..77a76df998 100644 --- a/spec/support/shared/examples/msf/module_manager/cache.rb +++ b/spec/support/shared/examples/msf/module_manager/cache.rb @@ -174,7 +174,7 @@ shared_examples_for 'Msf::ModuleManager::Cache' do end it 'should force load using #load_module on the loader' do - expect(Msf::Modules::Loader::Directory.any_instance).to receive( + expect_any_instance_of(Msf::Modules::Loader::Directory).to receive( :load_module ).with( parent_path,