metasploit-model 1.0.0.pre.rails.pre.4.0 → 1.0.0

data/spec/lib/metasploit/model/visitation/visit_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Visitation::Visit do
+RSpec.describe Metasploit::Model::Visitation::Visit do
   let(:base_class) do
     described_class = self.described_class
 
@@ -54,15 +52,15 @@ describe Metasploit::Model::Visitation::Visit do
         end
 
         it 'should return Array(Metasploit::Model::Visitation::Visitor)' do
-          visit.should be_an Array
-          visit.length.should == 1
-          visit.first.should be_a Metasploit::Model::Visitation::Visitor
+          expect(visit).to be_an Array
+          expect(visit.length).to eq(1)
+          expect(visit.first).to be_a Metasploit::Model::Visitation::Visitor
         end
 
         it 'should add Metasploit::Model::Visitation::Visitor to visitor_by_module_name' do
           visitor = visit.first
 
-          base_class.visitor_by_module_name[mod.name].should == visitor
+          expect(base_class.visitor_by_module_name[mod.name]).to eq(visitor)
         end
       end
 
@@ -88,18 +86,22 @@ describe Metasploit::Model::Visitation::Visit do
         end
 
         it 'should return Array<Metasploit::Model::Visitation::Visitor>' do
-          visit.should be_an Array
-          visit.length.should == module_names.length
-
-          visit.all? { |visitor|
-            visitor.is_a? Metasploit::Model::Visitation::Visitor
-          }.should be_true
+          expect(visit).to be_an Array
+          expect(visit.length).to eq(module_names.length)
+
+          expect(
+              visit.all? { |visitor|
+                visitor.is_a? Metasploit::Model::Visitation::Visitor
+              }
+          ).to eq(true)
         end
 
         it 'should each Metasploit::Model::Visitation::Visitor to visitor_by_module_name' do
-          module_names.all? { |module_name|
-            visit.include? base_class.visitor_by_module_name[module_name]
-          }.should be_true
+          expect(
+              module_names.all? { |module_name|
+                visit.include? base_class.visitor_by_module_name[module_name]
+              }
+          ).to eq(true)
         end
       end
     end
@@ -158,7 +160,7 @@ describe Metasploit::Model::Visitation::Visit do
       end
 
       it 'should return visitor from visitor_by_module' do
-        visitor.should == klass_visitor
+        expect(visitor).to eq(klass_visitor)
       end
     end
 
@@ -187,13 +189,13 @@ describe Metasploit::Model::Visitation::Visit do
         end
 
         it 'should return ancestor visitor' do
-          visitor.should == ancestor_visitor
+          expect(visitor).to eq(ancestor_visitor)
         end
 
         it 'should cache ancestor visitor as visitor for klass in visitor_by_module' do
           visitor
 
-          base_class.visitor_by_module[klass].should == ancestor_visitor
+          expect(base_class.visitor_by_module[klass]).to eq(ancestor_visitor)
         end
       end
 
@@ -203,13 +205,13 @@ describe Metasploit::Model::Visitation::Visit do
         end
 
         it 'should return ancestor visitor' do
-          visitor.should == ancestor_visitor
+          expect(visitor).to eq(ancestor_visitor)
         end
 
         it 'should cache ancestor visitor as visitor for klass in visitor_by_module' do
           visitor
 
-          base_class.visitor_by_module[klass].should == ancestor_visitor
+          expect(base_class.visitor_by_module[klass]).to eq(ancestor_visitor)
         end
       end
 
@@ -229,7 +231,7 @@ describe Metasploit::Model::Visitation::Visit do
     end
 
     it 'should default to empty Hash' do
-      visitor_by_module.should == {}
+      expect(visitor_by_module).to eq({})
     end
   end
 
@@ -239,7 +241,7 @@ describe Metasploit::Model::Visitation::Visit do
     end
 
     it 'should default to empty Hash' do
-      visitor_by_module_name.should == {}
+      expect(visitor_by_module_name).to eq({})
     end
   end
 
@@ -274,13 +276,13 @@ describe Metasploit::Model::Visitation::Visit do
     end
 
     it 'should find visitor for node.class' do
-      base_class.should_receive(:visitor).with(node.class).and_call_original
+      expect(base_class).to receive(:visitor).with(node.class).and_call_original
 
       visit
     end
 
     it 'should visit on visitor' do
-      @visitor.should_receive(:visit).with(base_instance, node)
+      expect(@visitor).to receive(:visit).with(base_instance, node)
 
       visit
     end
@@ -309,7 +311,7 @@ describe Metasploit::Model::Visitation::Visit do
       end
 
       it "should be able to call visit from inside a visitor's block" do
-        visit.should == leaf_node
+        expect(visit).to eq(leaf_node)
       end
     end
   end

data/spec/lib/metasploit/model_spec.rb

@@ -0,0 +1,4 @@
+RSpec.describe Metasploit::Model do
+  it_should_behave_like 'Metasploit::Version GEM_VERSION constant'
+  it_should_behave_like 'Metasploit::Version VERSION constant'
+end

data/spec/matchers/validate_nilness_of_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe 'validate_nilness_of' do
   let(:record) {
     record_class.new

data/spec/spec_helper.rb

@@ -14,22 +14,95 @@ SimpleCov.formatter = Coveralls::SimpleCov::Formatter
 
 require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 require 'rspec/rails'
-require 'rspec/autorun'
 
-# full backtrace in logs so its easier to trace errors
-Rails.backtrace_cleaner.remove_silencers!
+# 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
 
-spec_pathname = Metasploit::Model::Engine.root.join('spec')
+roots = [
+    Metasploit::Model::Engine.root.to_path,
+    gem_specification.gem_dir
+]
 
-Dir[spec_pathname.join('support', '**', '*.rb')].each do |f|
-  require f
+roots.each do |root|
+  Dir[File.join(root, 'spec', 'support', '**', '*.rb')].each do |f|
+    require f
+  end
 end
 
+# 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!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # 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
+
+  # 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
+
+  # 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
+
   config.before(:suite) do
     # this must be explicitly set here because it should always be spec/tmp for w/e project is using
     # Metasploit::Model::Spec to handle file system clean up.
-    Metasploit::Model::Spec.temporary_pathname = spec_pathname.join('tmp')
+    Metasploit::Model::Spec.temporary_pathname = Metasploit::Model::Engine.root.join('spec', 'tmp')
     # Clean up any left over files from a previously aborted suite
     Metasploit::Model::Spec.remove_temporary_pathname
 
@@ -40,7 +113,4 @@ RSpec.configure do |config|
   config.after(:each) do
     Metasploit::Model::Spec.remove_temporary_pathname
   end
-
-  config.mock_with :rspec
-  config.order = :random
 end

data/spec/support/shared/contexts/metasploit/model/search/operator/union/children.rb

@@ -1,4 +1,4 @@
-shared_context 'Metasploit::Model::Search::Operator::Group::Union#children' do
+RSpec.shared_context 'Metasploit::Model::Search::Operator::Group::Union#children' do
   subject(:children) do
     operator.children(formatted_value)
   end

data/spec/support/shared/examples/metasploit/model/search/operation/value/integer.rb

@@ -1,4 +1,4 @@
-shared_examples_for 'Metasploit::Model::Search::Operation::Value::Integer' do
+RSpec.shared_examples_for 'Metasploit::Model::Search::Operation::Value::Integer' do
   let(:operation_class) do
     described_class
   end
@@ -8,7 +8,7 @@ shared_examples_for 'Metasploit::Model::Search::Operation::Value::Integer' do
       operation_class
     end
 
-    it { should include Metasploit::Model::Search::Operation::Value::Integer }
+    it { is_expected.to include Metasploit::Model::Search::Operation::Value::Integer }
   end
 
   context '#value' do
@@ -26,7 +26,7 @@ shared_examples_for 'Metasploit::Model::Search::Operation::Value::Integer' do
       end
 
       it 'should pass through Integer' do
-        value.should == formatted_value
+        expect(value).to eq(formatted_value)
       end
     end
 
@@ -40,7 +40,7 @@ shared_examples_for 'Metasploit::Model::Search::Operation::Value::Integer' do
       end
 
       it 'should convert String to Integer' do
-        value.should == integer
+        expect(value).to eq(integer)
       end
     end
 
@@ -54,11 +54,11 @@ shared_examples_for 'Metasploit::Model::Search::Operation::Value::Integer' do
       end
 
       it 'should not extract the number' do
-        value.should_not == integer
+        expect(value).not_to eq(integer)
       end
 
       it 'should pass through the full value' do
-        value.should == formatted_value
+        expect(value).to eq(formatted_value)
       end
     end
 
@@ -68,11 +68,11 @@ shared_examples_for 'Metasploit::Model::Search::Operation::Value::Integer' do
       end
 
       it 'should not truncate Float to Integer' do
-        value.should_not == formatted_value.to_i
+        expect(value).not_to eq(formatted_value.to_i)
       end
 
       it 'should pass through Float' do
-        value.should == formatted_value
+        expect(value).to eq(formatted_value)
       end
     end
   end

data/spec/support/shared/examples/metasploit/model/search/operation/value/string.rb

@@ -1,4 +1,4 @@
-shared_examples_for 'Metasploit::Model::Search::Operation::Value::String' do
+RSpec.shared_examples_for 'Metasploit::Model::Search::Operation::Value::String' do
   let(:operation_class) do
     described_class
   end
@@ -8,7 +8,7 @@ shared_examples_for 'Metasploit::Model::Search::Operation::Value::String' do
       operation_class
     end
 
-    it { should include Metasploit::Model::Search::Operation::Value::String }
+    it { is_expected.to include Metasploit::Model::Search::Operation::Value::String }
   end
 
   context '#value' do
@@ -26,7 +26,7 @@ shared_examples_for 'Metasploit::Model::Search::Operation::Value::String' do
       end
 
       it 'should convert to String' do
-        value.should == '5'
+        expect(value).to eq('5')
       end
     end
 
@@ -36,7 +36,7 @@ shared_examples_for 'Metasploit::Model::Search::Operation::Value::String' do
       end
 
       it 'should pass through String' do
-        value.should == formatted_value
+        expect(value).to eq(formatted_value)
       end
     end
 
@@ -46,7 +46,7 @@ shared_examples_for 'Metasploit::Model::Search::Operation::Value::String' do
       end
 
       it 'should convert to String' do
-        value.should == 'a_symbol'
+        expect(value).to eq('a_symbol')
       end
     end
   end

data/spec/support/shared/examples/metasploit/model/search/operator/help.rb

@@ -1,4 +1,4 @@
-shared_examples_for 'Metasploit::Model::Search::Operator::Help' do
+RSpec.shared_examples_for 'Metasploit::Model::Search::Operator::Help' do
   context '#help' do
     subject(:help) do
       operator.help
@@ -24,7 +24,7 @@ shared_examples_for 'Metasploit::Model::Search::Operator::Help' do
       # klass needs to be named or model_name will fail.
       stub_const('Klass', klass)
       # since missing translations raise exceptions, and there is no translation for klass, have to stub out.
-      klass.model_name.stub(:human).and_return(model)
+      allow(klass.model_name).to receive(:human).and_return(model)
 
       backend = I18n.backend
 
@@ -59,31 +59,31 @@ shared_examples_for 'Metasploit::Model::Search::Operator::Help' do
     end
 
     it 'should use #klass #i18n_scope to lookup translations specific to the #klass or one of its ancestors' do
-      klass.should_receive(:i18n_scope).and_call_original
+      expect(klass).to receive(:i18n_scope).and_call_original
 
       help
     end
 
     it 'should lookup ancestors of #klass to find translations specific to #klass or its ancestors' do
-      klass.should_receive(:lookup_ancestors).and_call_original
+      expect(klass).to receive(:lookup_ancestors).and_call_original
 
       help
     end
 
     it 'should use #class #i18n_scope to lookup translations specific to the operator class or one of its ancestors' do
-      operator.class.should_receive(:i18n_scope)
+      expect(operator.class).to receive(:i18n_scope)
 
       help
     end
 
     it 'should lookup ancestors of the operator class to find translations specific to the operator class or one of its ancestors' do
-      operator.class.should_receive(:lookup_ancestors).and_return([])
+      expect(operator.class).to receive(:lookup_ancestors).and_return([])
 
       help
     end
 
     it "should pass #klass translation key for operator with the given name as the primary translation key" do
-      I18n.should_receive(:translate).with(
+      expect(I18n).to receive(:translate).with(
           :"#{klass.i18n_scope}.ancestors.#{klass.model_name.i18n_key}.search.operator.names.#{name}.help",
           anything
       )
@@ -92,23 +92,25 @@ shared_examples_for 'Metasploit::Model::Search::Operator::Help' do
     end
 
     it 'should pass other translation keys as default option' do
-      I18n.should_receive(:translate) do |_key, options|
-        options.should be_a Hash
+      expect(I18n).to receive(:translate) do |_key, options|
+        expect(options).to be_a Hash
 
         default = options[:default]
 
-        default.should be_an Array
+        expect(default).to be_an Array
 
-        default.all? { |key|
-          key.is_a? Symbol
-        }.should be_true
+        expect(
+            default.all? { |key|
+              key.is_a? Symbol
+            }
+        ).to eq(true)
       end
 
       help
     end
 
     it 'should pass #name of operator as name option' do
-      I18n.should_receive(:translate).with(
+      expect(I18n).to receive(:translate).with(
           anything,
           hash_including(name: name)
       )
@@ -117,7 +119,7 @@ shared_examples_for 'Metasploit::Model::Search::Operator::Help' do
     end
 
     it 'should pass the human model name of #klass as model option' do
-      I18n.should_receive(:translate).with(
+      expect(I18n).to receive(:translate).with(
           anything,
           hash_including(model: klass.model_name.human)
       )
@@ -126,7 +128,7 @@ shared_examples_for 'Metasploit::Model::Search::Operator::Help' do
     end
 
     it 'should be translated correctly' do
-      help.should == help_template % { model: model, name: name }
+      expect(help).to eq(help_template % { model: model, name: name })
     end
   end
 end