metasploit_data_models 0.24.0 → 0.24.1.pre.rspec.pre.3.pre.1

data/spec/dummy/db/structure.sql

@@ -3,6 +3,7 @@
 --
 
 SET statement_timeout = 0;
+SET lock_timeout = 0;
 SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SET check_function_bodies = false;

data/spec/lib/base64_serializer_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe MetasploitDataModels::Base64Serializer do
+RSpec.describe MetasploitDataModels::Base64Serializer do
   let(:base64_marshaled) do
     marshaled = Marshal.dump(unserialized)
 
@@ -30,7 +30,7 @@ describe MetasploitDataModels::Base64Serializer do
 
   context 'CONSTANTS' do
     it 'should define DEFAULT' do
-      described_class::DEFAULT.should == default
+      expect(described_class::DEFAULT).to eq(default)
     end
 
     context 'LOADERS' do
@@ -38,36 +38,36 @@ describe MetasploitDataModels::Base64Serializer do
         first = described_class::LOADERS[0]
         deserialized = first.call(base64_marshaled)
 
-        deserialized.should == unserialized
+        expect(deserialized).to eq(unserialized)
       end
 
       it 'should fallback to the old YAML format second' do
         second = described_class::LOADERS[1]
         deserialized = second.call(yaml)
 
-        deserialized.should == unserialized
+        expect(deserialized).to eq(unserialized)
       end
 
       it 'should finally give up and just return the value' do
         last = described_class::LOADERS.last
         deserialized = last.call(unserialized)
 
-        deserialized.should == unserialized
+        expect(deserialized).to eq(unserialized)
       end
     end
   end
 
   context '#default' do
     it 'should default to {}' do
-      base64_serializer.default.should == {}
+      expect(base64_serializer.default).to eq({})
     end
 
     it 'should return a duplicate' do
       duplicate = base64_serializer.default
-      value = mock('Value')
+      value = double('Value')
       duplicate[:key] = value
 
-      duplicate.should_not == base64_serializer.default
+      expect(duplicate).not_to eq(base64_serializer.default)
     end
   end
 
@@ -75,7 +75,7 @@ describe MetasploitDataModels::Base64Serializer do
     it 'should output Base64 encoded marshaled data' do
       dumped = base64_serializer.dump(unserialized)
 
-      dumped.should == base64_marshaled
+      expect(dumped).to eq(base64_marshaled)
     end
   end
 
@@ -105,21 +105,21 @@ describe MetasploitDataModels::Base64Serializer do
       end
 
       it 'should have :default in attributes' do
-        attributes.should have_key(:default)
+        expect(attributes).to have_key(:default)
       end
 
       it 'should set default to :default value' do
-        base64_serializer.default.should == attributes[:default]
+        expect(base64_serializer.default).to eq(attributes[:default])
       end
     end
 
     context 'without :default' do
       it 'should not have :default in attributes' do
-        attributes.should_not have_key(:default)
+        expect(attributes).not_to have_key(:default)
       end
 
       it 'should default #default to DEFAULT' do
-        base64_serializer.default.should == default
+        expect(base64_serializer.default).to eq(default)
       end
     end
   end
@@ -131,11 +131,11 @@ describe MetasploitDataModels::Base64Serializer do
       end
 
       it 'should return #default' do
-        default = mock('Default')
-        base64_serializer.stub(:default => default)
+        default = double('Default')
+        allow(base64_serializer).to receive(:default).and_return(default)
         deserialized = base64_serializer.load(serialized)
 
-        deserialized.should == default
+        expect(deserialized).to eq(default)
       end
     end
 
@@ -143,7 +143,7 @@ describe MetasploitDataModels::Base64Serializer do
       it 'should return unserialized' do
         deserialized = base64_serializer.load(base64_marshaled)
 
-        deserialized.should == unserialized
+        expect(deserialized).to eq(unserialized)
       end
 
     end
@@ -152,7 +152,7 @@ describe MetasploitDataModels::Base64Serializer do
       it 'should return unserialized' do
         deserialized = base64_serializer.load(yaml)
 
-        deserialized.should == unserialized
+        expect(deserialized).to eq(unserialized)
       end
     end
 
@@ -165,7 +165,7 @@ describe MetasploitDataModels::Base64Serializer do
         it 'should return raw value' do
           deserialized = base64_serializer.load(raw_value)
 
-          deserialized.should == raw_value
+          expect(deserialized).to eq(raw_value)
         end
       end
     end

data/spec/lib/metasploit_data_models/ip_address/cidr_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe MetasploitDataModels::IPAddress::CIDR do
+RSpec.describe MetasploitDataModels::IPAddress::CIDR do
   subject(:including_class_instance) {
     including_class.new(
         value: formatted_value
@@ -80,7 +78,7 @@ describe MetasploitDataModels::IPAddress::CIDR do
         described_class::SEPARATOR
       }
 
-      it { should == '/' }
+      it { is_expected.to eq('/') }
     end
   end
 
@@ -110,7 +108,7 @@ describe MetasploitDataModels::IPAddress::CIDR do
             true
           }
 
-          it { should_not include(invalid_error) }
+          it { is_expected.not_to include(invalid_error) }
         end
 
         context 'without valid' do
@@ -118,7 +116,7 @@ describe MetasploitDataModels::IPAddress::CIDR do
             false
           }
 
-          it { should include(invalid_error) }
+          it { is_expected.to include(invalid_error) }
         end
       end
 
@@ -131,7 +129,7 @@ describe MetasploitDataModels::IPAddress::CIDR do
           I18n.translate!('errors.messages.blank')
         }
 
-        it { should include(blank_error) }
+        it { is_expected.to include(blank_error) }
       end
     end
 
@@ -166,7 +164,7 @@ describe MetasploitDataModels::IPAddress::CIDR do
         end
       }
 
-      it { should be_nil }
+      it { is_expected.to be_nil }
     end
   end
 
@@ -208,8 +206,8 @@ describe MetasploitDataModels::IPAddress::CIDR do
         regexp.names
       }
 
-      it { should include 'address' }
-      it { should include 'prefix_length' }
+      it { is_expected.to include 'address' }
+      it { is_expected.to include 'prefix_length' }
     end
   end
 
@@ -222,9 +220,17 @@ describe MetasploitDataModels::IPAddress::CIDR do
       Class.new(Metasploit::Model::Base) {
         attr_accessor :value
       }.tap { |address_class|
+        outer_segment_class = self.segment_class
+
+        address_class.define_singleton_method(:segment_class) do
+          outer_segment_class
+        end
 
-        allow(address_class).to receive(:segment_class).and_return(segment_class)
-        allow(address_class).to receive(:segment_count).and_return(segment_count)
+        outer_segment_count = self.segment_count
+
+        address_class.define_singleton_method(:segment_count) do
+          outer_segment_count
+        end
       }
     }
 

data/spec/lib/metasploit_data_models/ip_address/range_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe MetasploitDataModels::IPAddress::Range do
+RSpec.describe MetasploitDataModels::IPAddress::Range do
   subject(:range) {
     range_class.new
   }
@@ -35,7 +33,7 @@ describe MetasploitDataModels::IPAddress::Range do
             'invalid_value'
           }
 
-          it { should be_nil }
+          it { is_expected.to be_nil }
         end
       end
 
@@ -44,7 +42,7 @@ describe MetasploitDataModels::IPAddress::Range do
           nil
         }
 
-        it { should be_nil }
+        it { is_expected.to be_nil }
       end
     end
   end
@@ -67,7 +65,7 @@ describe MetasploitDataModels::IPAddress::Range do
         described_class::SEPARATOR
       }
 
-      it { should == '-' }
+      it { is_expected.to eq('-') }
     end
   end
 

data/spec/lib/metasploit_data_models/match/child_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe MetasploitDataModels::Match::Child do
+RSpec.describe MetasploitDataModels::Match::Child do
   let(:extending_class) {
     # capture as local for Class.new block scope
     described_class = self.described_class
@@ -54,7 +52,7 @@ describe MetasploitDataModels::Match::Child do
           '1,2-3'
         end
 
-        it { should be_nil }
+        it { is_expected.to be_nil }
       end
     end
   end

data/spec/lib/metasploit_data_models/match/parent_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe MetasploitDataModels::Match::Parent do
+RSpec.describe MetasploitDataModels::Match::Parent do
   let(:including_class) {
     described_class = self.described_class
 
@@ -19,7 +17,7 @@ describe MetasploitDataModels::Match::Parent do
     }
 
     context 'default' do
-      it { should == [] }
+      it { is_expected.to eq([]) }
     end
   end
 
@@ -86,7 +84,7 @@ describe MetasploitDataModels::Match::Parent do
         match_child
       end
 
-      it { should be_nil }
+      it { is_expected.to be_nil }
     end
   end
 
@@ -96,7 +94,7 @@ describe MetasploitDataModels::Match::Parent do
     }
 
     context 'default' do
-      it { should == [] }
+      it { is_expected.to eq([]) }
     end
 
     context 'with class names' do

data/spec/lib/metasploit_data_models/version_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe MetasploitDataModels::Version do
+RSpec.describe MetasploitDataModels::Version do
   context 'CONSTANTS' do
     context 'MAJOR' do
       subject(:major) do
@@ -17,7 +15,7 @@ describe MetasploitDataModels::Version do
         described_class::MINOR
       end
 
-      it { should be_a Integer }
+      it { is_expected.to be_a Integer }
     end
 
     context 'PATCH' do
@@ -25,7 +23,7 @@ describe MetasploitDataModels::Version do
         described_class::PATCH
       end
 
-      it { should be_a Integer }
+      it { is_expected.to be_a Integer }
     end
 
     pull_request = ENV['TRAVIS_PULL_REQUEST']

data/spec/spec_helper.rb

@@ -22,7 +22,6 @@ end
 
 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!
@@ -44,13 +43,80 @@ engines.each do |engine|
   end
 end
 
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.before(:each) do
-    # Rex is only available when testing with metasploit-framework or pro, so stub out the methods that require it
-    Mdm::Workspace.any_instance.stub(:valid_ip_or_range? => true)
+  # 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
 
-  config.mock_with :rspec
-  config.use_transactional_fixtures = true
+  # 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.use_transactional_fixtures = true
+
+  config.before(:each) do
+    # Rex is only available when testing with metasploit-framework or pro, so stub out the methods that require it
+    allow_any_instance_of(Mdm::Workspace).to receive(:valid_ip_or_range?).and_return(true)
+  end
 end

data/spec/support/shared/examples/mdm/module/detail/does_not_support_stance_with_mtype.rb

@@ -6,7 +6,7 @@ shared_examples_for 'Mdm::Module::Detail does not support stance with mtype' do
     end
 
     it 'should return false for supports_stance?' do
-      detail.supports_stance?.should be_false
+      expect(detail.supports_stance?).to eq(false)
     end
 
     context 'with nil stance' do
@@ -14,7 +14,7 @@ shared_examples_for 'Mdm::Module::Detail does not support stance with mtype' do
         nil
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
   end
 end