metasploit-credential 0.14.5 → 0.14.6

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

@@ -1,12 +1,10 @@
-require 'spec_helper'
-
-describe Metasploit::Credential::Login do
+RSpec.describe Metasploit::Credential::Login, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { should belong_to(:core).class_name('Metasploit::Credential::Core') }
-    it { should have_one(:host).class_name('Mdm::Host') }
-    it { should belong_to(:service).class_name('Mdm::Service')}
+    it { is_expected.to belong_to(:core).class_name('Metasploit::Credential::Core') }
+    it { is_expected.to have_one(:host).class_name('Mdm::Host') }
+    it { is_expected.to belong_to(:service).class_name('Mdm::Service')}
   end
 
   context 'callbacks' do
@@ -39,7 +37,7 @@ describe Metasploit::Credential::Login do
               ''
             end
 
-            it { should be_nil }
+            it { is_expected.to be_nil }
           end
 
           context 'with nil' do
@@ -47,7 +45,7 @@ describe Metasploit::Credential::Login do
               nil
             end
 
-            it { should be_nil }
+            it { is_expected.to be_nil }
           end
 
           context 'with present' do
@@ -66,21 +64,21 @@ describe Metasploit::Credential::Login do
 
   context 'database' do
     context 'columns' do
-      it { should have_db_column(:access_level).of_type(:string).with_options(null: true) }
-      it { should have_db_column(:last_attempted_at).of_type(:datetime).with_options(null: true) }
-      it { should have_db_column(:status).of_type(:string).with_options(null: false) }
+      it { is_expected.to have_db_column(:access_level).of_type(:string).with_options(null: true) }
+      it { is_expected.to have_db_column(:last_attempted_at).of_type(:datetime).with_options(null: true) }
+      it { is_expected.to have_db_column(:status).of_type(:string).with_options(null: false) }
 
       it_should_behave_like 'timestamp database columns'
 
       context 'foreign keys' do
-        it { should have_db_column(:core_id).of_type(:integer).with_options(null: false) }
-        it { should have_db_column(:service_id).of_type(:integer).with_options(null: false) }
+        it { is_expected.to have_db_column(:core_id).of_type(:integer).with_options(null: false) }
+        it { is_expected.to have_db_column(:service_id).of_type(:integer).with_options(null: false) }
       end
     end
 
     context 'indices' do
-      it { should have_db_index([:core_id, :service_id]).unique(true) }
-      it { should have_db_index([:service_id, :core_id]).unique(true) }
+      it { is_expected.to have_db_index([:core_id, :service_id]).unique(true) }
+      it { is_expected.to have_db_index([:service_id, :core_id]).unique(true) }
     end
   end
 
@@ -92,7 +90,7 @@ describe Metasploit::Credential::Login do
         FactoryGirl.build(:metasploit_credential_login)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
 
       context '#status' do
         subject(:metasploit_credential_login) do
@@ -107,7 +105,7 @@ describe Metasploit::Credential::Login do
             Metasploit::Model::Login::Status::DENIED_ACCESS
           end
 
-          it { should be_valid }
+          it { is_expected.to be_valid }
         end
 
         context 'with Metasploit::Model::Login::Status::DISABLED' do
@@ -115,7 +113,7 @@ describe Metasploit::Credential::Login do
             Metasploit::Model::Login::Status::DISABLED
           end
 
-          it { should be_valid }
+          it { is_expected.to be_valid }
         end
 
         context 'with Metasploit::Model::Login::Status::LOCKED_OUT' do
@@ -123,7 +121,7 @@ describe Metasploit::Credential::Login do
             Metasploit::Model::Login::Status::LOCKED_OUT
           end
 
-          it { should be_valid }
+          it { is_expected.to be_valid }
         end
 
         context 'with Metasploit::Model::Login::Status::SUCCESSFUL' do
@@ -131,7 +129,7 @@ describe Metasploit::Credential::Login do
             Metasploit::Model::Login::Status::SUCCESSFUL
           end
 
-          it { should be_valid }
+          it { is_expected.to be_valid }
         end
 
         context 'with Metasploit::Model::Login::Status::UNABLE_TO_CONNECT' do
@@ -139,7 +137,7 @@ describe Metasploit::Credential::Login do
             Metasploit::Model::Login::Status::UNABLE_TO_CONNECT
           end
 
-          it { should be_valid }
+          it { is_expected.to be_valid }
         end
 
         context 'with Metasploit::Model::Login::Status::UNTRIED' do
@@ -147,21 +145,21 @@ describe Metasploit::Credential::Login do
             Metasploit::Model::Login::Status::UNTRIED
           end
 
-          it { should be_valid }
+          it { is_expected.to be_valid }
         end
       end
     end
   end
 
   context 'mass assignment security' do
-    it { should allow_mass_assignment_of(:access_level) }
+    it { is_expected.to allow_mass_assignment_of(:access_level) }
     it { should_not allow_mass_assignment_of(:core) }
     it { should_not allow_mass_assignment_of(:core_id) }
     it { should_not allow_mass_assignment_of(:created_at) }
-    it { should allow_mass_assignment_of(:last_attempted_at) }
+    it { is_expected.to allow_mass_assignment_of(:last_attempted_at) }
     it { should_not allow_mass_assignment_of(:service) }
     it { should_not allow_mass_assignment_of(:service_id) }
-    it { should allow_mass_assignment_of(:status) }
+    it { is_expected.to allow_mass_assignment_of(:status) }
     it { should_not allow_mass_assignment_of(:updated_at) }
   end
 
@@ -191,7 +189,7 @@ describe Metasploit::Credential::Login do
   end
 
   context 'validations' do
-    it { should validate_presence_of :core }
+    it { is_expected.to validate_presence_of :core }
 
     context 'with existent Metasploit::Credential::Login' do
       include_context 'Mdm::Workspace'
@@ -204,11 +202,11 @@ describe Metasploit::Credential::Login do
         )
       end
 
-      it { should validate_uniqueness_of(:core_id).scoped_to(:service_id) }
+      it { is_expected.to validate_uniqueness_of(:core_id).scoped_to(:service_id) }
     end
 
-    it { should validate_presence_of :service }
-    it { should ensure_inclusion_of(:status).in_array(Metasploit::Model::Login::Status::ALL) }
+    it { is_expected.to validate_presence_of :service }
+    it { is_expected.to ensure_inclusion_of(:status).in_array(Metasploit::Model::Login::Status::ALL) }
 
     context '#consistent_last_attempted_at' do
       include_context 'Mdm::Workspace'
@@ -252,7 +250,7 @@ describe Metasploit::Credential::Login do
               DateTime.now.utc
             end
 
-            it { should include(error) }
+            it { is_expected.to include(error) }
           end
 
           context 'without #last_attempted' do
@@ -290,7 +288,7 @@ describe Metasploit::Credential::Login do
               nil
             end
 
-            it { should include(error) }
+            it { is_expected.to include(error) }
           end
         end
       end
@@ -363,7 +361,7 @@ describe Metasploit::Credential::Login do
                     FactoryGirl.build(:mdm_workspace)
                   end
 
-                  it { should include(error) }
+                  it { is_expected.to include(error) }
                 end
               end
 
@@ -372,7 +370,7 @@ describe Metasploit::Credential::Login do
                   nil
                 end
 
-                it { should include(error) }
+                it { is_expected.to include(error) }
               end
             end
 
@@ -381,7 +379,7 @@ describe Metasploit::Credential::Login do
                 nil
               end
 
-              it { should include(error) }
+              it { is_expected.to include(error) }
             end
           end
 
@@ -390,7 +388,7 @@ describe Metasploit::Credential::Login do
               nil
             end
 
-            it { should include(error) }
+            it { is_expected.to include(error) }
           end
         end
 
@@ -422,7 +420,7 @@ describe Metasploit::Credential::Login do
                   FactoryGirl.build(:mdm_workspace)
                 end
 
-                it { should include(error) }
+                it { is_expected.to include(error) }
               end
 
               context 'without Mdm::Host#workspace' do
@@ -479,7 +477,7 @@ describe Metasploit::Credential::Login do
                 FactoryGirl.build(:mdm_workspace)
               end
 
-              it { should include(error) }
+              it { is_expected.to include(error) }
             end
 
             context 'without Mdm::Host#workspace' do
@@ -522,7 +520,7 @@ describe Metasploit::Credential::Login do
       subject(:login){ FactoryGirl.create :metasploit_credential_login, core: core}
 
       it 'should find the right objects' do
-        Metasploit::Credential::Login.in_workspace_including_hosts_and_services(service.host.workspace).should include(login)
+        expect(Metasploit::Credential::Login.in_workspace_including_hosts_and_services(service.host.workspace)).to include(login)
       end
     end
   end

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

@@ -1,9 +1,7 @@
-require 'spec_helper'
-
-describe Metasploit::Credential::NonreplayableHash do
+RSpec.describe Metasploit::Credential::NonreplayableHash, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
-  it { should be_a Metasploit::Credential::PasswordHash }
+  it { is_expected.to be_a Metasploit::Credential::PasswordHash }
 
   context 'factories' do
     context 'metasploit_credential_nonreplayable_hash' do
@@ -11,7 +9,7 @@ describe Metasploit::Credential::NonreplayableHash do
         FactoryGirl.build(:metasploit_credential_nonreplayable_hash)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
   end
 end

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

@@ -1,9 +1,7 @@
-require 'spec_helper'
-
-describe Metasploit::Credential::NTLMHash do
+RSpec.describe Metasploit::Credential::NTLMHash, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
-  it { should be_a Metasploit::Credential::ReplayableHash }
+  it { is_expected.to be_a Metasploit::Credential::ReplayableHash }
 
   context 'CONSTANTS' do
     context 'DATA_REGEXP' do
@@ -38,7 +36,7 @@ describe Metasploit::Credential::NTLMHash do
         described_class::LAN_MANAGER_MAX_CHARACTERS
       end
 
-      it { should == 14 }
+      it { is_expected.to eq 14 }
     end
 
     context 'LAN_MANAGER_HEX_DIGEST_REGEXP' do
@@ -101,7 +99,7 @@ describe Metasploit::Credential::NTLMHash do
             nil
           end
 
-          it { should be_nil }
+          it { is_expected.to be_nil }
         end
 
         context 'with upper case characters' do
@@ -133,7 +131,7 @@ describe Metasploit::Credential::NTLMHash do
         FactoryGirl.build(:metasploit_credential_ntlm_hash)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
   end
 
@@ -191,7 +189,7 @@ describe Metasploit::Credential::NTLMHash do
           super().gsub(':', '')
         end
 
-        it { should include(error) }
+        it { is_expected.to include(error) }
       end
 
       context 'without LAN Manager hex_digest' do
@@ -199,7 +197,7 @@ describe Metasploit::Credential::NTLMHash do
           ":#{nt_lan_manager_hex_digest}"
         end
 
-        it { should include(error) }
+        it { is_expected.to include(error) }
       end
 
       context 'with incorrect hash length(s)' do
@@ -207,7 +205,7 @@ describe Metasploit::Credential::NTLMHash do
           "123456:abcdef"
         end
 
-        it { should include(error) }
+        it { is_expected.to include(error) }
       end
     end
   end
@@ -375,26 +373,26 @@ describe Metasploit::Credential::NTLMHash do
     context 'blank_password?' do
 
       it 'returns true if the hash is for a blank password' do
-        expect(blank_password_hash.blank_password?).to be_true
+        expect(blank_password_hash.blank_password?).to eq(true)
       end
 
       it 'returns false if the hash is not for a blank password' do
-        expect(non_blank_password.blank_password?).to be_false
+        expect(non_blank_password.blank_password?).to eq(false)
       end
 
       it 'returns false if the nt hash is not blank but the lm hash is' do
-        expect(no_lm_hash.blank_password?).to be_false
+        expect(no_lm_hash.blank_password?).to eq(false)
       end
     end
 
     context 'lm_hash_present?' do
 
       it 'returns false if the lm_hash is blank' do
-        expect(no_lm_hash.lm_hash_present?).to be_false
+        expect(no_lm_hash.lm_hash_present?).to eq(false)
       end
 
       it 'returns true if the lm_hash is not blank' do
-        expect(non_blank_password.lm_hash_present?).to be_true
+        expect(non_blank_password.lm_hash_present?).to eq(true)
       end
     end
   end

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

@@ -1,11 +1,9 @@
-require 'spec_helper'
-
-describe Metasploit::Credential::Origin::CrackedPassword do
+RSpec.describe Metasploit::Credential::Origin::CrackedPassword, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { should have_many(:cores).class_name('Metasploit::Credential::Core').dependent(:destroy) }
-    it { should belong_to(:originating_core).class_name('Metasploit::Credential::Core') }
+    it { is_expected.to have_many(:cores).class_name('Metasploit::Credential::Core').dependent(:destroy) }
+    it { is_expected.to belong_to(:originating_core).class_name('Metasploit::Credential::Core') }
   end
 
   context 'database' do
@@ -13,13 +11,13 @@ describe Metasploit::Credential::Origin::CrackedPassword do
       it_should_behave_like 'timestamp database columns'
 
       context 'foreign keys' do
-        it { should have_db_column(:metasploit_credential_core_id).of_type(:integer).with_options(null: false) }
+        it { is_expected.to have_db_column(:metasploit_credential_core_id).of_type(:integer).with_options(null: false) }
       end
     end
 
     context 'indices' do
       context 'foreign keys' do
-        it { should have_db_index(:metasploit_credential_core_id) }
+        it { is_expected.to have_db_index(:metasploit_credential_core_id) }
       end
     end
   end

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

@@ -1,27 +1,25 @@
-require 'spec_helper'
-
-describe Metasploit::Credential::Origin::Import do
+RSpec.describe Metasploit::Credential::Origin::Import, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { should have_many(:cores).class_name('Metasploit::Credential::Core').dependent(:destroy) }
-    it { should belong_to(:task).class_name('Mdm::Task') }
+    it { is_expected.to have_many(:cores).class_name('Metasploit::Credential::Core').dependent(:destroy) }
+    it { is_expected.to belong_to(:task).class_name('Mdm::Task') }
   end
 
   context 'database' do
     context 'columns' do
-      it { should have_db_column(:filename).of_type(:text).with_options(null: false) }
+      it { is_expected.to have_db_column(:filename).of_type(:text).with_options(null: false) }
 
       it_should_behave_like 'timestamp database columns'
 
       context 'foreign keys' do
-        it { should have_db_column(:task_id).of_type(:integer) }
+        it { is_expected.to have_db_column(:task_id).of_type(:integer) }
       end
     end
 
     context 'indices' do
       context 'foreign keys' do
-        it { should have_db_index(:task_id) }
+        it { is_expected.to have_db_index(:task_id) }
       end
     end
   end
@@ -33,12 +31,12 @@ describe Metasploit::Credential::Origin::Import do
       FactoryGirl.build(:metasploit_credential_origin_import)
     end
 
-    it { should be_valid }
+    it { is_expected.to be_valid }
   end
 
   context 'mass assignment security' do
     it { should_not allow_mass_assignment_of :created_at }
-    it { should allow_mass_assignment_of :filename }
+    it { is_expected.to allow_mass_assignment_of :filename }
     it { should_not allow_mass_assignment_of :task }
     it { should_not allow_mass_assignment_of :task_id }
     it { should_not allow_mass_assignment_of :updated_at }

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

@@ -1,17 +1,15 @@
-require 'spec_helper'
-
-describe Metasploit::Credential::Origin::Manual do
+RSpec.describe Metasploit::Credential::Origin::Manual, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { should have_many(:cores).class_name('Metasploit::Credential::Core').dependent(:destroy) }
-    it { should belong_to(:user).class_name('Mdm::User') }
+    it { is_expected.to have_many(:cores).class_name('Metasploit::Credential::Core').dependent(:destroy) }
+    it { is_expected.to belong_to(:user).class_name('Mdm::User') }
   end
 
   context 'database' do
     context 'columns' do
       context 'foreign keys' do
-        it { should have_db_column(:user_id).of_type(:integer).with_options(null: false) }
+        it { is_expected.to have_db_column(:user_id).of_type(:integer).with_options(null: false) }
       end
 
       it_should_behave_like 'timestamp database columns'
@@ -19,7 +17,7 @@ describe Metasploit::Credential::Origin::Manual do
 
     context 'indices' do
       context 'foreign keys' do
-        it { should have_db_index(:user_id) }
+        it { is_expected.to have_db_index(:user_id) }
       end
     end
   end
@@ -30,11 +28,11 @@ describe Metasploit::Credential::Origin::Manual do
         FactoryGirl.build(:metasploit_credential_origin_manual)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
   end
 
   context 'validations' do
-    it { should validate_presence_of :user }
+    it { is_expected.to validate_presence_of :user }
   end
 end