metasploit-credential 1.0.1 → 1.1.0

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

@@ -23,7 +23,7 @@ RSpec.describe Metasploit::Credential::Importer::Multi do
     describe "when given a file that is not a zip or a CSV" do
       subject(:multi_importer){ Metasploit::Credential::Importer::Multi.new(input: File.open(unsupported_file), origin: import_origin)}
 
-      it { should_not be_valid }
+      it { is_expected.not_to be_valid }
     end
 
     context "when given zip file" do

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

@@ -17,16 +17,16 @@ RSpec.describe Metasploit::Credential::Importer::Zip do
         I18n.translate!('activemodel.errors.models.metasploit/credential/importer/zip.attributes.input.malformed_archive')
       end
 
-      before(:each) do
+      before(:example) do
         File.open(DUMMY_ZIP_PATH, 'wb')
         zip_importer.input = File.open(DUMMY_ZIP_PATH, 'r')
       end
 
-      after(:each) do
+      after(:example) do
         FileUtils.rm(DUMMY_ZIP_PATH)
       end
 
-      it { should_not be_valid }
+      it { is_expected.not_to be_valid }
 
       it 'should show the proper error message' do
         zip_importer.valid?
@@ -39,11 +39,11 @@ RSpec.describe Metasploit::Credential::Importer::Zip do
         I18n.translate!('activemodel.errors.models.metasploit/credential/importer/zip.attributes.input.missing_manifest')
       end
 
-      before(:each) do
+      before(:example) do
         zip_importer.input = FactoryGirl.generate :metasploit_credential_importer_zip_file_without_manifest
       end
 
-      it { should_not be_valid }
+      it { is_expected.not_to be_valid }
 
       it 'should show the proper error message' do
         zip_importer.valid?

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

@@ -13,7 +13,7 @@ RSpec.describe Metasploit::Credential::Migrator do
 
   describe "#convert_creds_in_workspace" do
     describe "when there are no Mdm::Cred objects in the workspace" do
-      before(:each) do
+      before(:example) do
         workspace.services.each do |service|
           service.creds = []
         end
@@ -55,7 +55,7 @@ RSpec.describe Metasploit::Credential::Migrator do
       end
 
       describe "new Publics" do
-        before(:each) do
+        before(:example) do
           migrator.convert_creds_in_workspace(workspace)
         end
 
@@ -65,7 +65,7 @@ RSpec.describe Metasploit::Credential::Migrator do
       end
 
       describe "new Privates" do
-        before(:each) do
+        before(:example) do
           migrator.convert_creds_in_workspace(workspace)
         end
 
@@ -85,7 +85,7 @@ RSpec.describe Metasploit::Credential::Migrator do
           )
         end
 
-        before(:each) do
+        before(:example) do
           migrator.convert_creds_in_workspace(cred.service.host.workspace)
         end
 
@@ -114,7 +114,7 @@ RSpec.describe Metasploit::Credential::Migrator do
             )
           end
 
-          before(:each) do
+          before(:example) do
             migrator.convert_creds_in_workspace(cred.service.host.workspace)
           end
 
@@ -132,7 +132,7 @@ RSpec.describe Metasploit::Credential::Migrator do
             )
           end
 
-          before(:each) do
+          before(:example) do
             migrator.convert_creds_in_workspace(cred.service.host.workspace)
           end
 
@@ -150,7 +150,7 @@ RSpec.describe Metasploit::Credential::Migrator do
             )
           end
 
-          before(:each) do
+          before(:example) do
             migrator.convert_creds_in_workspace(cred.service.host.workspace)
           end
 
@@ -170,7 +170,7 @@ RSpec.describe Metasploit::Credential::Migrator do
           )
         end
 
-        before(:each) do
+        before(:example) do
           migrator.convert_creds_in_workspace(cred.service.host.workspace)
         end
 
@@ -188,7 +188,7 @@ RSpec.describe Metasploit::Credential::Migrator do
           )
         end
 
-        before(:each) do
+        before(:example) do
           migrator.convert_creds_in_workspace(cred.service.host.workspace)
         end
 

data/spec/lib/metasploit/credential_spec.rb

@@ -1,4 +1,13 @@
 RSpec.describe Metasploit::Credential do
-  it_should_behave_like 'Metasploit::Version GEM_VERSION constant'
-  it_should_behave_like 'Metasploit::Version VERSION constant'
+  context 'CONSTANTS' do
+    context 'VERSION' do
+      subject(:version) {
+        described_class::VERSION
+      }
+
+      it 'is Metasploit::Credential::Version.full' do
+        expect(version).to eq(Metasploit::Credential::VERSION)
+      end
+    end
+  end
 end

data/spec/models/metasploit/credential/core_spec.rb

@@ -331,7 +331,7 @@ RSpec.describe Metasploit::Credential::Core, type: :model do
               metasploit_credential_core.workspace
             end
 
-            it { should_not be_nil }
+            it { is_expected.not_to be_nil }
           end
         end
 
@@ -395,7 +395,7 @@ RSpec.describe Metasploit::Credential::Core, type: :model do
           metasploit_credential_core_manual.workspace
         end
 
-        it { should_not be_nil }
+        it { is_expected.not_to be_nil }
       end
     end
 
@@ -475,7 +475,7 @@ RSpec.describe Metasploit::Credential::Core, type: :model do
       # Callbacks
       #
 
-      before(:each) do
+      before(:example) do
         core.valid?
       end
 
@@ -505,7 +505,7 @@ RSpec.describe Metasploit::Credential::Core, type: :model do
                 true
               end
 
-              it { should_not include error }
+              it { is_expected.not_to include error }
             end
 
             context 'without Mdm::User#admin' do
@@ -527,11 +527,11 @@ RSpec.describe Metasploit::Credential::Core, type: :model do
                     }
                   end
 
-                  it { should_not include error }
+                  it { is_expected.not_to include error }
                 end
 
                 context 'without persisted' do
-                  it { should_not include error }
+                  it { is_expected.not_to include error }
                 end
               end
 
@@ -583,7 +583,7 @@ RSpec.describe Metasploit::Credential::Core, type: :model do
                   workspace
                 end
 
-                it { should_not include error }
+                it { is_expected.not_to include error }
               end
 
               context 'different than #workspace' do
@@ -647,7 +647,7 @@ RSpec.describe Metasploit::Credential::Core, type: :model do
                     workspace
                   end
 
-                  it { should_not include error }
+                  it { is_expected.not_to include error }
                 end
 
                 context 'different than #workspace' do
@@ -714,7 +714,7 @@ RSpec.describe Metasploit::Credential::Core, type: :model do
       # Callbacks
       #
 
-      before(:each) do
+      before(:example) do
         core.valid?
       end
 
@@ -741,7 +741,7 @@ RSpec.describe Metasploit::Credential::Core, type: :model do
               FactoryGirl.generate :metasploit_credential_core_realm_factory
             end
 
-            it { should_not include(error) }
+            it { is_expected.not_to include(error) }
           end
 
           context 'without #realm' do
@@ -749,7 +749,7 @@ RSpec.describe Metasploit::Credential::Core, type: :model do
               nil
             end
 
-            it { should_not include(error) }
+            it { is_expected.not_to include(error) }
           end
         end
 
@@ -767,7 +767,7 @@ RSpec.describe Metasploit::Credential::Core, type: :model do
               FactoryGirl.generate :metasploit_credential_core_realm_factory
             end
 
-            it { should_not include(error) }
+            it { is_expected.not_to include(error) }
           end
 
           context 'without #realm' do
@@ -775,7 +775,7 @@ RSpec.describe Metasploit::Credential::Core, type: :model do
               nil
             end
 
-            it { should_not include(error) }
+            it { is_expected.not_to include(error) }
           end
         end
       end
@@ -799,7 +799,7 @@ RSpec.describe Metasploit::Credential::Core, type: :model do
               FactoryGirl.generate :metasploit_credential_core_realm_factory
             end
 
-            it { should_not include(error) }
+            it { is_expected.not_to include(error) }
           end
 
           context 'without #realm' do
@@ -807,7 +807,7 @@ RSpec.describe Metasploit::Credential::Core, type: :model do
               nil
             end
 
-            it { should_not include(error) }
+            it { is_expected.not_to include(error) }
           end
         end
 
@@ -825,7 +825,7 @@ RSpec.describe Metasploit::Credential::Core, type: :model do
               FactoryGirl.generate :metasploit_credential_core_realm_factory
             end
 
-            it { should_not include(error) }
+            it { is_expected.not_to include(error) }
           end
 
         end
@@ -848,7 +848,7 @@ RSpec.describe Metasploit::Credential::Core, type: :model do
       it { is_expected.to be_valid }
 
       context "when the Public is missing" do
-        before(:each) do
+        before(:example) do
           core.public = nil
         end
 

data/spec/models/metasploit/credential/login_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe Metasploit::Credential::Login, type: :model do
         # Callbacks
         #
 
-        before(:each) do
+        before(:example) do
           login.valid?
         end
 
@@ -182,7 +182,7 @@ RSpec.describe Metasploit::Credential::Login, type: :model do
     context 'with existent Metasploit::Credential::Login' do
       include_context 'Mdm::Workspace'
 
-      before(:each) do
+      before(:example) do
         # validate_uniqueness_of will use Metasploit::Credential::Login#service_id and not trigger service_id non-null
         # constraint.
         FactoryGirl.create(
@@ -219,7 +219,7 @@ RSpec.describe Metasploit::Credential::Login, type: :model do
       # Callbacks
       #
 
-      before(:each) do
+      before(:example) do
         login.valid?
       end
 
@@ -246,7 +246,7 @@ RSpec.describe Metasploit::Credential::Login, type: :model do
               nil
             end
 
-            it { should_not include(error) }
+            it { is_expected.not_to include(error) }
           end
         end
 
@@ -268,7 +268,7 @@ RSpec.describe Metasploit::Credential::Login, type: :model do
               DateTime.now.utc
             end
 
-            it { should_not include(error) }
+            it { is_expected.not_to include(error) }
           end
 
           context 'without #last_attempted' do
@@ -309,7 +309,7 @@ RSpec.describe Metasploit::Credential::Login, type: :model do
       # Callbacks
       #
 
-      before(:each) do
+      before(:example) do
         login.valid?
       end
 
@@ -341,7 +341,7 @@ RSpec.describe Metasploit::Credential::Login, type: :model do
                     core.workspace
                   end
 
-                  it { should_not include(error) }
+                  it { is_expected.not_to include(error) }
                 end
 
                 context 'different than #workspace' do
@@ -416,7 +416,7 @@ RSpec.describe Metasploit::Credential::Login, type: :model do
                   nil
                 end
 
-                it { should_not include(error) }
+                it { is_expected.not_to include(error) }
               end
             end
 
@@ -425,7 +425,7 @@ RSpec.describe Metasploit::Credential::Login, type: :model do
                 nil
               end
 
-              it { should_not include(error) }
+              it { is_expected.not_to include(error) }
             end
           end
 
@@ -434,7 +434,7 @@ RSpec.describe Metasploit::Credential::Login, type: :model do
               nil
             end
 
-            it { should_not include(error) }
+            it { is_expected.not_to include(error) }
           end
         end
       end
@@ -473,7 +473,7 @@ RSpec.describe Metasploit::Credential::Login, type: :model do
                 nil
               end
 
-              it { should_not include(error) }
+              it { is_expected.not_to include(error) }
             end
           end
 
@@ -482,7 +482,7 @@ RSpec.describe Metasploit::Credential::Login, type: :model do
               nil
             end
 
-            it { should_not include(error) }
+            it { is_expected.not_to include(error) }
           end
         end
 
@@ -491,7 +491,7 @@ RSpec.describe Metasploit::Credential::Login, type: :model do
             nil
           end
 
-          it { should_not include(error) }
+          it { is_expected.not_to include(error) }
         end
       end
     end

data/spec/models/metasploit/credential/ntlm_hash_spec.rb

@@ -90,7 +90,7 @@ RSpec.describe Metasploit::Credential::NTLMHash, type: :model do
           )
         end
 
-        before(:each) do
+        before(:example) do
           ntlm_hash.valid?
         end
 
@@ -176,12 +176,12 @@ RSpec.describe Metasploit::Credential::NTLMHash, type: :model do
       # Callbacks
       #
 
-      before(:each) do
+      before(:example) do
         ntlm_hash.valid?
       end
 
       context 'with <LAN Manager hex digest>:<NT LAN Manager hex digest>' do
-        it { should_not include(error) }
+        it { is_expected.not_to include(error) }
       end
 
       context "without ':'" do

data/spec/models/metasploit/credential/origin/service_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 RSpec.describe Metasploit::Credential::Origin::Service, type: :model do
   include_context 'Mdm::Workspace'
 
@@ -150,7 +152,7 @@ RSpec.describe Metasploit::Credential::Origin::Service, type: :model do
 
       context do
         # example to sample for service_id
-        before(:each) do
+        before(:example) do
           FactoryGirl.create(:metasploit_credential_origin_service)
         end
 

data/spec/models/metasploit/credential/origin/session_spec.rb

@@ -38,7 +38,7 @@ RSpec.describe Metasploit::Credential::Origin::Session, type: :model do
     context 'post_reference_name' do
       include_context 'Mdm::Workspace'
 
-      before(:each) do
+      before(:example) do
         FactoryGirl.create(:metasploit_credential_origin_session)
       end
 

data/spec/models/metasploit/credential/postgres_md5_spec.rb

@@ -44,7 +44,7 @@ RSpec.describe Metasploit::Credential::PostgresMD5, type: :model do
           )
         end
 
-        before(:each) do
+        before(:example) do
           postgres_md5.valid?
         end