metasploit-credential 0.14.7 → 0.14.8

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

@@ -1,28 +1,30 @@
-RSpec.describe Metasploit::Credential::Username, type: :model do
+require 'spec_helper'
+
+describe Metasploit::Credential::Username do
   it_should_behave_like 'Metasploit::Concern.run'
 
   context 'database' do
     context 'columns' do
       it_should_behave_like 'timestamp database columns'
 
-      it { is_expected.to have_db_column(:username).of_type(:string).with_options(null: false) }
+      it { should have_db_column(:username).of_type(:string).with_options(null: false) }
     end
 
     context 'indices' do
-      it { is_expected.to have_db_index(:username).unique(true) }
+      it { should 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 { is_expected.to allow_mass_assignment_of(:username) }
+    it { should allow_mass_assignment_of(:username) }
   end
 
   context 'validations' do
     context 'username' do
-      it { is_expected.to validate_presence_of :username }
-      it { is_expected.to validate_uniqueness_of :username }
+      it { should validate_presence_of :username }
+      it { should validate_uniqueness_of :username }
     end
   end
 

data/spec/models/metasploit_data_models/search/visitor/relation_spec.rb

@@ -1,4 +1,6 @@
-RSpec.describe MetasploitDataModels::Search::Visitor::Relation, type: :model do
+require 'spec_helper'
+
+describe MetasploitDataModels::Search::Visitor::Relation do
   subject(:visitor) {
     described_class.new(
         query: query

data/spec/spec_helper.rb

@@ -26,114 +26,44 @@ require 'rspec/rails'
 # in spec/support/ and its subdirectories from this gem and metasploit-concern
 #
 
-
-# Use find_all_by_name instead of find_by_name as find_all_by_name will return pre-release versions
-gem_specification = Gem::Specification.find_all_by_name('metasploit-version').first
-
-roots = [
-    gem_specification.gem_dir,
-    Metasploit::Concern.root,
-    Metasploit::Credential::Engine.root,
-    Metasploit::Model::Engine.root,
-    MetasploitDataModels::Engine.root
+rooteds = [
+    Metasploit::Concern,
+    Metasploit::Credential::Engine,
+    Metasploit::Model::Engine,
+    MetasploitDataModels::Engine
 ]
 
-roots.each do |root|
-  Dir[File.join(root, 'spec', 'support', '**', '*.rb')].each do |f|
+rooteds.each do |rooted|
+  Dir[rooted.root.join('spec', 'support', '**', '*.rb')].each do |f|
     require f
   end
 end
 
-
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause
-# this file to always be loaded, without a need to explicitly require it in any
-# files.
-#
-# Given that it is always loaded, you are encouraged to keep this file as
-# light-weight as possible. Requiring heavyweight dependencies from this file
-# will add to the boot time of your test suite on EVERY test run, even for an
-# individual file that may not need all of that loaded. Instead, consider making
-# a separate helper file that requires the additional dependencies and performs
-# the additional setup, and require it from the spec files that actually need
-# it.
-#
-# The `.rspec` file also contains a few flags that are not defaults but that
-# users commonly want.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
-  config.expect_with :rspec do |expectations|
-    # This option will default to `true` in RSpec 4. It makes the `description`
-    # and `failure_message` of custom matchers include text for helper methods
-    # defined using `chain`, e.g.:
-    #     be_bigger_than(2).and_smaller_than(4).description
-    #     # => "be bigger than 2 and smaller than 4"
-    # ...rather than:
-    #     # => "be bigger than 2"
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  end
-
-  # rspec-mocks config goes here. You can use an alternate test double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
-  config.mock_with :rspec do |mocks|
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended, and will default to
-    # `true` in RSpec 4.
-    mocks.verify_partial_doubles = true
-  end
-
-  # These two settings work together to allow you to limit a spec run
-  # to individual examples or groups you care about by tagging them with
-  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
-  # get run.
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
-
-  # Limits the available syntax to the non-monkey patched syntax that is
-  # recommended. For more details, see:
-  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
-  config.disable_monkey_patching!
+  # ## Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
 
-  # This setting enables warnings. It's recommended, but in some cases may
-  # be too noisy due to issues in dependencies.
-  config.warnings = true
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
 
-  # Many RSpec users commonly either run the entire suite or an individual
-  # file, and it's useful to allow more verbose output when running an
-  # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    config.default_formatter = 'doc'
-  end
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
 
-  # Print the 10 slowest examples and example groups at the
-  # end of the spec run, to help surface which specs are running
-  # particularly slow.
-  config.profile_examples = 10
+  # If true, the base class of anonymous controllers will be inferred
+  # automatically. This will be the default behavior in future versions of
+  # rspec-rails.
+  config.infer_base_class_for_anonymous_controllers = false
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = :random
-
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # Setting this allows you to use `--seed` to deterministically reproduce
-  # test failures related to randomization by passing the same `--seed` value
-  # as the one that triggered the failure.
-  Kernel.srand config.seed
-
-  # If you're not using ActiveRecord, or you'd prefer not to run each of your
-  # examples within a transaction, remove the following line or assign false
-  # instead of true.
-  config.use_transactional_fixtures = true
+  config.order = "random"
 end

data/spec/support/shared/contexts/mdm/workspace.rb

@@ -1,6 +1,6 @@
 shared_context 'Mdm::Workspace' do
   before(:each) do
     # TODO remove Rex usage from Mdm as it is not a declared dependency
-    allow_any_instance_of(Mdm::Workspace).to receive(:valid_ip_or_range?).and_return(true)
+    Mdm::Workspace.any_instance.stub(:valid_ip_or_range?).and_return(true)
   end
 end

data/spec/support/shared/examples/core_validations.rb

@@ -51,6 +51,18 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
     # lets
     #
 
+    let(:first_private) {
+      FactoryGirl.create(:metasploit_credential_private)
+    }
+
+    let(:first_public) {
+      FactoryGirl.create(:metasploit_credential_username)
+    }
+
+    let(:first_realm) {
+      FactoryGirl.create(:metasploit_credential_realm)
+    }
+
     let(:first_workspace) {
       FactoryGirl.create(:mdm_workspace)
     }
@@ -84,10 +96,27 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
       }
     }
 
+
     let(:second_metasploit_credential_core) {
       FactoryGirl.build( factory_name, second_factory_options)
     }
 
+    let(:second_private) {
+      FactoryGirl.create(:metasploit_credential_private)
+    }
+
+    let(:second_public) {
+      FactoryGirl.create(:metasploit_credential_username)
+    }
+
+    let(:second_realm) {
+      FactoryGirl.create(:metasploit_credential_realm)
+    }
+
+    let(:second_workspace) {
+      FactoryGirl.create(:mdm_workspace)
+    }
+
     #
     # let!s
     #
@@ -100,26 +129,6 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
   context 'database' do
     context 'indices' do
       context 'foreign keys' do
-        let(:first_private) {
-          FactoryGirl.create(:metasploit_credential_private)
-        }
-
-        let(:second_public) {
-          FactoryGirl.create(:metasploit_credential_username)
-        }
-
-        let(:second_private) {
-          FactoryGirl.create(:metasploit_credential_private)
-        }
-
-        let(:second_realm) {
-          FactoryGirl.create(:metasploit_credential_realm)
-        }
-
-        let(:second_workspace) {
-          FactoryGirl.create(:mdm_workspace)
-        }
-
         shared_examples_for 'potential collision' do |options={}|
           options.assert_valid_keys(:collision, :index)
 
@@ -189,10 +198,6 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
             nil
           }
 
-          let(:first_public) {
-            FactoryGirl.create(:metasploit_credential_username)
-          }
-
           let(:first_realm) {
             nil
           }
@@ -219,10 +224,6 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
 
           options.assert_valid_keys(:collision, :private, :public, :workspace)
 
-          let(:first_public) {
-            FactoryGirl.create(:metasploit_credential_username)
-          }
-
           let(:first_realm) {
             nil
           }
@@ -251,10 +252,6 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
             nil
           }
 
-          let(:first_realm) {
-            FactoryGirl.create(:metasploit_credential_realm)
-          }
-
           let(:second_public) {
             nil
           }
@@ -279,14 +276,6 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
             nil
           }
 
-          let(:first_public) {
-            FactoryGirl.create(:metasploit_credential_username)
-          }
-
-          let(:first_realm) {
-            FactoryGirl.create(:metasploit_credential_realm)
-          }
-
           let(:second_private) {
             nil
           }
@@ -307,14 +296,6 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
 
           options.assert_valid_keys(:collision, :private, :public, :realm, :workspace)
 
-          let(:first_public) {
-            FactoryGirl.create(:metasploit_credential_username)
-          }
-
-          let(:first_realm) {
-            FactoryGirl.create(:metasploit_credential_realm)
-          }
-
           context_with_correlation(options, :workspace) do
             context_with_correlation(options, :realm) do
               context_with_correlation(options, :public) do
@@ -585,29 +566,9 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
     end
 
     context 'validations' do
-      it { is_expected.to validate_presence_of :workspace }
+      it { should validate_presence_of :workspace }
 
       context 'of uniqueness' do
-        let(:first_private) {
-          FactoryGirl.create(:metasploit_credential_private)
-        }
-
-        let(:second_public) {
-          FactoryGirl.create(:metasploit_credential_username)
-        }
-
-        let(:second_private) {
-          FactoryGirl.create(:metasploit_credential_private)
-        }
-
-        let(:second_realm) {
-          FactoryGirl.create(:metasploit_credential_realm)
-        }
-
-        let(:second_workspace) {
-          FactoryGirl.create(:mdm_workspace)
-        }
-
         shared_examples_for 'potential collision' do |options={}|
           options.assert_valid_keys(:attribute, :collision, :message)
 
@@ -629,7 +590,7 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
               ).to include options.fetch(:message)
             end
           else
-            it { is_expected.to be_valid }
+            it { should be_valid }
           end
         end
 
@@ -681,10 +642,6 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
             nil
           }
 
-          let(:first_public) {
-            FactoryGirl.create(:metasploit_credential_username)
-          }
-
           let(:first_realm) {
             nil
           }
@@ -716,10 +673,6 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
             nil
           }
 
-          let(:first_public) {
-            FactoryGirl.create(:metasploit_credential_username)
-          }
-
           let(:second_realm) {
             nil
           }
@@ -745,10 +698,6 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
             nil
           }
 
-          let(:first_realm) {
-            FactoryGirl.create(:metasploit_credential_realm)
-          }
-
           let(:second_public) {
             nil
           }
@@ -774,14 +723,6 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
             nil
           }
 
-          let(:first_public) {
-            FactoryGirl.create(:metasploit_credential_username)
-          }
-
-          let(:first_realm) {
-            FactoryGirl.create(:metasploit_credential_realm)
-          }
-
           let(:second_private) {
             nil
           }
@@ -803,14 +744,6 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
 
           options.assert_valid_keys(:collision, :private, :public, :realm, :workspace)
 
-          let(:first_public) {
-            FactoryGirl.create(:metasploit_credential_username)
-          }
-
-          let(:first_realm) {
-            FactoryGirl.create(:metasploit_credential_realm)
-          }
-
           context_with_correlation(options, :workspace) do
             context_with_correlation(options, :realm) do
               context_with_correlation(options, :public) do
@@ -1094,14 +1027,6 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
             second_metasploit_credential_core
           }
 
-          let(:first_public) {
-            FactoryGirl.create(:metasploit_credential_username)
-          }
-
-          let(:first_realm) {
-            FactoryGirl.create(:metasploit_credential_realm)
-          }
-
           let(:second_private) {
             first_private
           }
@@ -1128,7 +1053,7 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
                 nil
               }
 
-              it { is_expected.to be_valid }
+              it { should be_valid }
             end
 
             context 'with same workspace without realm with same public without private' do
@@ -1140,7 +1065,7 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
                 nil
               }
 
-              it { is_expected.to be_valid }
+              it { should be_valid }
             end
 
             context 'with same workspace with same realm without public with same private' do
@@ -1148,7 +1073,7 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
                 nil
               }
 
-              it { is_expected.to be_valid }
+              it { should be_valid }
             end
 
             context 'with same workspace with same realm with same public without private' do
@@ -1160,7 +1085,7 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
                 nil
               }
 
-              it { is_expected.to be_valid }
+              it { should be_valid }
             end
           end
 
@@ -1182,7 +1107,7 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
                 nil
               }
 
-              it { is_expected.to be_valid }
+              it { should be_valid }
             end
 
             context 'with same workspace without realm with public with same private' do
@@ -1190,7 +1115,7 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
                 FactoryGirl.create(:metasploit_credential_public)
               }
 
-              it { is_expected.to be_valid }
+              it { should be_valid }
             end
 
             context 'with same workspace with realm without public with same private' do
@@ -1198,7 +1123,7 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
                 FactoryGirl.create(:metasploit_credential_realm)
               }
 
-              it { is_expected.to be_valid }
+              it { should be_valid }
             end
           end
 
@@ -1216,7 +1141,7 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
                 FactoryGirl.create(:metasploit_credential_private)
               }
 
-              it { is_expected.to be_valid }
+              it { should be_valid }
             end
 
             context 'with workspace with realm without public with private' do
@@ -1228,7 +1153,7 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
                 FactoryGirl.create(:metasploit_credential_realm)
               }
 
-              it { is_expected.to be_valid}
+              it { should be_valid}
             end
           end
 
@@ -1246,7 +1171,7 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
                 FactoryGirl.create(:metasploit_credential_realm)
               }
 
-              it { is_expected.to be_valid }
+              it { should be_valid }
             end
           end
 
@@ -1264,7 +1189,7 @@ shared_examples_for 'Metasploit::Credential::CoreValidations' do
                 FactoryGirl.create(:metasploit_credential_public)
               }
 
-              it { is_expected.to be_valid }
+              it { should be_valid }
             end
           end
         end