metasploit-credential 0.14.5 → 0.14.6

data/spec/models/mdm/service_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe Mdm::Service do
+RSpec.describe Mdm::Service, type: :model do
   context 'associations' do
-    it { should have_many(:credential_origins).class_name('Metasploit::Credential::Origin::Service').dependent(:destroy) }
-    it { should have_many(:logins).class_name('Metasploit::Credential::Login').dependent(:destroy) }
+    it { is_expected.to have_many(:credential_origins).class_name('Metasploit::Credential::Origin::Service').dependent(:destroy) }
+    it { is_expected.to have_many(:logins).class_name('Metasploit::Credential::Login').dependent(:destroy) }
   end
 end

data/spec/models/mdm/session_spec.rb

@@ -1,7 +1,5 @@
-require 'spec_helper'
-
-describe Mdm::Session do
+RSpec.describe Mdm::Session, type: :model do
   context 'associations' do
-    it { should have_many(:credential_origins).class_name('Metasploit::Credential::Origin::Session').dependent(:destroy) }
+    it { is_expected.to have_many(:credential_origins).class_name('Metasploit::Credential::Origin::Session').dependent(:destroy) }
   end
 end

data/spec/models/mdm/task_spec.rb

@@ -1,9 +1,7 @@
-require 'spec_helper'
-
-describe Mdm::Task do
+RSpec.describe Mdm::Task, type: :model do
   context 'associations' do
-    it { should have_many(:import_credential_origins).class_name('Metasploit::Credential::Origin::Import').dependent(:destroy) }
-    it { should have_and_belong_to_many(:credential_cores).class_name('Metasploit::Credential::Core') }
-    it { should have_and_belong_to_many(:credential_logins).class_name('Metasploit::Credential::Login') }
+    it { is_expected.to have_many(:import_credential_origins).class_name('Metasploit::Credential::Origin::Import').dependent(:destroy) }
+    it { is_expected.to have_and_belong_to_many(:credential_cores).class_name('Metasploit::Credential::Core') }
+    it { is_expected.to have_and_belong_to_many(:credential_logins).class_name('Metasploit::Credential::Login') }
   end
 end

data/spec/models/mdm/user_spec.rb

@@ -1,7 +1,5 @@
-require 'spec_helper'
-
-describe Mdm::User do
+RSpec.describe Mdm::User, type: :model do
   context 'associations' do
-    it { should have_many(:credential_origins).class_name('Metasploit::Credential::Origin::Manual').dependent(:destroy) }
+    it { is_expected.to have_many(:credential_origins).class_name('Metasploit::Credential::Origin::Manual').dependent(:destroy) }
   end
 end

data/spec/models/mdm/workspace_spec.rb

@@ -1,7 +1,5 @@
-require 'spec_helper'
-
-describe Mdm::Workspace do
+RSpec.describe Mdm::Workspace, type: :model do
   context 'associations' do
-    it { should have_many(:core_credentials).class_name('Metasploit::Credential::Core').dependent(:destroy) }
+    it { is_expected.to have_many(:core_credentials).class_name('Metasploit::Credential::Core').dependent(:destroy) }
   end
 end

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

@@ -1,25 +1,23 @@
-require 'spec_helper'
-
-describe Metasploit::Credential::BlankUsername do
+RSpec.describe Metasploit::Credential::BlankUsername, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'database' do
     context 'columns' do
       it_should_behave_like 'timestamp database columns'
 
-      it { should have_db_column(:username).of_type(:string).with_options(null: false) }
-      it { should have_db_column(:type).of_type(:string).with_options(null: false) }
+      it { is_expected.to have_db_column(:username).of_type(:string).with_options(null: false) }
+      it { is_expected.to have_db_column(:type).of_type(:string).with_options(null: false) }
     end
 
     context 'indices' do
-      it { should have_db_index(:username).unique(true) }
+      it { is_expected.to have_db_index(:username).unique(true) }
     end
   end
 
   context 'mass assignment security' do
     it { should_not allow_mass_assignment_of(:created_at) }
     it { should_not allow_mass_assignment_of(:updated_at) }
-    it { should allow_mass_assignment_of(:username) }
+    it { is_expected.to allow_mass_assignment_of(:username) }
   end
 
 

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

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 # Test plan for unique indexes and uniqueness validators
 #
 #    Index        |  First Metasploit::Credential::Core  |           |           |           |  Second Metasploit::Credential::Core  |             |             |             |  Collision  |
@@ -54,7 +52,7 @@ require 'spec_helper'
 #    complete     |  non-nil                             |  non-nil  |  non-nil  |  non-nil  |  different                            |  different  |  different  |  same       |  FALSE      |
 #    complete     |  non-nil                             |  non-nil  |  non-nil  |  non-nil  |  different                            |  different  |  different  |  different  |  FALSE      |
 #
-describe Metasploit::Credential::Core do
+RSpec.describe Metasploit::Credential::Core, type: :model do
   include_context 'Mdm::Workspace'
 
   subject(:core) do
@@ -71,27 +69,27 @@ describe Metasploit::Credential::Core do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'associations' do
-    it { should have_and_belong_to_many(:tasks).class_name('Mdm::Task') }
-    it { should have_many(:logins).class_name('Metasploit::Credential::Login').dependent(:destroy) }
-    it { should belong_to(:origin) }
-    it { should belong_to(:private).class_name('Metasploit::Credential::Private') }
-    it { should belong_to(:public).class_name('Metasploit::Credential::Public') }
-    it { should belong_to(:realm).class_name('Metasploit::Credential::Realm') }
-    it { should belong_to(:workspace).class_name('Mdm::Workspace') }
+    it { is_expected.to have_and_belong_to_many(:tasks).class_name('Mdm::Task') }
+    it { is_expected.to have_many(:logins).class_name('Metasploit::Credential::Login').dependent(:destroy) }
+    it { is_expected.to belong_to(:origin) }
+    it { is_expected.to belong_to(:private).class_name('Metasploit::Credential::Private') }
+    it { is_expected.to belong_to(:public).class_name('Metasploit::Credential::Public') }
+    it { is_expected.to belong_to(:realm).class_name('Metasploit::Credential::Realm') }
+    it { is_expected.to belong_to(:workspace).class_name('Mdm::Workspace') }
   end
 
   context 'database' do
     context 'columns' do
       context 'foreign keys' do
         context 'polymorphic origin' do
-          it { should have_db_column(:origin_id).of_type(:integer).with_options(null: false) }
-          it { should have_db_column(:origin_type).of_type(:string).with_options(null: false) }
+          it { is_expected.to have_db_column(:origin_id).of_type(:integer).with_options(null: false) }
+          it { is_expected.to have_db_column(:origin_type).of_type(:string).with_options(null: false) }
         end
 
-        it { should have_db_column(:private_id).of_type(:integer).with_options(null: true) }
-        it { should have_db_column(:public_id).of_type(:integer).with_options(null: true) }
-        it { should have_db_column(:realm_id).of_type(:integer).with_options(null: true) }
-        it { should have_db_column(:workspace_id).of_type(:integer).with_options(null: false) }
+        it { is_expected.to have_db_column(:private_id).of_type(:integer).with_options(null: true) }
+        it { is_expected.to have_db_column(:public_id).of_type(:integer).with_options(null: true) }
+        it { is_expected.to have_db_column(:realm_id).of_type(:integer).with_options(null: true) }
+        it { is_expected.to have_db_column(:workspace_id).of_type(:integer).with_options(null: false) }
       end
 
       it_should_behave_like 'timestamp database columns'
@@ -100,11 +98,11 @@ describe Metasploit::Credential::Core do
     context 'indices' do
       context 'foreign keys' do
 
-        it { should have_db_index([:origin_type, :origin_id]) }
-        it { should have_db_index(:private_id) }
-        it { should have_db_index(:public_id) }
-        it { should have_db_index(:realm_id) }
-        it { should have_db_index(:workspace_id) }
+        it { is_expected.to have_db_index([:origin_type, :origin_id]) }
+        it { is_expected.to have_db_index(:private_id) }
+        it { is_expected.to have_db_index(:public_id) }
+        it { is_expected.to have_db_index(:realm_id) }
+        it { is_expected.to have_db_index(:workspace_id) }
 
 
       end
@@ -295,7 +293,7 @@ describe Metasploit::Credential::Core do
         metasploit_credential_core.origin
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
 
       context 'with origin_factory' do
         subject(:metasploit_credential_core) do
@@ -310,7 +308,7 @@ describe Metasploit::Credential::Core do
             :metasploit_credential_origin_import
           end
 
-          it { should be_valid }
+          it { is_expected.to be_valid }
         end
 
         context ':metasploit_credential_origin_manual' do
@@ -318,14 +316,14 @@ describe Metasploit::Credential::Core do
             :metasploit_credential_origin_manual
           end
 
-          it { should be_valid }
+          it { is_expected.to be_valid }
 
           context '#origin' do
             subject(:origin) do
               metasploit_credential_core.origin
             end
 
-            it { should be_a Metasploit::Credential::Origin::Manual }
+            it { is_expected.to be_a Metasploit::Credential::Origin::Manual }
           end
 
           context '#workspace' do
@@ -342,7 +340,7 @@ describe Metasploit::Credential::Core do
             :metasploit_credential_origin_service
           end
 
-          it { should be_valid }
+          it { is_expected.to be_valid }
 
           context '#workspace' do
             subject(:workspace) do
@@ -361,7 +359,7 @@ describe Metasploit::Credential::Core do
             :metasploit_credential_origin_session
           end
 
-          it { should be_valid }
+          it { is_expected.to be_valid }
 
           context '#workspace' do
             subject(:workspace) do
@@ -382,7 +380,7 @@ describe Metasploit::Credential::Core do
         FactoryGirl.build(:metasploit_credential_core_import)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
 
     context 'metasploit_credential_core_manual' do
@@ -390,7 +388,7 @@ describe Metasploit::Credential::Core do
         FactoryGirl.build(:metasploit_credential_core_manual)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
 
       context '#workspace' do
         subject(:workspace) do
@@ -406,7 +404,7 @@ describe Metasploit::Credential::Core do
         FactoryGirl.build(:metasploit_credential_core_service)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
 
       context '#workspace' do
         subject(:workspace) do
@@ -429,7 +427,7 @@ describe Metasploit::Credential::Core do
         FactoryGirl.build(:metasploit_credential_core_session)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
 
       context '#workspace' do
         subject(:workspace) do
@@ -449,7 +447,7 @@ describe Metasploit::Credential::Core do
   end
 
   context 'validations' do
-    it { should validate_presence_of :origin }
+    it { is_expected.to validate_presence_of :origin }
 
 
     context '#consistent_workspaces' do
@@ -538,7 +536,7 @@ describe Metasploit::Credential::Core do
               end
 
               context 'without #workspace in Mdm::User#workspaces' do
-                it { should include error }
+                it { is_expected.to include error }
               end
             end
           end
@@ -548,7 +546,7 @@ describe Metasploit::Credential::Core do
               nil
             end
 
-            it { should include error }
+            it { is_expected.to include error }
           end
         end
 
@@ -593,7 +591,7 @@ describe Metasploit::Credential::Core do
                   FactoryGirl.create(:mdm_workspace)
                 end
 
-                it { should include error }
+                it { is_expected.to include error }
               end
             end
 
@@ -602,7 +600,7 @@ describe Metasploit::Credential::Core do
                 nil
               end
 
-              it { should include error }
+              it { is_expected.to include error }
             end
           end
 
@@ -611,7 +609,7 @@ describe Metasploit::Credential::Core do
               nil
             end
 
-            it { should include error }
+            it { is_expected.to include error }
           end
         end
 
@@ -657,7 +655,7 @@ describe Metasploit::Credential::Core do
                     FactoryGirl.create(:mdm_workspace)
                   end
 
-                  it { should include error }
+                  it { is_expected.to include error }
                 end
               end
 
@@ -666,7 +664,7 @@ describe Metasploit::Credential::Core do
                   nil
                 end
 
-                it { should include error }
+                it { is_expected.to include error }
               end
             end
 
@@ -675,7 +673,7 @@ describe Metasploit::Credential::Core do
                 nil
               end
 
-              it { should include error }
+              it { is_expected.to include error }
             end
           end
 
@@ -684,7 +682,7 @@ describe Metasploit::Credential::Core do
               nil
             end
 
-            it { should include error }
+            it { is_expected.to include error }
           end
         end
       end
@@ -839,7 +837,7 @@ describe Metasploit::Credential::Core do
         I18n.translate!('activerecord.errors.models.metasploit/credential/core.attributes.base.public_for_ssh_key')
       end
 
-      let(:core) do
+      subject(:core) do
         FactoryGirl.build(
             :metasploit_credential_core,
             private: FactoryGirl.build(:metasploit_credential_ssh_key),
@@ -847,7 +845,7 @@ describe Metasploit::Credential::Core do
         )
       end
 
-      it { core.should be_valid }
+      it { is_expected.to be_valid }
 
       context "when the Public is missing" do
         before(:each) do
@@ -855,12 +853,12 @@ describe Metasploit::Credential::Core do
         end
 
         it 'should not be valid if Private is an SSHKey and Public is missing' do
-          core.should_not be_valid
+          expect(core).not_to be_valid
         end
 
         it 'should show the proper error' do
           core.valid?
-          core.errors[:base].should include(error)
+          expect(core.errors[:base]).to include(error)
         end
       end
 

data/spec/models/metasploit/credential/login/status_spec.rb

@@ -1,18 +1,16 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Login::Status do
+RSpec.describe Metasploit::Model::Login::Status, type: :model do
   context 'CONSTANTS' do
     context 'ALL' do
       subject(:all) do
         described_class::ALL
       end
 
-      it { should include described_class::DENIED_ACCESS }
-      it { should include described_class::DISABLED }
-      it { should include described_class::LOCKED_OUT }
-      it { should include described_class::SUCCESSFUL }
-      it { should include described_class::UNABLE_TO_CONNECT }
-      it { should include described_class::UNTRIED }
+      it { is_expected.to include described_class::DENIED_ACCESS }
+      it { is_expected.to include described_class::DISABLED }
+      it { is_expected.to include described_class::LOCKED_OUT }
+      it { is_expected.to include described_class::SUCCESSFUL }
+      it { is_expected.to include described_class::UNABLE_TO_CONNECT }
+      it { is_expected.to include described_class::UNTRIED }
     end
 
     context 'DENIED_ACCESS' do
@@ -20,8 +18,8 @@ describe Metasploit::Model::Login::Status do
         described_class::DENIED_ACCESS
       end
 
-      it { should == 'Denied Access' }
-      it { should be_in described_class::ALL }
+      it { is_expected.to eq 'Denied Access' }
+      it { is_expected.to be_in described_class::ALL }
     end
 
     context 'DISABLED' do
@@ -29,8 +27,8 @@ describe Metasploit::Model::Login::Status do
         described_class::DISABLED
       end
 
-      it { should == 'Disabled' }
-      it { should be_in described_class::ALL }
+      it { is_expected.to eq 'Disabled' }
+      it { is_expected.to be_in described_class::ALL }
     end
 
     context 'LOCKED_OUT' do
@@ -38,8 +36,8 @@ describe Metasploit::Model::Login::Status do
         described_class::LOCKED_OUT
       end
 
-      it { should == 'Locked Out' }
-      it { should be_in described_class::ALL }
+      it { is_expected.to eq 'Locked Out' }
+      it { is_expected.to be_in described_class::ALL }
     end
 
     context 'SUCCESSFUL' do
@@ -47,8 +45,8 @@ describe Metasploit::Model::Login::Status do
         described_class::SUCCESSFUL
       end
 
-      it { should == 'Successful' }
-      it { should be_in described_class::ALL }
+      it { is_expected.to eq 'Successful' }
+      it { is_expected.to be_in described_class::ALL }
     end
 
     context 'UNABLE_TO_CONNECT' do
@@ -56,8 +54,8 @@ describe Metasploit::Model::Login::Status do
         described_class::UNABLE_TO_CONNECT
       end
 
-      it { should == 'Unable to Connect' }
-      it { should be_in described_class::ALL }
+      it { is_expected.to eq 'Unable to Connect' }
+      it { is_expected.to be_in described_class::ALL }
     end
 
     context 'UNTRIED' do
@@ -65,8 +63,8 @@ describe Metasploit::Model::Login::Status do
         described_class::UNTRIED
       end
 
-      it { should == 'Untried' }
-      it { should be_in described_class::ALL }
+      it { is_expected.to eq 'Untried' }
+      it { is_expected.to be_in described_class::ALL }
     end
   end
 end