metasploit-credential 0.14.5 → 0.14.6

data/spec/lib/metasploit/credential/exporter/pwdump_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Credential::Exporter::Pwdump do
+RSpec.describe Metasploit::Credential::Exporter::Pwdump do
   include_context 'Mdm::Workspace'
 
   subject(:exporter){ Metasploit::Credential::Exporter::Pwdump.new}
@@ -13,7 +11,7 @@ describe Metasploit::Credential::Exporter::Pwdump do
     describe "associated Mdm::Service objects" do
       it 'should properly format the service information' do
         service = login.service
-        exporter.format_service_for_login(login).should == "#{service.host.address}:#{service.port}/#{service.proto} (#{service.name})"
+        expect(exporter.format_service_for_login(login)).to eq("#{service.host.address}:#{service.port}/#{service.proto} (#{service.name})")
       end
     end
 
@@ -25,17 +23,17 @@ describe Metasploit::Credential::Exporter::Pwdump do
       end
 
       it 'should have the proper formatting with extant data' do
-        exporter.format_password(login).should == "#{login.core.public.username} #{login.core.private.data}"
+        expect(exporter.format_password(login)).to eq("#{login.core.public.username} #{login.core.private.data}")
       end
 
       it 'should have the proper formatting with a missing public' do
         login.core.public.username = ""
-        exporter.format_password(login).should == "#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING} #{login.core.private.data}"
+        expect(exporter.format_password(login)).to eq("#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING} #{login.core.private.data}")
       end
 
       it 'should have the proper formatting with a missing private' do
         login.core.private.data = ""
-        exporter.format_password(login).should == "#{login.core.public.username} #{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}"
+        expect(exporter.format_password(login)).to eq("#{login.core.public.username} #{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}")
       end
     end
 
@@ -47,17 +45,17 @@ describe Metasploit::Credential::Exporter::Pwdump do
       end
 
       it 'should have the proper formatting with extant data' do
-        exporter.format_nonreplayable_hash(login).should == "#{login.core.public.username}:#{login.core.private.data}:::"
+        expect(exporter.format_nonreplayable_hash(login)).to eq("#{login.core.public.username}:#{login.core.private.data}:::")
       end
 
       it 'should have the proper formatting with a missing public' do
         login.core.public.username = ""
-        exporter.format_nonreplayable_hash(login).should == "#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}:#{login.core.private.data}:::"
+        expect(exporter.format_nonreplayable_hash(login)).to eq("#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}:#{login.core.private.data}:::")
       end
 
       it 'should have the proper formatting with a missing private' do
         login.core.private.data = ""
-        exporter.format_nonreplayable_hash(login).should == "#{login.core.public.username}:#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}:::"
+        expect(exporter.format_nonreplayable_hash(login)).to eq("#{login.core.public.username}:#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}:::")
       end
     end
 
@@ -69,17 +67,17 @@ describe Metasploit::Credential::Exporter::Pwdump do
       end
 
       it 'should have the proper formatting with extant data' do
-        exporter.format_ntlm_hash(login).should == "#{login.core.public.username}:#{login.id}:#{login.core.private.data}:::"
+        expect(exporter.format_ntlm_hash(login)).to eq("#{login.core.public.username}:#{login.id}:#{login.core.private.data}:::")
       end
 
       it 'should have the proper formatting with a missing public' do
         login.core.public.username = ""
-        exporter.format_ntlm_hash(login).should == "#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}:#{login.id}:#{login.core.private.data}:::"
+        expect(exporter.format_ntlm_hash(login)).to eq("#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}:#{login.id}:#{login.core.private.data}:::")
       end
 
       it 'should have the proper formatting with a missing private' do
         login.core.private.data = ""
-        exporter.format_ntlm_hash(login).should == "#{login.core.public.username}:#{login.id}:#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}:::"
+        expect(exporter.format_ntlm_hash(login)).to eq("#{login.core.public.username}:#{login.id}:#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}:::")
       end
     end
 
@@ -91,17 +89,17 @@ describe Metasploit::Credential::Exporter::Pwdump do
       end
 
       it 'should have the proper formatting with extant data' do
-        exporter.format_postgres_md5(login).should == "#{login.core.public.username}:#{login.core.private.data}"
+        expect(exporter.format_postgres_md5(login)).to eq("#{login.core.public.username}:#{login.core.private.data}")
       end
 
       it 'should have the proper formatting with a missing public' do
         login.core.public.username = ""
-        exporter.format_postgres_md5(login).should == "#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}:#{login.core.private.data}"
+        expect(exporter.format_postgres_md5(login)).to eq("#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}:#{login.core.private.data}")
       end
 
       it 'should have the proper formatting with a missing private' do
         login.core.private.data = ""
-        exporter.format_postgres_md5(login).should == "#{login.core.public.username}:#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}"
+        expect(exporter.format_postgres_md5(login)).to eq("#{login.core.public.username}:#{Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING}")
       end
 
     end

data/spec/lib/metasploit/credential/importer/core_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Credential::Importer::Core do
+RSpec.describe Metasploit::Credential::Importer::Core do
   include_context 'Mdm::Workspace'
   let(:workspace){FactoryGirl.create(:mdm_workspace)}
 
@@ -19,7 +17,7 @@ describe Metasploit::Credential::Importer::Core do
           core_csv_importer.private_credential_type = "Metasploit::Credential::Password"
         end
 
-        it { should be_valid }
+        it { is_expected.to be_valid }
       end
 
       describe "with a non-supported credential type" do
@@ -36,7 +34,7 @@ describe Metasploit::Credential::Importer::Core do
 
         it 'should report the error being invalid private type' do
           core_csv_importer.valid?
-          core_csv_importer.errors[:private_credential_type].should include error
+          expect(core_csv_importer.errors[:private_credential_type]).to include error
         end
       end
 
@@ -54,7 +52,7 @@ describe Metasploit::Credential::Importer::Core do
 
         it 'should report the error being invalid headers' do
           core_csv_importer.valid?
-          core_csv_importer.errors[:input].should include error
+          expect(core_csv_importer.errors[:input]).to include error
         end
       end
     end
@@ -62,7 +60,7 @@ describe Metasploit::Credential::Importer::Core do
     describe "long-form imports" do
       describe "with well-formed CSV data" do
         describe "with a compliant header" do
-          it { should be_valid }
+          it { is_expected.to be_valid }
         end
 
         describe "with data that includes a missing Public (username)" do
@@ -127,7 +125,7 @@ describe Metasploit::Credential::Importer::Core do
 
           it 'should report the error being incorrect headers' do
             core_csv_importer.valid?
-            core_csv_importer.errors[:input].should include error
+            expect(core_csv_importer.errors[:input]).to include error
           end
         end
 
@@ -140,11 +138,11 @@ describe Metasploit::Credential::Importer::Core do
             core_csv_importer.input = FactoryGirl.generate(:malformed_csv)
           end
 
-          it { should be_invalid }
+          it { is_expected.to be_invalid }
 
           it 'should report the error being malformed CSV' do
             core_csv_importer.valid?
-            core_csv_importer.errors[:input].should include error
+            expect(core_csv_importer.errors[:input]).to include error
           end
         end
 
@@ -157,11 +155,11 @@ describe Metasploit::Credential::Importer::Core do
             core_csv_importer.input = FactoryGirl.generate(:empty_core_csv)
           end
 
-          it { should be_invalid }
+          it { is_expected.to be_invalid }
 
           it 'should show the proper error message' do
             core_csv_importer.valid?
-            core_csv_importer.errors[:input].should include error
+            expect(core_csv_importer.errors[:input]).to include error
           end
         end
 

data/spec/lib/metasploit/credential/importer/multi_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Credential::Importer::Multi do
+RSpec.describe Metasploit::Credential::Importer::Multi do
   include_context 'Mdm::Workspace'
   include_context 'metasploit_credential_importer_zip_file'
 
@@ -31,7 +29,7 @@ describe Metasploit::Credential::Importer::Multi do
     context "when given zip file" do
       subject(:multi_importer){ Metasploit::Credential::Importer::Multi.new(input: File.open(supported_file), origin: import_origin)}
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
 
     describe "#csv?" do
@@ -39,7 +37,7 @@ describe Metasploit::Credential::Importer::Multi do
         subject(:multi_importer){ Metasploit::Credential::Importer::Multi.new(input: File.open(valid_csv_file), origin: import_origin)}
 
         it 'should return true' do
-          multi_importer.csv?.should be_true
+          expect(multi_importer.csv?).to eq(true)
         end
       end
 
@@ -47,7 +45,7 @@ describe Metasploit::Credential::Importer::Multi do
         subject(:multi_importer){ Metasploit::Credential::Importer::Multi.new(input: File.open(unsupported_file), origin: import_origin)}
 
         it 'should return true' do
-          multi_importer.csv?.should be_false
+          expect(multi_importer.csv?).to eq(false)
         end
       end
     end

data/spec/lib/metasploit/credential/importer/pwdump_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Credential::Importer::Pwdump do
+RSpec.describe Metasploit::Credential::Importer::Pwdump do
   include_context 'Mdm::Workspace'
 
   let(:workspace) {FactoryGirl.create(:mdm_workspace)}
@@ -11,12 +9,12 @@ describe Metasploit::Credential::Importer::Pwdump do
                                                origin: origin)}
 
   describe "validation" do
-    it { should be_valid }
+    it { is_expected.to be_valid }
 
     describe "without a filename" do
       it 'should not be valid' do
         pwdump_importer.filename = nil
-        pwdump_importer.should_not be_valid
+        expect(pwdump_importer).not_to be_valid
       end
     end
   end
@@ -24,32 +22,32 @@ describe Metasploit::Credential::Importer::Pwdump do
   describe "#blank_or_string" do
     context "with a blank string" do
       it 'should return empty string' do
-        pwdump_importer.blank_or_string("").should == ""
+        expect(pwdump_importer.blank_or_string("")).to eq("")
       end
     end
     context "with a BLANK_CRED_STRING" do
       it 'should return empty string' do
-        pwdump_importer.blank_or_string(Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING).should == ""
+        expect(pwdump_importer.blank_or_string(Metasploit::Credential::Exporter::Pwdump::BLANK_CRED_STRING)).to eq("")
       end
     end
 
     context "with a JTR_NO_PASSWORD_STRING" do
       it 'should return empty string' do
-        pwdump_importer.blank_or_string(Metasploit::Credential::Importer::Pwdump::JTR_NO_PASSWORD_STRING).should == ""
+        expect(pwdump_importer.blank_or_string(Metasploit::Credential::Importer::Pwdump::JTR_NO_PASSWORD_STRING)).to eq("")
       end
     end
 
     context "with a present string" do
       it 'should return the string' do
         string = "mah-hard-passwerd"
-        pwdump_importer.blank_or_string(string).should == string
+        expect(pwdump_importer.blank_or_string(string)).to eq(string)
       end
     end
 
     context "with the dehex flag" do
       it 'should dehex the string with the Metasploit::Credential::Text#dehex method' do
         string = "mah-hard-passwerd"
-        Metasploit::Credential::Text.should_receive(:dehex).with string
+        expect(Metasploit::Credential::Text).to receive(:dehex).with string
         pwdump_importer.blank_or_string(string, true)
       end
     end
@@ -64,8 +62,8 @@ describe Metasploit::Credential::Importer::Pwdump do
       it 'should create Cores with the same Origin' do
         pwdump_importer.import!
         origins = Metasploit::Credential::Core.all.collect(&:origin).uniq
-        origins.size.should be(1)
-        origins.first.id.should be(origin.id)
+        expect(origins.size).to be(1)
+        expect(origins.first.id).to be(origin.id)
       end
 
       it 'should create the proper number of Logins' do
@@ -96,7 +94,7 @@ describe Metasploit::Credential::Importer::Pwdump do
         # Legacy files may have these lines when missing SSH key files
         it 'should not create a Private from a "Warning" line' do
           pwdump_importer.import!
-          Metasploit::Credential::Private.where(data:'missing').should be_blank
+          expect(Metasploit::Credential::Private.where(data:'missing')).to be_blank
         end
       end
     end

data/spec/lib/metasploit/credential/importer/zip_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Credential::Importer::Zip do
+RSpec.describe Metasploit::Credential::Importer::Zip do
   include_context 'Mdm::Workspace'
   include_context 'metasploit_credential_importer_zip_file'
 
@@ -11,7 +9,7 @@ describe Metasploit::Credential::Importer::Zip do
     DUMMY_ZIP_PATH = "/tmp/import-test-dummy.zip"
 
     context "when the zip file contains a keys directory and a manifest CSV" do
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
 
     context "when the zip file is not actually an archive" do
@@ -32,7 +30,7 @@ describe Metasploit::Credential::Importer::Zip do
 
       it 'should show the proper error message' do
         zip_importer.valid?
-        zip_importer.errors[:input].should include error
+        expect(zip_importer.errors[:input]).to include error
       end
     end
 
@@ -49,7 +47,7 @@ describe Metasploit::Credential::Importer::Zip do
 
       it 'should show the proper error message' do
         zip_importer.valid?
-        zip_importer.errors[:input].should include error
+        expect(zip_importer.errors[:input]).to include error
       end
     end
 
@@ -63,7 +61,7 @@ describe Metasploit::Credential::Importer::Zip do
 
   describe "zip constants" do
     it 'should have ZIP_HEADER_IDENTIFIER whose length corresponds to ZIP_HEADER_BYTE_LENGTH' do
-      Metasploit::Credential::Importer::Zip::ZIP_HEADER_IDENTIFIER.size.should == Metasploit::Credential::Importer::Zip::ZIP_HEADER_BYTE_LENGTH
+      expect(Metasploit::Credential::Importer::Zip::ZIP_HEADER_IDENTIFIER.size).to eq(Metasploit::Credential::Importer::Zip::ZIP_HEADER_BYTE_LENGTH)
     end
   end
 end

data/spec/lib/metasploit/credential/migrator_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'tempfile'
 
-describe Metasploit::Credential::Migrator do
+RSpec.describe Metasploit::Credential::Migrator do
   include_context 'Mdm::Workspace'
 
   let(:workspace){ FactoryGirl.create(:mdm_workspace) }
@@ -62,9 +62,9 @@ describe Metasploit::Credential::Migrator do
         end
 
         it "should be created for each Mdm::Cred" do
-          Metasploit::Credential::Public.where(username: cred1.user).should_not be_blank
-          Metasploit::Credential::Public.where(username: cred2.user).should_not be_blank
-          Metasploit::Credential::Public.where(username: cred3.user).should_not be_blank
+          expect(Metasploit::Credential::Public.where(username: cred1.user)).not_to be_blank
+          expect(Metasploit::Credential::Public.where(username: cred2.user)).not_to be_blank
+          expect(Metasploit::Credential::Public.where(username: cred3.user)).not_to be_blank
         end
       end
 
@@ -75,9 +75,9 @@ describe Metasploit::Credential::Migrator do
 
         it "should be created for each Mdm::Cred" do
           migrator.convert_creds_in_workspace(workspace)
-          Metasploit::Credential::Password.where(data: cred1.pass).should_not be_blank
-          Metasploit::Credential::Password.where(data: cred2.pass).should_not be_blank
-          Metasploit::Credential::Password.where(data: cred3.pass).should_not be_blank
+          expect(Metasploit::Credential::Password.where(data: cred1.pass)).not_to be_blank
+          expect(Metasploit::Credential::Password.where(data: cred2.pass)).not_to be_blank
+          expect(Metasploit::Credential::Password.where(data: cred3.pass)).not_to be_blank
         end
       end
     end
@@ -97,7 +97,7 @@ describe Metasploit::Credential::Migrator do
         end
 
         it 'should create a new NTLMHash in the database' do
-          Metasploit::Credential::NTLMHash.where(data: cred.pass).should_not be_blank
+          expect(Metasploit::Credential::NTLMHash.where(data: cred.pass)).not_to be_blank
         end
       end
 
@@ -126,7 +126,7 @@ describe Metasploit::Credential::Migrator do
           end
 
           it 'should create a new SSHKey in the database' do
-            Metasploit::Credential::SSHKey.where(data: ssh_key_content).should_not be_blank
+            expect(Metasploit::Credential::SSHKey.where(data: ssh_key_content)).not_to be_blank
           end
         end
 
@@ -144,7 +144,7 @@ describe Metasploit::Credential::Migrator do
           end
 
           it 'should create a new SSHKey in the database' do
-            Metasploit::Credential::SSHKey.where(data: ssh_key_content).should_not be_blank
+            expect(Metasploit::Credential::SSHKey.where(data: ssh_key_content)).not_to be_blank
           end
         end
 
@@ -162,7 +162,7 @@ describe Metasploit::Credential::Migrator do
           end
 
           it 'should not create a new SSHKey in the database' do
-            Metasploit::Credential::SSHKey.count.should be_zero
+            expect(Metasploit::Credential::SSHKey.count).to be_zero
           end
         end
 
@@ -182,7 +182,7 @@ describe Metasploit::Credential::Migrator do
         end
 
         it 'should create a new Password in the database' do
-          Metasploit::Credential::Password.where(data: cred.pass).should_not be_blank
+          expect(Metasploit::Credential::Password.where(data: cred.pass)).not_to be_blank
         end
       end
 
@@ -200,7 +200,7 @@ describe Metasploit::Credential::Migrator do
         end
 
         it 'should create a new NonreplayableHash in the database' do
-          Metasploit::Credential::NonreplayableHash.where(data: cred.pass).should_not be_blank
+          expect(Metasploit::Credential::NonreplayableHash.where(data: cred.pass)).not_to be_blank
         end
       end
     end

data/spec/lib/metasploit/credential/version_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Credential::Version do
+RSpec.describe Metasploit::Credential::Version do
   context 'CONSTANTS' do
     context 'MAJOR' do
       subject(:major) do
@@ -17,7 +15,7 @@ describe Metasploit::Credential::Version do
         described_class::MINOR
       end
 
-      it { should be_a Integer }
+      it { is_expected.to be_a Integer }
     end
 
     context 'PATCH' do
@@ -25,7 +23,7 @@ describe Metasploit::Credential::Version do
         described_class::PATCH
       end
 
-      it { should be_a Integer }
+      it { is_expected.to be_a Integer }
     end
 
     pull_request = ENV['TRAVIS_PULL_REQUEST']

data/spec/lib/metasploit/credential_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Credential do
+RSpec.describe Metasploit::Credential do
   context 'CONSTANTS' do
     context 'VERSION' do
       subject(:version) do