metasploit-credential 0.14.5 → 0.14.6

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

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Credential::Origin::Service do
+RSpec.describe Metasploit::Credential::Origin::Service, type: :model do
   include_context 'Mdm::Workspace'
 
   subject(:service_origin) do
@@ -10,23 +8,23 @@ describe Metasploit::Credential::Origin::Service 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(:service).class_name('Mdm::Service') }
+    it { is_expected.to have_many(:cores).class_name('Metasploit::Credential::Core').dependent(:destroy) }
+    it { is_expected.to belong_to(:service).class_name('Mdm::Service') }
   end
 
   context 'database' do
     context 'columns' do
       it_should_behave_like 'timestamp database columns'
 
-      it { should have_db_column(:module_full_name).of_type(:text).with_options(null: false) }
+      it { is_expected.to have_db_column(:module_full_name).of_type(:text).with_options(null: false) }
 
       context 'foreign keys' do
-        it { should have_db_column(:service_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([:service_id, :module_full_name]).unique(true) }
+      it { is_expected.to have_db_index([:service_id, :module_full_name]).unique(true) }
     end
   end
 
@@ -36,13 +34,13 @@ describe Metasploit::Credential::Origin::Service do
         FactoryGirl.build(:metasploit_credential_origin_service)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
   end
 
   context 'mass assignment security' do
     it { should_not allow_mass_assignment_of :created_at }
-    it { should allow_mass_assignment_of :module_full_name }
+    it { is_expected.to allow_mass_assignment_of :module_full_name }
     it { should_not allow_mass_assignment_of :service }
     it { should_not allow_mass_assignment_of :service_id }
     it { should_not allow_mass_assignment_of :updated_at }
@@ -164,10 +162,10 @@ describe Metasploit::Credential::Origin::Service do
           FactoryGirl.create(:metasploit_credential_origin_service)
         end
 
-        it { should validate_uniqueness_of(:module_full_name).scoped_to(:service_id) }
+        it { is_expected.to validate_uniqueness_of(:module_full_name).scoped_to(:service_id) }
       end
     end
 
-    it { should validate_presence_of :service }
+    it { is_expected.to validate_presence_of :service }
   end
 end

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

@@ -1,26 +1,24 @@
-require 'spec_helper'
-
-describe Metasploit::Credential::Origin::Session do
+RSpec.describe Metasploit::Credential::Origin::Session, 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(:session).class_name('Mdm::Session') }
+    it { is_expected.to have_many(:cores).class_name('Metasploit::Credential::Core').dependent(:destroy) }
+    it { is_expected.to belong_to(:session).class_name('Mdm::Session') }
   end
 
   context 'database' do
     context 'columns' do
-      it { should have_db_column(:post_reference_name).of_type(:text).with_options(null: false) }
+      it { is_expected.to have_db_column(:post_reference_name).of_type(:text).with_options(null: false) }
 
       it_should_behave_like 'timestamp database columns'
 
       context 'foreign keys' do
-        it { should have_db_column(:session_id).of_type(:integer).with_options(null: false) }
+        it { is_expected.to have_db_column(:session_id).of_type(:integer).with_options(null: false) }
       end
     end
 
     context 'columns' do
-      it { should have_db_index([:session_id, :post_reference_name]).unique(true) }
+      it { is_expected.to have_db_index([:session_id, :post_reference_name]).unique(true) }
     end
   end
 
@@ -32,13 +30,13 @@ describe Metasploit::Credential::Origin::Session do
         FactoryGirl.build(:metasploit_credential_origin_session)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
   end
 
   context 'mass assignment security' do
     it { should_not allow_mass_assignment_of(:created_at) }
-    it { should allow_mass_assignment_of(:post_reference_name) }
+    it { is_expected.to allow_mass_assignment_of(:post_reference_name) }
     it { should_not allow_mass_assignment_of(:session) }
     it { should_not allow_mass_assignment_of(:session_id) }
     it { should_not allow_mass_assignment_of(:updated_at) }
@@ -52,10 +50,10 @@ describe Metasploit::Credential::Origin::Session do
         FactoryGirl.create(:metasploit_credential_origin_session)
       end
 
-      it { should validate_presence_of :post_reference_name }
-      it { should validate_uniqueness_of(:post_reference_name).scoped_to(:session_id) }
+      it { is_expected.to validate_presence_of :post_reference_name }
+      it { is_expected.to validate_uniqueness_of(:post_reference_name).scoped_to(:session_id) }
     end
 
-    it { should validate_presence_of :session }
+    it { is_expected.to validate_presence_of :session }
   end
 end

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

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

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

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

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

@@ -1,9 +1,7 @@
-require 'spec_helper'
-
-describe Metasploit::Credential::PostgresMD5 do
+RSpec.describe Metasploit::Credential::PostgresMD5, 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
@@ -55,7 +53,7 @@ describe Metasploit::Credential::PostgresMD5 do
             nil
           end
 
-          it { should be_nil }
+          it { is_expected.to be_nil }
         end
 
         context 'with upper case characters' do
@@ -87,7 +85,7 @@ describe Metasploit::Credential::PostgresMD5 do
         FactoryGirl.build(:metasploit_credential_postgres_md5)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
   end
 

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

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Credential::Private do
+RSpec.describe Metasploit::Credential::Private, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'database' do
@@ -8,11 +6,11 @@ describe Metasploit::Credential::Private do
       it_should_behave_like 'single table inheritance database columns'
       it_should_behave_like 'timestamp database columns'
 
-      it { should have_db_column(:data).of_type(:text).with_options(null: false) }
+      it { is_expected.to have_db_column(:data).of_type(:text).with_options(null: false) }
     end
 
     context 'indices' do
-      it { should have_db_index([:type, :data]).unique(true) }
+      it { is_expected.to have_db_index([:type, :data]).unique(true) }
     end
   end
 
@@ -22,13 +20,13 @@ describe Metasploit::Credential::Private do
         FactoryGirl.build(:metasploit_credential_private)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
   end
 
   context 'mass assignement security' do
     it { should_not allow_mass_assignment_of :created_at }
-    it { should allow_mass_assignment_of :data }
+    it { is_expected.to allow_mass_assignment_of :data }
     it { should_not allow_mass_assignment_of :id }
     it { should_not allow_mass_assignment_of :updated_at }
     it { should_not allow_mass_assignment_of :type }
@@ -36,9 +34,9 @@ describe Metasploit::Credential::Private do
 
   context 'validations' do
     context 'data' do
-      it { should validate_non_nilness_of :data }
+      it { is_expected.to validate_non_nilness_of :data }
 
-      # `it { should validate_uniqueness_of(:data).scoped_to(:type) }` tries to use a NULL type, which isn't allowed, so
+      # `it { is_expected.to validate_uniqueness_of(:data).scoped_to(:type) }` tries to use a NULL type, which isn't allowed, so
       # have to perform validation check manually
       context 'validates uniqueness of #data scoped to #type' do
         subject(:data_errors) do
@@ -89,7 +87,7 @@ describe Metasploit::Credential::Private do
               existent_private.type
             end
 
-            it { should include(error) }
+            it { is_expected.to include(error) }
           end
 
           context 'without same #type' do

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

@@ -1,17 +1,15 @@
-require 'spec_helper'
-
-describe Metasploit::Credential::Public do
+RSpec.describe Metasploit::Credential::Public, 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 { is_expected.to have_db_column(:username).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
 
@@ -21,14 +19,14 @@ describe Metasploit::Credential::Public do
         FactoryGirl.build(:metasploit_credential_public)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     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
 
   context 'search' do

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

@@ -1,18 +1,16 @@
-require 'spec_helper'
-
-describe Metasploit::Credential::Realm do
+RSpec.describe Metasploit::Credential::Realm, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'database' do
     context 'columns' do
-      it { should have_db_column(:key).of_type(:string).with_options(null: false) }
-      it { should have_db_column(:value).of_type(:string).with_options(null: false) }
+      it { is_expected.to have_db_column(:key).of_type(:string).with_options(null: false) }
+      it { is_expected.to have_db_column(:value).of_type(:string).with_options(null: false) }
 
       it_should_behave_like 'timestamp database columns'
     end
 
     context 'indices' do
-      it { should have_db_index([:key, :value]).unique(true) }
+      it { is_expected.to have_db_index([:key, :value]).unique(true) }
     end
   end
 
@@ -22,7 +20,7 @@ describe Metasploit::Credential::Realm do
         FactoryGirl.build(:metasploit_credential_active_directory_domain)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
 
       context '#key' do
         subject(:key) {
@@ -40,7 +38,7 @@ describe Metasploit::Credential::Realm do
         FactoryGirl.build(:metasploit_credential_oracle_system_identifier)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
 
       context '#key' do
         subject(:key) {
@@ -58,7 +56,7 @@ describe Metasploit::Credential::Realm do
         FactoryGirl.build(:metasploit_credential_postgresql_database)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
 
       context '#key' do
         subject(:key) {
@@ -76,13 +74,13 @@ describe Metasploit::Credential::Realm do
         FactoryGirl.build(:metasploit_credential_realm)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
   end
 
   context 'mass assignment security' do
-    it { should allow_mass_assignment_of(:key) }
-    it { should allow_mass_assignment_of(:value) }
+    it { is_expected.to allow_mass_assignment_of(:key) }
+    it { is_expected.to allow_mass_assignment_of(:value) }
   end
 
 
@@ -106,12 +104,12 @@ describe Metasploit::Credential::Realm do
 
   context 'validations' do
     context 'on #key' do
-      it { should ensure_inclusion_of(:key).in_array(Metasploit::Model::Realm::Key::ALL) }
-      it { should validate_presence_of :key }
+      it { is_expected.to ensure_inclusion_of(:key).in_array(Metasploit::Model::Realm::Key::ALL) }
+      it { is_expected.to validate_presence_of :key }
     end
 
     context 'on #value' do
-      it { should validate_presence_of :value }
+      it { is_expected.to validate_presence_of :value }
 
       # key cannot be NULL so `validate_uniqueness_of(:value).scoped_to(:key)` does not work because it tries a NULL
       # key
@@ -164,7 +162,7 @@ describe Metasploit::Credential::Realm do
               existent_realm.value
             end
 
-            it { should include(error) }
+            it { is_expected.to include(error) }
           end
 
           context 'without same #value' do

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

@@ -1,9 +1,7 @@
-require 'spec_helper'
-
-describe Metasploit::Credential::ReplayableHash do
+RSpec.describe Metasploit::Credential::ReplayableHash, 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_replayable_hash' do
@@ -11,7 +9,7 @@ describe Metasploit::Credential::ReplayableHash do
         FactoryGirl.build(:metasploit_credential_replayable_hash)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
   end
 end

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

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Credential::SSHKey do
+RSpec.describe Metasploit::Credential::SSHKey, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   #
@@ -18,7 +16,7 @@ describe Metasploit::Credential::SSHKey do
         FactoryGirl.build(:metasploit_credential_dsa_key)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
 
       it 'has DSA key type' do
         expect(metasploit_credential_dsa_key.data).to match(/-----BEGIN DSA PRIVATE KEY-----/)
@@ -31,7 +29,7 @@ describe Metasploit::Credential::SSHKey do
         FactoryGirl.build(:metasploit_credential_rsa_key)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
 
       it 'has RSA key type' do
         expect(metasploit_credential_rsa_key.data).to match(/-----BEGIN RSA PRIVATE KEY-----/)
@@ -44,12 +42,12 @@ describe Metasploit::Credential::SSHKey do
         FactoryGirl.build(:metasploit_credential_ssh_key)
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
   end
 
   context 'validations' do
-    it { should validate_presence_of :data }
+    it { is_expected.to validate_presence_of :data }
 
     context 'on #data' do
       subject(:data_errors) do
@@ -92,7 +90,7 @@ describe Metasploit::Credential::SSHKey do
             false
           end
 
-          it { should include(error) }
+          it { is_expected.to include(error) }
         end
       end
 
@@ -156,7 +154,7 @@ describe Metasploit::Credential::SSHKey do
               ssh_key.valid?
             end
 
-            it { should be_empty }
+            it { is_expected.to be_empty }
           end
         end
 
@@ -175,7 +173,7 @@ describe Metasploit::Credential::SSHKey do
             ssh_key.valid?
           end
 
-          it { should include(error) }
+          it { is_expected.to include(error) }
         end
       end
 
@@ -203,7 +201,7 @@ describe Metasploit::Credential::SSHKey do
             true
           end
 
-          it { should include(error) }
+          it { is_expected.to include(error) }
         end
 
         context 'without #encrypted' do
@@ -255,7 +253,7 @@ describe Metasploit::Credential::SSHKey do
               cipher.random_key
             end
 
-            it { should be_encrypted }
+            it { is_expected.to be_encrypted }
           end
 
           context 'without encrypted' do
@@ -333,7 +331,7 @@ describe Metasploit::Credential::SSHKey do
               unencrypted_key.to_pem
             end
 
-            it { should be_a OpenSSL::PKey.const_get(key_type) }
+            it { is_expected.to be_a OpenSSL::PKey.const_get(key_type) }
           end
         end
       end
@@ -359,7 +357,7 @@ describe Metasploit::Credential::SSHKey do
         nil
       end
 
-      it { should be_nil }
+      it { is_expected.to be_nil }
     end
 
     context 'with DSA key' do
@@ -367,7 +365,7 @@ describe Metasploit::Credential::SSHKey do
         FactoryGirl.build(:metasploit_credential_dsa_key)
       end
 
-      it { should be_a OpenSSL::PKey::DSA }
+      it { is_expected.to be_a OpenSSL::PKey::DSA }
     end
 
     context 'with RSA key' do
@@ -375,7 +373,7 @@ describe Metasploit::Credential::SSHKey do
         FactoryGirl.build(:metasploit_credential_rsa_key)
       end
 
-      it { should be_a OpenSSL::PKey::RSA }
+      it { is_expected.to be_a OpenSSL::PKey::RSA }
     end
 
     context 'with nil' do
@@ -419,7 +417,7 @@ describe Metasploit::Credential::SSHKey do
               private_key
             end
 
-            it { should be_private }
+            it { is_expected.to be_private }
           end
         end
       end