metasploit-model 0.30.0-java → 0.30.1-java

data/spec/lib/metasploit/model/search/operation/value/integer_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Value::Integer do
+RSpec.describe Metasploit::Model::Search::Operation::Value::Integer do
   it_should_behave_like 'Metasploit::Model::Search::Operation::Value::Integer' do
     let(:operation_class) do
       described_class = self.described_class

data/spec/lib/metasploit/model/search/operation/value/string_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Value::String do
+RSpec.describe Metasploit::Model::Search::Operation::Value::String do
   it_should_behave_like 'Metasploit::Model::Search::Operation::Value::String' do
     let(:operation_class) do
       described_class = self.described_class

data/spec/lib/metasploit/model/search/operation_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation do
+RSpec.describe Metasploit::Model::Search::Operation do
   context 'parse' do
     subject(:parse) do
       described_class.parse(options)
@@ -48,8 +46,8 @@ describe Metasploit::Model::Search::Operation do
 
         context "with at least one ':' in :formatted_operation" do
           before(:each) do
-            query.stub(:parse_operator).with(formatted_operator).and_return(operator)
-            operator.stub(:operate_on).with(formatted_value).and_return(operation)
+            allow(query).to receive(:parse_operator).with(formatted_operator).and_return(operator)
+            allow(operator).to receive(:operate_on).with(formatted_value).and_return(operation)
           end
 
           context "with multiple ':' in :formatted_operation" do
@@ -58,13 +56,13 @@ describe Metasploit::Model::Search::Operation do
             end
 
             it "should treat portion before first ':' as formatted operator" do
-              query.should_receive(:parse_operator).with(formatted_operator)
+              expect(query).to receive(:parse_operator).with(formatted_operator)
 
               parse
             end
 
             it "should treat portion after first ':' as formatted value including later ':'" do
-              operator.should_receive(:operate_on).with(formatted_value)
+              expect(operator).to receive(:operate_on).with(formatted_value)
 
               parse
             end
@@ -76,13 +74,13 @@ describe Metasploit::Model::Search::Operation do
             end
 
             it "should use portion before ':' as formatted operator" do
-              query.should_receive(:parse_operator).with(formatted_operator)
+              expect(query).to receive(:parse_operator).with(formatted_operator)
 
               parse
             end
 
             it "should use portion after ':' as formatted value" do
-              operator.should_receive(:operate_on).with(formatted_value)
+              expect(operator).to receive(:operate_on).with(formatted_value)
 
               parse
             end
@@ -103,17 +101,17 @@ describe Metasploit::Model::Search::Operation do
           end
 
           it "should use entirety as formatted operator" do
-            operator.stub(:operate_on).and_return(operation)
+            allow(operator).to receive(:operate_on).and_return(operation)
 
-            query.should_receive(:parse_operator).with(formatted_operator).and_return(operator)
+            expect(query).to receive(:parse_operator).with(formatted_operator).and_return(operator)
 
             parse
           end
 
           it "should use '' as formatted value instead of nil" do
-            query.stub(:parse_operator).and_return(operator)
+            allow(query).to receive(:parse_operator).and_return(operator)
 
-            operator.should_receive(:operate_on).with('')
+            expect(operator).to receive(:operate_on).with('')
 
             parse
           end

data/spec/lib/metasploit/model/search/operator/help_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operator::Help do
+RSpec.describe Metasploit::Model::Search::Operator::Help do
   it_should_behave_like 'Metasploit::Model::Search::Operator::Help' do
     let(:operator) do
       operator_class.new(

data/spec/lib/metasploit/model/search/with_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::With do
+RSpec.describe Metasploit::Model::Search::With do
   let(:base_class) do
     described_class = self.described_class
 
@@ -37,7 +35,7 @@ describe Metasploit::Model::Search::With do
     end
 
     it 'should pass given options to operator_class.new' do
-      operator_class.should_receive(:new).with(
+      expect(operator_class).to receive(:new).with(
           hash_including(options)
       ).and_return(operator)
 
@@ -45,7 +43,7 @@ describe Metasploit::Model::Search::With do
     end
 
     it 'should merge :klass into options passed to operator.new' do
-      operator_class.should_receive(:new).with(
+      expect(operator_class).to receive(:new).with(
           hash_including(
               :klass => base_class
           )
@@ -55,9 +53,9 @@ describe Metasploit::Model::Search::With do
     end
 
     it 'should validate operator' do
-      operator_class.stub(:new).and_return(operator)
+      allow(operator_class).to receive(:new).and_return(operator)
 
-      operator.should_receive(:valid!)
+      expect(operator).to receive(:valid!)
 
       search_with_operator
     end
@@ -65,7 +63,7 @@ describe Metasploit::Model::Search::With do
     it 'should add operator to search_with_operator_by_name' do
       search_with_operator
 
-      base_class.search_with_operator_by_name[operator.name].should == operator
+      expect(base_class.search_with_operator_by_name[operator.name]).to eq(operator)
     end
   end
 
@@ -75,7 +73,7 @@ describe Metasploit::Model::Search::With do
     end
 
     it 'should default to empty Hash' do
-      search_with_operator_by_name.should == {}
+      expect(search_with_operator_by_name).to eq({})
     end
   end
 end

data/spec/lib/metasploit/model/search_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search do
+RSpec.describe Metasploit::Model::Search do
   subject(:base_instance) do
     base_class.new
   end
@@ -16,9 +14,9 @@ describe Metasploit::Model::Search do
     base_class.send(:include, described_class)
   end
 
-  it { should be_a Metasploit::Model::Search::Association }
-  it { should be_a Metasploit::Model::Search::Attribute }
-  it { should be_a Metasploit::Model::Search::With }
+  it { is_expected.to be_a Metasploit::Model::Search::Association }
+  it { is_expected.to be_a Metasploit::Model::Search::Attribute }
+  it { is_expected.to be_a Metasploit::Model::Search::With }
 
   context 'search_operator_by_name' do
     subject(:search_operator_by_name) do
@@ -45,7 +43,7 @@ describe Metasploit::Model::Search do
           end
 
           it 'should be same as the attribute' do
-            name.should == attribute
+            expect(name).to eq(attribute)
           end
         end
       end
@@ -90,7 +88,7 @@ describe Metasploit::Model::Search do
           "#{association}.#{associated_attribute}".to_sym
         end
 
-        it { should be_a Metasploit::Model::Search::Operator::Association }
+        it { is_expected.to be_a Metasploit::Model::Search::Operator::Association }
 
         context 'association' do
           subject(:operator_association) do
@@ -98,7 +96,7 @@ describe Metasploit::Model::Search do
           end
 
           it 'should be the registered association' do
-            operator_association.should == association
+            expect(operator_association).to eq(association)
           end
         end
 
@@ -112,7 +110,7 @@ describe Metasploit::Model::Search do
           end
 
           it 'should be operator from associated class' do
-            source_operator.should == direct_attribute_operator
+            expect(source_operator).to eq(direct_attribute_operator)
           end
         end
 
@@ -122,7 +120,7 @@ describe Metasploit::Model::Search do
           end
 
           it 'should be class that called search_operator_by_name' do
-            klass.should == base_class
+            expect(klass).to eq(base_class)
           end
         end
       end
@@ -155,7 +153,7 @@ describe Metasploit::Model::Search do
         end
 
         it 'should be in search_operator_by_name' do
-          named_operator.should == operator
+          expect(named_operator).to eq(operator)
         end
       end
     end
@@ -163,7 +161,7 @@ describe Metasploit::Model::Search do
     context 'without search attribute' do
       context 'without search association' do
         context 'without search with' do
-          it { should be_empty }
+          it { is_expected.to be_empty }
         end
       end
     end

data/spec/lib/metasploit/model/spec/error_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Spec::Error do
-  it { should be_a StandardError }
+RSpec.describe Metasploit::Model::Spec::Error do
+  it { is_expected.to be_a StandardError }
 end

data/spec/lib/metasploit/model/spec/i18n_exception_handler_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Spec::I18nExceptionHandler do
+RSpec.describe Metasploit::Model::Spec::I18nExceptionHandler do
   subject(:i18n_exception_handler) do
     described_class.new
   end
@@ -32,10 +30,10 @@ describe Metasploit::Model::Spec::I18nExceptionHandler do
       expect {
         call
       }.to raise_error(converted_exception.class) do |actual_exception|
-        actual_exception.class == converted_exception.class
-        actual_exception.key.should == converted_exception.key
-        actual_exception.locale.should == converted_exception.locale
-        actual_exception.options.should == converted_exception.options
+        expect(actual_exception.class).to eq(converted_exception.class)
+        expect(actual_exception.key).to eq(converted_exception.key)
+        expect(actual_exception.locale).to eq(converted_exception.locale)
+        expect(actual_exception.options).to eq(converted_exception.options)
       end
     end
   end

data/spec/lib/metasploit/model/spec/pathname_collision_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Spec::PathnameCollision do
+RSpec.describe Metasploit::Model::Spec::PathnameCollision do
   let(:pathname) do
     Metasploit::Model::Spec.temporary_pathname.join('pathname')
   end
@@ -9,7 +7,7 @@ describe Metasploit::Model::Spec::PathnameCollision do
     described_class.new(pathname)
   end
 
-  it { should be_a Metasploit::Model::Spec::Error }
+  it { is_expected.to be_a Metasploit::Model::Spec::Error }
 
   context 'check!' do
     subject(:check!) do
@@ -44,11 +42,11 @@ describe Metasploit::Model::Spec::PathnameCollision do
       end
 
       it 'should include pathname' do
-        message.should include("#{pathname} already exists.")
+        expect(message).to include("#{pathname} already exists.")
       end
 
       it 'should include potential cause' do
-        message.should include('Metasploit::Model::Spec.remove_temporary_pathname was not called after the previous spec.')
+        expect(message).to include('Metasploit::Model::Spec.remove_temporary_pathname was not called after the previous spec.')
       end
     end
   end

data/spec/lib/metasploit/model/spec_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Spec do
+RSpec.describe Metasploit::Model::Spec do
   before(:each) do
     @before_temporary_pathname = described_class.send(:remove_instance_variable, :@temporary_pathname)
   end
@@ -35,11 +33,11 @@ describe Metasploit::Model::Spec do
         end
 
         it 'should remove file tree' do
-          pathname.exist?.should be_true
+          expect(pathname.exist?).to eq(true)
 
           remove_temporary_pathname
 
-          pathname.exist?.should be_false
+          expect(pathname.exist?).to eq(false)
         end
       end
 
@@ -82,7 +80,7 @@ describe Metasploit::Model::Spec do
       end
 
       it 'should return set pathname' do
-        temporary_pathname.should == pathname
+        expect(temporary_pathname).to eq(pathname)
       end
     end
 
@@ -107,7 +105,11 @@ describe Metasploit::Model::Spec do
       expect {
         described_class.temporary_pathname = temporary_pathname
       }.to change {
-        described_class.instance_variable_get(:@temporary_pathname)
+                   if described_class.instance_variable_defined? :@temporary_pathname
+                     described_class.instance_variable_get(:@temporary_pathname)
+                   else
+                     nil
+                   end
       }.to(temporary_pathname)
     end
   end

data/spec/lib/metasploit/model/translation_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Translation do
+RSpec.describe Metasploit::Model::Translation do
   let(:base_class) do
     described_class = self.described_class
 
@@ -56,21 +54,21 @@ describe Metasploit::Model::Translation do
     end
 
     it 'should have named and unnamed ancestors' do
-      base_class.ancestors.should include(named_class)
-      base_class.ancestors.should include(named_module)
-      base_class.ancestors.should include(unnamed_class)
-      base_class.ancestors.should include(unnamed_module)
+      expect(base_class.ancestors).to include(named_class)
+      expect(base_class.ancestors).to include(named_module)
+      expect(base_class.ancestors).to include(unnamed_class)
+      expect(base_class.ancestors).to include(unnamed_module)
     end
 
     it 'should return all ancestors that respond to model_name' do
-      lookup_ancestors.should include(base_class)
-      lookup_ancestors.should include(named_class)
-      lookup_ancestors.should include(named_module)
+      expect(lookup_ancestors).to include(base_class)
+      expect(lookup_ancestors).to include(named_class)
+      expect(lookup_ancestors).to include(named_module)
     end
 
     it 'should not return ancestors that do not respond to model_name' do
-      lookup_ancestors.should_not include(unnamed_class)
-      lookup_ancestors.should_not include(unnamed_module)
+      expect(lookup_ancestors).not_to include(unnamed_class)
+      expect(lookup_ancestors).not_to include(unnamed_module)
     end
   end
 

data/spec/lib/metasploit/model/version_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Version do
+RSpec.describe Metasploit::Model::Version do
   context 'CONSTANTS' do
     context 'MAJOR' do
       subject(:major) do
@@ -17,7 +15,7 @@ describe Metasploit::Model::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 Metasploit::Model::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/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