decribe -> RSpec.describe

MSP-13484

Disabled expose_dsl_globally in spec_helper, so need to qualify
top-level describe.

spec/lib/active_record/connection_adapters/abstract_adapter/connection_pool_spec.rb

@@ -1,7 +1,7 @@
 # -*- coding:binary -*-
 require 'spec_helper'
 
-describe ActiveRecord::ConnectionAdapters::ConnectionPool do
+RSpec.describe ActiveRecord::ConnectionAdapters::ConnectionPool do
   self.use_transactional_fixtures = false
 
   def database_configurations

spec/lib/metasploit/framework/credential_collection_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/credential_collection'
 
-describe Metasploit::Framework::CredentialCollection do
+RSpec.describe Metasploit::Framework::CredentialCollection do
 
   subject(:collection) do
     described_class.new(

spec/lib/metasploit/framework/credential_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/credential'
 
-describe Metasploit::Framework::Credential do
+RSpec.describe Metasploit::Framework::Credential do
 
   subject(:cred_detail) {
     described_class.new

spec/lib/metasploit/framework/jtr/cracker_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/jtr/cracker'
 
-describe Metasploit::Framework::JtR::Cracker do
+RSpec.describe Metasploit::Framework::JtR::Cracker do
 
   subject(:cracker) { described_class.new }
   let(:john_path) { '/path/to/john' }

spec/lib/metasploit/framework/jtr/invalid_wordlist_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/jtr/invalid_wordlist'
 
-describe Metasploit::Framework::JtR::InvalidWordlist do
+RSpec.describe Metasploit::Framework::JtR::InvalidWordlist do
 
   subject(:invalid) do
     described_class.new(model)

spec/lib/metasploit/framework/jtr/wordlist_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/jtr/wordlist'
 
-describe Metasploit::Framework::JtR::Wordlist do
+RSpec.describe Metasploit::Framework::JtR::Wordlist do
 
   subject(:wordlist) { described_class.new }
 

spec/lib/metasploit/framework/login_scanner/afp_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/afp'
 
-describe Metasploit::Framework::LoginScanner::AFP do
+RSpec.describe Metasploit::Framework::LoginScanner::AFP do
 
   subject(:scanner) { described_class.new }
 

spec/lib/metasploit/framework/login_scanner/axis2_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/axis2'
 
-describe Metasploit::Framework::LoginScanner::Axis2 do
+RSpec.describe Metasploit::Framework::LoginScanner::Axis2 do
 
   it_behaves_like 'Metasploit::Framework::LoginScanner::Base',  has_realm_key: true, has_default_realm: false
   it_behaves_like 'Metasploit::Framework::LoginScanner::RexSocket'

spec/lib/metasploit/framework/login_scanner/base_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/base'
 
-describe Metasploit::Framework::LoginScanner::Base do
+RSpec.describe Metasploit::Framework::LoginScanner::Base do
 
   let(:base_class) {
     Class.new do

spec/lib/metasploit/framework/login_scanner/buffalo_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/buffalo'
 
-describe Metasploit::Framework::LoginScanner::Buffalo do
+RSpec.describe Metasploit::Framework::LoginScanner::Buffalo do
 
     it_behaves_like 'Metasploit::Framework::LoginScanner::Base',  has_realm_key: true, has_default_realm: false
     it_behaves_like 'Metasploit::Framework::LoginScanner::RexSocket'

spec/lib/metasploit/framework/login_scanner/chef_webui_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/chef_webui'
 
-describe Metasploit::Framework::LoginScanner::ChefWebUI do
+RSpec.describe Metasploit::Framework::LoginScanner::ChefWebUI do
 
   subject(:http_scanner) { described_class.new }
 

spec/lib/metasploit/framework/login_scanner/db2_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/db2'
 
-describe Metasploit::Framework::LoginScanner::DB2 do
+RSpec.describe Metasploit::Framework::LoginScanner::DB2 do
   let(:public) { 'root' }
   let(:private) { 'toor' }
   let(:test_cred) {

spec/lib/metasploit/framework/login_scanner/ftp_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/ftp'
 
-describe Metasploit::Framework::LoginScanner::FTP do
+RSpec.describe Metasploit::Framework::LoginScanner::FTP do
   let(:public) { 'root' }
   let(:private) { 'toor' }
 

spec/lib/metasploit/framework/login_scanner/gitlab_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/gitlab'
 
-describe Metasploit::Framework::LoginScanner::GitLab do
+RSpec.describe Metasploit::Framework::LoginScanner::GitLab do
 
     it_behaves_like 'Metasploit::Framework::LoginScanner::Base',  has_realm_key: true, has_default_realm: false
     it_behaves_like 'Metasploit::Framework::LoginScanner::RexSocket'

spec/lib/metasploit/framework/login_scanner/glassfish_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/glassfish'
 
-describe Metasploit::Framework::LoginScanner::Glassfish do
+RSpec.describe Metasploit::Framework::LoginScanner::Glassfish do
 
   subject(:http_scanner) { described_class.new }
 

spec/lib/metasploit/framework/login_scanner/http_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/http'
 
-describe Metasploit::Framework::LoginScanner::HTTP do
+RSpec.describe Metasploit::Framework::LoginScanner::HTTP do
 
   it_behaves_like 'Metasploit::Framework::LoginScanner::Base',  has_realm_key: true, has_default_realm: false
   it_behaves_like 'Metasploit::Framework::LoginScanner::RexSocket'

spec/lib/metasploit/framework/login_scanner/invalid_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/invalid'
 
-describe Metasploit::Framework::LoginScanner::Invalid do
+RSpec.describe Metasploit::Framework::LoginScanner::Invalid do
 
   subject(:invalid) do
     described_class.new(model)

spec/lib/metasploit/framework/login_scanner/ipboard_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/ipboard'
 
-describe Metasploit::Framework::LoginScanner::IPBoard do
+RSpec.describe Metasploit::Framework::LoginScanner::IPBoard do
 
   subject { described_class.new }
 

spec/lib/metasploit/framework/login_scanner/jenkins_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/jenkins'
 
-describe Metasploit::Framework::LoginScanner::Jenkins do
+RSpec.describe Metasploit::Framework::LoginScanner::Jenkins do
 
     it_behaves_like 'Metasploit::Framework::LoginScanner::Base',  has_realm_key: true, has_default_realm: false
     it_behaves_like 'Metasploit::Framework::LoginScanner::RexSocket'

spec/lib/metasploit/framework/login_scanner/manageengine_desktop_central_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/manageengine_desktop_central'
 
-describe Metasploit::Framework::LoginScanner::ManageEngineDesktopCentral do
+RSpec.describe Metasploit::Framework::LoginScanner::ManageEngineDesktopCentral do
 
     it_behaves_like 'Metasploit::Framework::LoginScanner::Base',  has_realm_key: true, has_default_realm: false
     it_behaves_like 'Metasploit::Framework::LoginScanner::RexSocket'

spec/lib/metasploit/framework/login_scanner/mssql_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/mssql'
 
-describe Metasploit::Framework::LoginScanner::MSSQL do
+RSpec.describe Metasploit::Framework::LoginScanner::MSSQL do
   let(:public) { 'root' }
   let(:private) { 'toor' }
 

spec/lib/metasploit/framework/login_scanner/mybook_live_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/mybook_live'
 
-describe Metasploit::Framework::LoginScanner::MyBookLive do
+RSpec.describe Metasploit::Framework::LoginScanner::MyBookLive do
 
     it_behaves_like 'Metasploit::Framework::LoginScanner::Base',  has_realm_key: true, has_default_realm: false
     it_behaves_like 'Metasploit::Framework::LoginScanner::RexSocket'

spec/lib/metasploit/framework/login_scanner/mysql_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/mysql'
 
-describe Metasploit::Framework::LoginScanner::MySQL do
+RSpec.describe Metasploit::Framework::LoginScanner::MySQL do
   let(:public) { 'root' }
   let(:private) { 'toor' }
   let(:pub_blank) {

spec/lib/metasploit/framework/login_scanner/nessus_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/nessus'
 
-describe Metasploit::Framework::LoginScanner::Nessus do
+RSpec.describe Metasploit::Framework::LoginScanner::Nessus do
 
     subject(:http_scanner) { described_class.new }
 

spec/lib/metasploit/framework/login_scanner/pop3_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/pop3'
 
-describe Metasploit::Framework::LoginScanner::POP3 do
+RSpec.describe Metasploit::Framework::LoginScanner::POP3 do
   subject(:scanner) { described_class.new }
 
   it_behaves_like 'Metasploit::Framework::LoginScanner::Base',  has_realm_key: false, has_default_realm: false

spec/lib/metasploit/framework/login_scanner/postgres_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/postgres'
 
-describe Metasploit::Framework::LoginScanner::Postgres do
+RSpec.describe Metasploit::Framework::LoginScanner::Postgres do
   let(:public) { 'root' }
   let(:private) { 'toor' }
   let(:realm) { 'template1' }

spec/lib/metasploit/framework/login_scanner/result_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner'
 
-describe Metasploit::Framework::LoginScanner::Result do
+RSpec.describe Metasploit::Framework::LoginScanner::Result do
 
   let(:private) { 'toor' }
   let(:proof) { 'foobar' }

spec/lib/metasploit/framework/login_scanner/smb_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/smb'
 
-describe Metasploit::Framework::LoginScanner::SMB do
+RSpec.describe Metasploit::Framework::LoginScanner::SMB do
   let(:public) { 'root' }
   let(:private) { 'toor' }
 

spec/lib/metasploit/framework/login_scanner/smh_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/smh'
 
-describe Metasploit::Framework::LoginScanner::Smh do
+RSpec.describe Metasploit::Framework::LoginScanner::Smh do
 
   subject(:smh_cli) { described_class.new }
 

spec/lib/metasploit/framework/login_scanner/snmp_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/snmp'
 
-describe Metasploit::Framework::LoginScanner::SNMP do
+RSpec.describe Metasploit::Framework::LoginScanner::SNMP do
   let(:public) { 'public' }
   let(:private) { nil }
 

spec/lib/metasploit/framework/login_scanner/ssh_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/ssh'
 
-describe Metasploit::Framework::LoginScanner::SSH do
+RSpec.describe Metasploit::Framework::LoginScanner::SSH do
   let(:public) { 'root' }
   let(:private) { 'toor' }
   let(:key) { OpenSSL::PKey::RSA.generate(2048).to_s }

spec/lib/metasploit/framework/login_scanner/symantec_web_gateway_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/symantec_web_gateway'
 
-describe Metasploit::Framework::LoginScanner::SymantecWebGateway do
+RSpec.describe Metasploit::Framework::LoginScanner::SymantecWebGateway do
 
     it_behaves_like 'Metasploit::Framework::LoginScanner::Base',  has_realm_key: true, has_default_realm: false
     it_behaves_like 'Metasploit::Framework::LoginScanner::RexSocket'

spec/lib/metasploit/framework/login_scanner/telnet_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/telnet'
 
-describe Metasploit::Framework::LoginScanner::Telnet do
+RSpec.describe Metasploit::Framework::LoginScanner::Telnet do
 
   subject(:login_scanner) { described_class.new }
 

spec/lib/metasploit/framework/login_scanner/tomcat_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/tomcat'
 
-describe Metasploit::Framework::LoginScanner::Tomcat do
+RSpec.describe Metasploit::Framework::LoginScanner::Tomcat do
 
   it_behaves_like 'Metasploit::Framework::LoginScanner::Base',  has_realm_key: true, has_default_realm: false
   it_behaves_like 'Metasploit::Framework::LoginScanner::RexSocket'

spec/lib/metasploit/framework/login_scanner/vmauthd_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/vmauthd'
 
-describe Metasploit::Framework::LoginScanner::VMAUTHD do
+RSpec.describe Metasploit::Framework::LoginScanner::VMAUTHD do
   subject(:scanner) { described_class.new }
 
   it_behaves_like 'Metasploit::Framework::LoginScanner::Base',  has_realm_key: false, has_default_realm: false

spec/lib/metasploit/framework/login_scanner/vnc_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/vnc'
 
-describe Metasploit::Framework::LoginScanner::VNC do
+RSpec.describe Metasploit::Framework::LoginScanner::VNC do
   let(:private) { 'password' }
   let(:blank) { '' }
   let(:test_cred) {

spec/lib/metasploit/framework/login_scanner/winrm_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/winrm'
 
-describe Metasploit::Framework::LoginScanner::WinRM do
+RSpec.describe Metasploit::Framework::LoginScanner::WinRM do
 
   it_behaves_like 'Metasploit::Framework::LoginScanner::Base',  has_realm_key: true, has_default_realm: true
   it_behaves_like 'Metasploit::Framework::LoginScanner::RexSocket'

spec/lib/metasploit/framework/login_scanner/wordpress_rpc_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/wordpress_rpc'
 
-describe Metasploit::Framework::LoginScanner::WordpressRPC do
+RSpec.describe Metasploit::Framework::LoginScanner::WordpressRPC do
 
   it_behaves_like 'Metasploit::Framework::LoginScanner::Base',  has_realm_key: true, has_default_realm: false
   it_behaves_like 'Metasploit::Framework::LoginScanner::RexSocket'

spec/lib/metasploit/framework/login_scanner/zabbix_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 require 'metasploit/framework/login_scanner/zabbix'
 
-describe Metasploit::Framework::LoginScanner::Zabbix do
+RSpec.describe Metasploit::Framework::LoginScanner::Zabbix do
 
   subject(:http_scanner) { described_class.new }
 

spec/lib/metasploit/framework/login_scanner_spec.rb

@@ -4,7 +4,7 @@ require 'metasploit/framework/login_scanner/http'
 require 'metasploit/framework/login_scanner/smb'
 require 'metasploit/framework/login_scanner/vnc'
 
-describe Metasploit::Framework::LoginScanner do
+RSpec.describe Metasploit::Framework::LoginScanner do
 
   subject { described_class.classes_for_service(service) }
   let(:port) { nil }

spec/lib/msf/base/sessions/meterpreter_spec.rb

@@ -3,7 +3,7 @@ require 'msf/base/sessions/meterpreter'
 require 'rex/post/meterpreter/extensions/stdapi/net/interface'
 require 'rex/post/meterpreter/extensions/stdapi/net/route'
 
-describe Msf::Sessions::Meterpreter do
+RSpec.describe Msf::Sessions::Meterpreter do
   before do
     allow_any_instance_of(Rex::Post::Meterpreter::PacketDispatcher).to receive(:monitor_socket)
   end

spec/lib/msf/base/simple/framework_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Msf::Simple::Framework do
+RSpec.describe Msf::Simple::Framework do
   include_context 'Msf::Simple::Framework'
 
   subject do

spec/lib/msf/core/author_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Msf::Author do
+RSpec.describe Msf::Author do
 
   context 'KNOWN' do
     subject(:known) {

spec/lib/msf/core/auxiliary/drdos_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 require 'msf/core/auxiliary/drdos'
 
-describe Msf::Auxiliary::DRDoS do
+RSpec.describe Msf::Auxiliary::DRDoS do
   subject do
     mod = Module.new
     mod.extend described_class

spec/lib/msf/core/auxiliary/kademlia_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'msf/core/auxiliary/kademlia'
 
-describe Msf::Auxiliary::Kademlia do
+RSpec.describe Msf::Auxiliary::Kademlia do
   subject(:kad) do
     mod = Module.new
     mod.extend described_class

spec/lib/msf/core/data_store_spec.rb

@@ -32,7 +32,7 @@ shared_examples "datastore" do
   end
 end
 
-describe Msf::DataStore do
+RSpec.describe Msf::DataStore do
 
   describe "#import_option" do
     subject do

spec/lib/msf/core/encoded_payload_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'msf/core/encoded_payload'
 
-describe Msf::EncodedPayload do
+RSpec.describe Msf::EncodedPayload do
   include_context 'Msf::Simple::Framework#modules loading'
 
   before do

spec/lib/msf/core/exe/segment_appender_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'msf/core/exe/segment_appender'
 
-describe Msf::Exe::SegmentAppender do
+RSpec.describe Msf::Exe::SegmentAppender do
 
   let(:opts) do
     option_hash = {

spec/lib/msf/core/exe/segment_injector_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'msf/core/exe/segment_injector'
 
-describe Msf::Exe::SegmentInjector do
+RSpec.describe Msf::Exe::SegmentInjector do
 
   let(:opts) do
     option_hash = {

spec/lib/msf/core/exploit/browser_autopwn2_spec.rb

@@ -1,6 +1,6 @@
 require 'msf/core'
 
-describe Msf::Exploit::Remote::BrowserAutopwn2 do
+RSpec.describe Msf::Exploit::Remote::BrowserAutopwn2 do
 
 
 

spec/lib/msf/core/exploit/capture_spec.rb

@@ -5,7 +5,7 @@ require 'msf/core'
 require 'msf/core/module'
 require 'msf/core/exploit/capture'
 
-describe Msf::Exploit::Capture do
+RSpec.describe Msf::Exploit::Capture do
 
   subject do
     mod = Msf::Module.new

spec/lib/msf/core/exploit/cmdstager_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 require 'msf/core'
 require 'msf/core/exploit/cmdstager'
 
-describe Msf::Exploit::CmdStager do
+RSpec.describe Msf::Exploit::CmdStager do
 
   def create_exploit(info ={})
     mod = Msf::Exploit.allocate

spec/lib/msf/core/exploit/http/client_spec.rb

@@ -5,7 +5,7 @@ require 'msf/core'
 require 'msf/core/data_store'
 require 'msf/core/exploit/http/client'
 
-describe Msf::Exploit::Remote::HttpClient do
+RSpec.describe Msf::Exploit::Remote::HttpClient do
   subject do
     mod = ::Msf::Module.new
     mod.extend described_class

spec/lib/msf/core/exploit/http/jboss/base_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'msf/core'
 require 'msf/core/exploit/http/jboss'
 
-describe Msf::Exploit::Remote::HTTP::JBoss::Base do
+RSpec.describe Msf::Exploit::Remote::HTTP::JBoss::Base do
   subject do
     mod = ::Msf::Exploit.new
     mod.extend Msf::Exploit::Remote::HTTP::JBoss

spec/lib/msf/core/exploit/http/jboss/bean_shell_scripts_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'msf/core'
 require 'msf/core/exploit/http/jboss'
 
-describe Msf::Exploit::Remote::HTTP::JBoss::BeanShellScripts do
+RSpec.describe Msf::Exploit::Remote::HTTP::JBoss::BeanShellScripts do
   subject do
     mod = ::Msf::Exploit.new
     mod.extend Msf::Exploit::Remote::HTTP::JBoss

spec/lib/msf/core/exploit/http/jboss/bean_shell_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'msf/core'
 require 'msf/core/exploit/http/jboss'
 
-describe Msf::Exploit::Remote::HTTP::JBoss::BeanShell do
+RSpec.describe Msf::Exploit::Remote::HTTP::JBoss::BeanShell do
 
   subject do
     mod = ::Msf::Exploit.new

spec/lib/msf/core/exploit/http/jboss/deployment_file_repository_scripts_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'msf/core'
 require 'msf/core/exploit/http/jboss'
 
-describe Msf::Exploit::Remote::HTTP::JBoss::DeploymentFileRepositoryScripts do
+RSpec.describe Msf::Exploit::Remote::HTTP::JBoss::DeploymentFileRepositoryScripts do
   subject do
     mod = ::Msf::Exploit.new
     mod.extend Msf::Exploit::Remote::HTTP::JBoss

spec/lib/msf/core/exploit/http/jboss/deployment_file_repository_spec.rb

@@ -4,8 +4,7 @@ require 'spec_helper'
 require 'msf/core'
 require 'msf/core/exploit/http/jboss'
 
-describe Msf::Exploit::Remote::HTTP::JBoss::DeploymentFileRepository do
+RSpec.describe Msf::Exploit::Remote::HTTP::JBoss::DeploymentFileRepository do
-
   subject do
     mod = ::Msf::Exploit.new
     mod.extend Msf::Exploit::Remote::HTTP::JBoss

spec/lib/msf/core/exploit/http/server_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 require 'msf/core'
 require 'msf/core/exploit/http/server'
 
-describe Msf::Exploit::Remote::HttpServer do
+RSpec.describe Msf::Exploit::Remote::HttpServer do
 
   subject(:server_module) do
     mod = Msf::Exploit.allocate

spec/lib/msf/core/exploit/http/typo3_spec.rb

@@ -5,7 +5,7 @@ require 'msf/core'
 require 'rex/proto/http/response'
 require 'msf/core/exploit/http/typo3'
 
-describe Msf::Exploit::Remote::HTTP::Typo3 do
+RSpec.describe Msf::Exploit::Remote::HTTP::Typo3 do
   subject do
     mod = ::Msf::Module.new
     mod.extend described_class

spec/lib/msf/core/exploit/http/wordpress/base_spec.rb

@@ -6,7 +6,7 @@ require 'msf/core/exploit'
 require 'rex/proto/http/response'
 require 'msf/core/exploit/http/wordpress'
 
-describe Msf::Exploit::Remote::HTTP::Wordpress::Base do
+RSpec.describe Msf::Exploit::Remote::HTTP::Wordpress::Base do
   subject do
     mod = ::Msf::Exploit.new
     mod.extend ::Msf::Exploit::Remote::HTTP::Wordpress

spec/lib/msf/core/exploit/http/wordpress/login_spec.rb

@@ -6,7 +6,7 @@ require 'msf/core/exploit'
 require 'rex/proto/http/response'
 require 'msf/core/exploit/http/wordpress'
 
-describe Msf::Exploit::Remote::HTTP::Wordpress::Login do
+RSpec.describe Msf::Exploit::Remote::HTTP::Wordpress::Login do
   subject do
     mod = ::Msf::Exploit.new
     mod.extend ::Msf::Exploit::Remote::HTTP::Wordpress

spec/lib/msf/core/exploit/http/wordpress/version_spec.rb

@@ -6,7 +6,7 @@ require 'msf/core/exploit'
 require 'rex/proto/http/response'
 require 'msf/core/exploit/http/wordpress'
 
-describe Msf::Exploit::Remote::HTTP::Wordpress::Version do
+RSpec.describe Msf::Exploit::Remote::HTTP::Wordpress::Version do
   subject do
     mod = ::Msf::Exploit.new
     mod.extend ::Msf::Exploit::Remote::HTTP::Wordpress

spec/lib/msf/core/exploit/kerberos/client/as_request_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'rex/proto/kerberos'
 require 'msf/core/exploit/kerberos/client'
 
-describe Msf::Exploit::Remote::Kerberos::Client::AsRequest do
+RSpec.describe Msf::Exploit::Remote::Kerberos::Client::AsRequest do
   subject do
     mod = ::Msf::Exploit.new
     mod.extend ::Msf::Exploit::Remote::Kerberos::Client

spec/lib/msf/core/exploit/kerberos/client/as_response_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'rex/proto/kerberos'
 require 'msf/core/exploit/kerberos/client'
 
-describe Msf::Exploit::Remote::Kerberos::Client::AsResponse do
+RSpec.describe Msf::Exploit::Remote::Kerberos::Client::AsResponse do
   subject do
     mod = ::Msf::Exploit.new
     mod.extend ::Msf::Exploit::Remote::Kerberos::Client

spec/lib/msf/core/exploit/kerberos/client/base_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'rex/proto/kerberos'
 require 'msf/core/exploit/kerberos/client'
 
-describe Msf::Exploit::Remote::Kerberos::Client::Base do
+RSpec.describe Msf::Exploit::Remote::Kerberos::Client::Base do
   subject do
     mod = ::Msf::Exploit.new
     mod.extend ::Msf::Exploit::Remote::Kerberos::Client

spec/lib/msf/core/exploit/kerberos/client/cache_credential_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'rex/proto/kerberos'
 require 'msf/core/exploit/kerberos/client'
 
-describe Msf::Exploit::Remote::Kerberos::Client::CacheCredential do
+RSpec.describe Msf::Exploit::Remote::Kerberos::Client::CacheCredential do
   subject do
     mod = ::Msf::Exploit.new
     mod.extend ::Msf::Exploit::Remote::Kerberos::Client

spec/lib/msf/core/exploit/kerberos/client/pac_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'rex/proto/kerberos'
 require 'msf/core/exploit/kerberos/client'
 
-describe Msf::Exploit::Remote::Kerberos::Client::Pac do
+RSpec.describe Msf::Exploit::Remote::Kerberos::Client::Pac do
   subject do
     mod = ::Msf::Exploit.new
     mod.extend ::Msf::Exploit::Remote::Kerberos::Client

spec/lib/msf/core/exploit/kerberos/client/tgs_request_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'rex/proto/kerberos'
 require 'msf/core/exploit/kerberos/client'
 
-describe Msf::Exploit::Remote::Kerberos::Client::TgsRequest do
+RSpec.describe Msf::Exploit::Remote::Kerberos::Client::TgsRequest do
   subject(:mod) do
     mod = ::Msf::Exploit.new
     mod.extend ::Msf::Exploit::Remote::Kerberos::Client

spec/lib/msf/core/exploit/kerberos/client/tgs_response_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'rex/proto/kerberos'
 require 'msf/core/exploit/kerberos/client'
 
-describe Msf::Exploit::Remote::Kerberos::Client::TgsResponse do
+RSpec.describe Msf::Exploit::Remote::Kerberos::Client::TgsResponse do
   subject do
     mod = ::Msf::Exploit.new
     mod.extend ::Msf::Exploit::Remote::Kerberos::Client

spec/lib/msf/core/exploit/powershell_spec.rb

@@ -8,7 +8,7 @@ def decompress(code)
   Rex::Powershell::Script.new(code).decompress_code
 end
 
-describe Msf::Exploit::Powershell do
+RSpec.describe Msf::Exploit::Powershell do
   subject do
     mod = Msf::Exploit.allocate
     mod.extend described_class

spec/lib/msf/core/exploit/remote/browser_exploit_server_spec.rb

@@ -1,7 +1,7 @@
 #require 'spec_helper'
 require 'msf/core'
 
-describe Msf::Exploit::Remote::BrowserExploitServer do
+RSpec.describe Msf::Exploit::Remote::BrowserExploitServer do
 
   let(:in_memory_profile) do
    {

spec/lib/msf/core/exploit/remote/browser_profile_manager_spec.rb

@@ -1,6 +1,6 @@
 require 'msf/core'
 
-describe Msf::Exploit::Remote::BrowserProfileManager do
+RSpec.describe Msf::Exploit::Remote::BrowserProfileManager do
 
   subject do
     mod = Msf::Exploit::Remote.allocate

spec/lib/msf/core/exploit/remote/firefox_addon_generator_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'msf/core'
 
-describe Msf::Exploit::Remote::FirefoxAddonGenerator do
+RSpec.describe Msf::Exploit::Remote::FirefoxAddonGenerator do
   let(:datastore) { { 'TARGET' => 0 } }
   let(:jar) { double(:pack => '@JAR@', :build_manifest => nil) }
   let(:payload) { double(:encoded => '@EXE@', :encoded_jar => jar) }

spec/lib/msf/core/exploit/remote/firefox_privilege_escalation_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'msf/core'
 
-describe Msf::Exploit::Remote::FirefoxPrivilegeEscalation do
+RSpec.describe Msf::Exploit::Remote::FirefoxPrivilegeEscalation do
 
   it_should_behave_like 'Msf::Exploit::JSObfu'
 

spec/lib/msf/core/exploit/remote/java/rmi/builder_spec.rb

@@ -5,7 +5,7 @@ require 'rex/java/serialization'
 require 'rex/proto/rmi'
 require 'msf/core/exploit/java/rmi/builder'
 
-describe Msf::Exploit::Remote::Java::Rmi::Builder do
+RSpec.describe Msf::Exploit::Remote::Java::Rmi::Builder do
   subject(:mod) do
     mod = ::Msf::Exploit.new
     mod.extend ::Msf::Exploit::Remote::Java::Rmi::Builder

spec/lib/msf/core/exploit/remote/java/rmi/client/jmx/connection/builder_spec.rb

@@ -6,7 +6,7 @@ require 'rex/java/serialization'
 require 'rex/proto/rmi'
 require 'msf/core/exploit/java/rmi/client'
 
-describe Msf::Exploit::Remote::Java::Rmi::Client::Jmx::Connection::Builder do
+RSpec.describe Msf::Exploit::Remote::Java::Rmi::Client::Jmx::Connection::Builder do
   subject(:mod) do
     mod = ::Msf::Exploit.new
     mod.extend ::Msf::Exploit::Remote::Java::Rmi::Client

spec/lib/msf/core/exploit/remote/java/rmi/client/jmx/connection_spec.rb

@@ -6,7 +6,7 @@ require 'rex/proto/rmi'
 require 'msf/core/exploit/java/rmi/client'
 require 'stringio'
 
-describe Msf::Exploit::Remote::Java::Rmi::Client::Jmx::Connection do
+RSpec.describe Msf::Exploit::Remote::Java::Rmi::Client::Jmx::Connection do
 
   let(:name_get) { 'DefaultDomain:type=MLet' }
 

spec/lib/msf/core/exploit/remote/java/rmi/client/jmx/server/builder_spec.rb

@@ -6,7 +6,7 @@ require 'rex/java/serialization'
 require 'rex/proto/rmi'
 require 'msf/core/exploit/java/rmi/client'
 
-describe Msf::Exploit::Remote::Java::Rmi::Client::Jmx::Server::Builder do
+RSpec.describe Msf::Exploit::Remote::Java::Rmi::Client::Jmx::Server::Builder do
   subject(:mod) do
     mod = ::Msf::Exploit.new
     mod.extend ::Msf::Exploit::Remote::Java::Rmi::Client

spec/lib/msf/core/exploit/remote/java/rmi/client/jmx/server/parser_spec.rb

@@ -5,7 +5,7 @@ require 'rex/java/serialization'
 require 'rex/proto/rmi'
 require 'msf/core/exploit/java/rmi/client'
 
-describe Msf::Exploit::Remote::Java::Rmi::Client::Jmx::Server::Parser do
+RSpec.describe Msf::Exploit::Remote::Java::Rmi::Client::Jmx::Server::Parser do
   subject(:mod) do
     mod = ::Msf::Exploit.new
     mod.extend ::Msf::Exploit::Remote::Java::Rmi::Client

spec/lib/msf/core/exploit/remote/java/rmi/client/jmx/server_spec.rb

@@ -6,7 +6,7 @@ require 'rex/proto/rmi'
 require 'msf/core/exploit/java/rmi/client'
 require 'stringio'
 
-describe Msf::Exploit::Remote::Java::Rmi::Client::Jmx::Server do
+RSpec.describe Msf::Exploit::Remote::Java::Rmi::Client::Jmx::Server do
 
   let(:new_client_response) do
     "\x51\xac\xed\x00\x05\x77\x0f\x01\x82\x73\x92\x35\x00\x00\x01\x4c" +

spec/lib/msf/core/exploit/remote/java/rmi/client/registry/builder_spec.rb

@@ -5,7 +5,7 @@ require 'rex/java/serialization'
 require 'rex/proto/rmi'
 require 'msf/core/exploit/java/rmi/client'
 
-describe ::Msf::Exploit::Remote::Java::Rmi::Client::Registry::Builder do
+RSpec.describe ::Msf::Exploit::Remote::Java::Rmi::Client::Registry::Builder do
   subject(:mod) do
     mod = ::Msf::Exploit.new
     mod.extend ::Msf::Exploit::Remote::Java::Rmi::Client

spec/lib/msf/core/exploit/remote/java/rmi/client/registry/parser_spec.rb

@@ -5,7 +5,7 @@ require 'rex/java/serialization'
 require 'rex/proto/rmi'
 require 'msf/core/exploit/java/rmi/client'
 
-describe Msf::Exploit::Remote::Java::Rmi::Client::Registry::Parser do
+RSpec.describe Msf::Exploit::Remote::Java::Rmi::Client::Registry::Parser do
   subject(:mod) do
     mod = ::Msf::Exploit.new
     mod.extend ::Msf::Exploit::Remote::Java::Rmi::Client

spec/lib/msf/core/exploit/remote/java/rmi/client/registry_spec.rb

@@ -6,7 +6,7 @@ require 'rex/proto/rmi'
 require 'msf/core/exploit/java/rmi/client'
 require 'stringio'
 
-describe Msf::Exploit::Remote::Java::Rmi::Client::Registry do
+RSpec.describe Msf::Exploit::Remote::Java::Rmi::Client::Registry do
 
   let(:list_with_names_response) do
     "\x51\xac\xed\x00\x05\x77\x0f\x01\x82\x73\x92\x35\x00\x00\x01\x4c" +

spec/lib/msf/core/exploit/remote/java/rmi/client_spec.rb

@@ -5,7 +5,7 @@ require 'rex/java/serialization'
 require 'rex/proto/rmi'
 require 'msf/core/exploit/java/rmi/client'
 
-describe Msf::Exploit::Remote::Java::Rmi::Client do
+RSpec.describe Msf::Exploit::Remote::Java::Rmi::Client do
   subject(:mod) do
     mod = ::Msf::Exploit.new
     mod.extend ::Msf::Exploit::Remote::Java::Rmi::Client

spec/lib/msf/core/exploit/remote/java/rmi/util_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'rex/java/serialization'
 require 'msf/core/exploit/java/rmi/util'
 
-describe Msf::Exploit::Remote::Java::Rmi::Util do
+RSpec.describe Msf::Exploit::Remote::Java::Rmi::Util do
   subject(:mod) do
     mod = ::Msf::Exploit.new
     mod.extend ::Msf::Exploit::Remote::Java::Rmi::Util

spec/lib/msf/core/exploit/smb/server/share/command/close_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 require 'msf/core'
 require 'msf/core/exploit/smb/server/share'
 
-describe Msf::Exploit::Remote::SMB::Server::Share do
+RSpec.describe Msf::Exploit::Remote::SMB::Server::Share do
 
   subject(:mod) do
     mod = Msf::Exploit.new

spec/lib/msf/core/exploit/smb/server/share/command/negotiate_spec.rb

@@ -6,7 +6,7 @@ require 'msf/core'
 require 'msf/core/exploit/smb/server/share'
 require 'rex/proto/smb/constants'
 
-describe Msf::Exploit::Remote::SMB::Server::Share do
+RSpec.describe Msf::Exploit::Remote::SMB::Server::Share do
 
   subject(:mod) do
     mod = Msf::Exploit.new

spec/lib/msf/core/exploit/smb/server/share/command/nt_create_andx_spec.rb

@@ -5,7 +5,7 @@ require 'msf/core'
 require 'msf/core/exploit/smb/server/share'
 require 'rex/proto/smb/constants'
 
-describe Msf::Exploit::Remote::SMB::Server::Share do
+RSpec.describe Msf::Exploit::Remote::SMB::Server::Share do
 
   subject(:mod) do
     mod = Msf::Exploit.new

spec/lib/msf/core/exploit/smb/server/share/command/read_andx_spec.rb

@@ -5,7 +5,7 @@ require 'msf/core'
 require 'msf/core/exploit/smb/server/share'
 require 'rex/proto/smb/constants'
 
-describe Msf::Exploit::Remote::SMB::Server::Share do
+RSpec.describe Msf::Exploit::Remote::SMB::Server::Share do
 
   subject(:mod) do
     mod = Msf::Exploit.new

spec/lib/msf/core/exploit/smb/server/share/command/session_setup_andx_spec.rb

@@ -5,7 +5,7 @@ require 'msf/core'
 require 'msf/core/exploit/smb/server/share'
 require 'rex/proto/smb/constants'
 
-describe Msf::Exploit::Remote::SMB::Server::Share do
+RSpec.describe Msf::Exploit::Remote::SMB::Server::Share do
 
   subject(:mod) do
     mod = Msf::Exploit.new

spec/lib/msf/core/exploit/smb/server/share/command/trans2/find_first2_spec.rb

@@ -5,7 +5,7 @@ require 'msf/core'
 require 'msf/core/exploit/smb/server/share'
 require 'rex/proto/smb/constants'
 
-describe Msf::Exploit::Remote::SMB::Server::Share do
+RSpec.describe Msf::Exploit::Remote::SMB::Server::Share do
 
   subject(:mod) do
     mod = Msf::Exploit.new

spec/lib/msf/core/exploit/smb/server/share/command/trans2/query_file_information_spec.rb

@@ -5,7 +5,7 @@ require 'msf/core'
 require 'msf/core/exploit/smb/server/share'
 require 'rex/proto/smb/constants'
 
-describe Msf::Exploit::Remote::SMB::Server::Share do
+RSpec.describe Msf::Exploit::Remote::SMB::Server::Share do
 
   subject(:mod) do
     mod = Msf::Exploit.new

spec/lib/msf/core/exploit/smb/server/share/command/trans2/query_path_information_spec.rb

@@ -5,7 +5,7 @@ require 'msf/core'
 require 'msf/core/exploit/smb/server/share'
 require 'rex/proto/smb/constants'
 
-describe Msf::Exploit::Remote::SMB::Server::Share do
+RSpec.describe Msf::Exploit::Remote::SMB::Server::Share do
 
   subject(:mod) do
     mod = Msf::Exploit.new

spec/lib/msf/core/exploit/smb/server/share/command/trans2_spec.rb

@@ -5,7 +5,7 @@ require 'msf/core'
 require 'msf/core/exploit/smb/server/share'
 require 'rex/proto/smb/constants'
 
-describe Msf::Exploit::Remote::SMB::Server::Share do
+RSpec.describe Msf::Exploit::Remote::SMB::Server::Share do
 
   subject(:mod) do
     mod = Msf::Exploit.new

spec/lib/msf/core/exploit/smb/server/share/information_level/find_spec.rb

@@ -5,7 +5,7 @@ require 'msf/core'
 require 'msf/core/exploit/smb/server/share'
 require 'rex/proto/smb/constants'
 
-describe Msf::Exploit::Remote::SMB::Server::Share do
+RSpec.describe Msf::Exploit::Remote::SMB::Server::Share do
 
   subject(:mod) do
     mod = Msf::Exploit.new

spec/lib/msf/core/exploit/smb/server/share/information_level/query_spec.rb

@@ -5,7 +5,7 @@ require 'msf/core'
 require 'msf/core/exploit/smb/server/share'
 require 'rex/proto/smb/constants'
 
-describe Msf::Exploit::Remote::SMB::Server::Share do
+RSpec.describe Msf::Exploit::Remote::SMB::Server::Share do
 
   subject(:mod) do
     mod = Msf::Exploit.new

spec/lib/msf/core/framework_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'msf/core/framework'
 
-describe Msf::Framework do
+RSpec.describe Msf::Framework do
   context '#initialize' do
     subject(:framework) {
       described_class.new

spec/lib/msf/core/module/failure_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Msf::Module::Failure do
+RSpec.describe Msf::Module::Failure do
   context 'CONSTANTS' do
     context 'None' do
       subject(:none) {

spec/lib/msf/core/module_manager_spec.rb

@@ -16,7 +16,7 @@ require 'tmpdir'
 
 require 'msf/core'
 
-describe Msf::ModuleManager do
+RSpec.describe Msf::ModuleManager do
   include_context 'Msf::Simple::Framework'
 
   let(:basename_prefix) do