metasploit_data_models 1.0.0.pre.rails.pre.4.0b → 1.0.0

data/spec/lib/base64_serializer_spec.rb

@@ -1,6 +1,4 @@
-require "spec_helper"
-
-describe MetasploitDataModels::Base64Serializer do
+RSpec.describe MetasploitDataModels::Base64Serializer do
   let(:base64_marshaled) do
     marshaled = Marshal.dump(unserialized)
 
@@ -30,7 +28,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 +36,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 +73,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 +103,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 +129,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 +141,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 +150,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 +163,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/ipaddr_spec.rb

@@ -1,6 +1,4 @@
-require "spec_helper"
-
-describe IPAddr do
+RSpec.describe IPAddr do
   subject(:ip_address) { IPAddr.new('10.0.0.1') }
   
   describe '#==' do

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,139 +1,3 @@
-require 'spec_helper'
-
-describe MetasploitDataModels::Version do
-  context 'CONSTANTS' do
-    context 'MAJOR' do
-      subject(:major) do
-        described_class::MAJOR
-      end
-
-      it { should be_a Integer }
-    end
-
-    context 'MINOR' do
-      subject(:minor) do
-        described_class::MINOR
-      end
-
-      it { should be_a Integer }
-    end
-
-    context 'PATCH' do
-      subject(:patch) do
-        described_class::PATCH
-      end
-
-      it { should be_a Integer }
-    end
-
-    pull_request = ENV['TRAVIS_PULL_REQUEST']
-
-    # a pull request cannot check PRERELEASE because it will be tested in the target branch, but the source itself
-    # is from the source branch and so has the source branch PRERELEASE.
-    #
-    # PRERELEASE can only be set appropriately for a merge by merging to the target branch and then updating PRERELEASE
-    # on the target branch before committing and/or pushing to github and travis-ci.
-    if pull_request.nil? || pull_request == 'false'
-      context 'PREPRELEASE' do
-        subject(:prerelease) do
-          described_class::PRERELEASE
-        end
-
-        branch = ENV['TRAVIS_BRANCH']
-
-        if branch.blank?
-          branch = `git rev-parse --abbrev-ref HEAD`.strip
-        end
-
-        if branch == 'master'
-          it 'does not have a PRERELEASE' do
-            expect(defined? described_class::PRERELEASE).to be_nil
-          end
-        else
-          branch_regex = /\A(?<type>bug|chore|feature|staging)(\/(?<story>[^\/]+))?\/(?<prerelease>[^\/]+)\z/
-          match = branch.match(branch_regex)
-
-          if match
-            it 'matches the branch relative name' do
-              expect(prerelease).to eq(match[:prerelease])
-            end
-          else
-            tag_regex = /\Av(?<major>\d+).(?<minor>\d+).(?<patch>\d+)(\.pre\.(?<prerelease>.*))?\z/
-            # travis-ci sets TRAVIS_BRANCH to the tag name for tag builds
-            match = branch.match(tag_regex)
-
-            if match
-              tag_prerelease = match[:prerelease]
-
-              if tag_prerelease
-                it 'matches the tag prerelease converted from a gem version to a VERSION' do
-                  expect(prerelease).to eq(tag_prerelease.gsub('.pre.', '-'))
-                end
-              else
-                it 'does not have a PRERELEASE' do
-                  expect(defined? described_class::PRERELEASE).to be_nil
-                end
-              end
-            else
-              it 'has a abbreviated reference that can be parsed for prerelease' do
-                fail "Do not know how to parse #{branch.inspect} for PRERELEASE"
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-
-  context 'full' do
-    subject(:full) do
-      described_class.full
-    end
-
-    #
-    # lets
-    #
-
-    let(:major) do
-      1
-    end
-
-    let(:minor) do
-      2
-    end
-
-    let(:patch) do
-      3
-    end
-
-    before(:each) do
-      stub_const("#{described_class}::MAJOR", major)
-      stub_const("#{described_class}::MINOR", minor)
-      stub_const("#{described_class}::PATCH", patch)
-    end
-
-    context 'with PRERELEASE' do
-      let(:prerelease) do
-        'prerelease'
-      end
-
-      before(:each) do
-        stub_const("#{described_class}::PRERELEASE", prerelease)
-      end
-
-      it 'is <major>.<minor>.<patch>-<prerelease>' do
-        expect(full).to eq("#{major}.#{minor}.#{patch}-#{prerelease}")
-      end
-    end
-
-    context 'without PRERELEASE' do
-      before(:each) do
-        hide_const("#{described_class}::PRERELEASE")
-      end
-
-      it 'is <major>.<minor>.<patch>' do
-        expect(full).to eq("#{major}.#{minor}.#{patch}")
-      end
-    end
-  end
-end
+RSpec.describe MetasploitDataModels::Version do
+  it_should_behave_like 'Metasploit::Version Version Module'
+end