metasploit-model 0.30.0-java → 0.30.1-java

data/spec/app/models/metasploit/model/search/operation/set_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Set do
+RSpec.describe Metasploit::Model::Search::Operation::Set, type: :model do
   subject(:set) do
     described_class.new(
         operator: operator,
@@ -97,7 +95,7 @@ describe Metasploit::Model::Search::Operation::Set do
               attribute_set.sample
             end
 
-            it { should_not include(error) }
+            it { is_expected.not_to include(error) }
           end
 
           context 'without value in attribute_set' do
@@ -105,7 +103,7 @@ describe Metasploit::Model::Search::Operation::Set do
               :not_an_member
             end
 
-            it { should include(error) }
+            it { is_expected.to include(error) }
           end
         end
 
@@ -118,7 +116,7 @@ describe Metasploit::Model::Search::Operation::Set do
             nil
           end
 
-          it { should_not include(error) }
+          it { is_expected.not_to include(error) }
         end
       end
     end

data/spec/app/models/metasploit/model/search/operation/string_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::String do
+RSpec.describe Metasploit::Model::Search::Operation::String, type: :model do
   context 'validation' do
-    it { should validate_presence_of(:value) }
+    it { is_expected.to validate_presence_of(:value) }
   end
 
   it_should_behave_like 'Metasploit::Model::Search::Operation::Value::String'

data/spec/app/models/metasploit/model/search/operator/association_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operator::Association do
+RSpec.describe Metasploit::Model::Search::Operator::Association, type: :model do
   subject(:operator) do
     described_class.new(
         :association => association,
@@ -16,11 +14,11 @@ describe Metasploit::Model::Search::Operator::Association do
     double('Metasploit::Model::Search::Operator::Base')
   end
 
-  it { should be_a Metasploit::Model::Search::Operator::Base }
+  it { is_expected.to be_a Metasploit::Model::Search::Operator::Base }
 
   context 'validations' do
-    it { should validate_presence_of(:association) }
-    it { should validate_presence_of(:source_operator) }
+    it { is_expected.to validate_presence_of(:association) }
+    it { is_expected.to validate_presence_of(:source_operator) }
   end
 
   context '#help' do
@@ -51,7 +49,7 @@ describe Metasploit::Model::Search::Operator::Association do
       'source_operator_name'
     }
 
-    it { should be_a Symbol }
+    it { is_expected.to be_a Symbol }
 
     it 'should be <association>.<source_operator.name>' do
       expect(name).to eq :"#{association}.#{source_operator_name}"
@@ -81,7 +79,7 @@ describe Metasploit::Model::Search::Operator::Association do
       }
     }
 
-    it { should be_a Metasploit::Model::Search::Operation::Association }
+    it { is_expected.to be_a Metasploit::Model::Search::Operation::Association }
 
     context 'Metasploit::Model::Search::Operation::Association' do
       context '#operator' do

data/spec/app/models/metasploit/model/search/operator/attribute_spec.rb

@@ -1,7 +1,5 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operator::Attribute do
-  it { should be_a Metasploit::Model::Search::Operator::Single }
+RSpec.describe Metasploit::Model::Search::Operator::Attribute, type: :model do
+  it { is_expected.to be_a Metasploit::Model::Search::Operator::Single }
 
   context 'CONSTANTS' do
     context 'TYPES' do
@@ -9,30 +7,30 @@ describe Metasploit::Model::Search::Operator::Attribute do
         described_class::TYPES
       end
 
-      it { should include(:boolean) }
-      it { should include(:date) }
+      it { is_expected.to include(:boolean) }
+      it { is_expected.to include(:date) }
       it {
-        should include(
+        is_expected.to include(
                    {
                        set: :integer
                    }
                )
       }
       it {
-        should include(
+        is_expected.to include(
                    {
                        set: :string
                    }
                )
       }
-      it { should include(:integer) }
-      it { should include(:string) }
+      it { is_expected.to include(:integer) }
+      it { is_expected.to include(:string) }
     end
   end
 
   context 'validations' do
-    it { should validate_presence_of(:attribute) }
-    it { should ensure_inclusion_of(:type).in_array(described_class::TYPES) }
+    it { is_expected.to validate_presence_of(:attribute) }
+    it { is_expected.to ensure_inclusion_of(:type).in_array(described_class::TYPES) }
   end
 
   context '#attribute_enumerable' do
@@ -77,7 +75,7 @@ describe Metasploit::Model::Search::Operator::Attribute do
       end
 
       it 'should be #klass #<attribute>_set' do
-        attribute_set.should == expected_attribute_set
+        expect(attribute_set).to eq(expected_attribute_set)
       end
     end
   end
@@ -98,7 +96,7 @@ describe Metasploit::Model::Search::Operator::Attribute do
     end
 
     it 'should be #attribute' do
-      name.should == attribute
+      expect(name).to eq(attribute)
     end
   end
 end

data/spec/app/models/metasploit/model/search/operator/base_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operator::Base do
+RSpec.describe Metasploit::Model::Search::Operator::Base, type: :model do
   subject(:operator) do
     described_class.new
   end
@@ -12,12 +10,12 @@ describe Metasploit::Model::Search::Operator::Base do
 
     before(:each) do
       # have to stub since it's not implemented on base
-      operator.stub(name: name)
+      allow(operator).to receive(:name).and_return(name)
     end
   end
 
   context 'validations' do
-    it { should validate_presence_of(:klass) }
+    it { is_expected.to validate_presence_of(:klass) }
   end
 
   context '#name' do

data/spec/app/models/metasploit/model/search/operator/delegation_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operator::Delegation do
+RSpec.describe Metasploit::Model::Search::Operator::Delegation, type: :model do
   subject(:operator) do
     described_class.new(
         :klass => klass
@@ -11,7 +9,7 @@ describe Metasploit::Model::Search::Operator::Delegation do
     Class.new
   end
 
-  it { should be_a Metasploit::Model::Search::Operator::Base }
+  it { is_expected.to be_a Metasploit::Model::Search::Operator::Base }
 
   context 'operator_name' do
     subject(:operator_name) do
@@ -32,7 +30,7 @@ describe Metasploit::Model::Search::Operator::Delegation do
       end
 
       it 'should remove namespace' do
-        operator_name.should == base_name.downcase.to_sym
+        expect(operator_name).to eq(base_name.downcase.to_sym)
       end
     end
 
@@ -42,7 +40,7 @@ describe Metasploit::Model::Search::Operator::Delegation do
       end
 
       it 'should convert name to underscore' do
-        operator_name.should == :camel_case
+        expect(operator_name).to eq(:camel_case)
       end
     end
   end
@@ -67,17 +65,21 @@ describe Metasploit::Model::Search::Operator::Delegation do
     end
 
     before(:each) do
-      klass.stub(:search_operator_by_name => search_operator_by_name)
+      outer_search_operator_by_name = search_operator_by_name
+
+      klass.send(:define_singleton_method, :search_operator_by_name) do
+        outer_search_operator_by_name
+      end
     end
 
     it 'should convert formatted_operator to Symbol' do
-      formatted_operator.should_receive(:to_sym)
+      expect(formatted_operator).to receive(:to_sym)
 
       named_operator
     end
 
     it 'should look up operator name in search_operator_by_name of #klass' do
-      named_operator.should == search_operator
+      expect(named_operator).to eq(search_operator)
     end
 
     context 'with name not in klass.search_operator_by_name' do
@@ -100,9 +102,9 @@ describe Metasploit::Model::Search::Operator::Delegation do
 
     it 'should delegate to operator_name' do
       operator_name = double('Operator Name')
-      operator.class.stub(:operator_name => operator_name)
+      allow(operator.class).to receive(:operator_name).and_return(operator_name)
 
-      name.should == operator_name
+      expect(name).to eq(operator_name)
     end
   end
 end

data/spec/app/models/metasploit/model/search/operator/group/base_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operator::Group::Base do
+RSpec.describe Metasploit::Model::Search::Operator::Group::Base, type: :model do
   subject(:operator) do
     described_class.new
   end
@@ -50,10 +48,10 @@ describe Metasploit::Model::Search::Operator::Group::Base do
     #
 
     before(:each) do
-      operator.stub(:children => children)
+      allow(operator).to receive(:children).and_return(children)
     end
 
-    it { should be_a Metasploit::Model::Search::Operation::Group::Base }
+    it { is_expected.to be_a Metasploit::Model::Search::Operation::Group::Base }
 
     context 'children' do
       subject(:operation_children) do
@@ -75,7 +73,7 @@ describe Metasploit::Model::Search::Operator::Group::Base do
       end
 
       it 'should be the operator itself' do
-        operation_operator.should == operator
+        expect(operation_operator).to eq(operator)
       end
     end
 
@@ -85,7 +83,7 @@ describe Metasploit::Model::Search::Operator::Group::Base do
       end
 
       it 'should be formatted value' do
-        value.should == formatted_value
+        expect(value).to eq(formatted_value)
       end
     end
   end

data/spec/app/models/metasploit/model/search/operator/group/intersection_spec.rb

@@ -1,13 +1,11 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operator::Group::Intersection do
-  it { should be_a Metasploit::Model::Search::Operator::Group::Base }
+RSpec.describe Metasploit::Model::Search::Operator::Group::Intersection, type: :model do
+  it { is_expected.to be_a Metasploit::Model::Search::Operator::Group::Base }
 
   context 'operation_class_name' do
     subject(:operation_class_name) {
       described_class.operation_class_name
     }
 
-    it { should == 'Metasploit::Model::Search::Operation::Group::Intersection' }
+    it { is_expected.to eq('Metasploit::Model::Search::Operation::Group::Intersection') }
   end
 end

data/spec/app/models/metasploit/model/search/operator/group/union_spec.rb

@@ -1,13 +1,11 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operator::Group::Union do
-  it { should be_a Metasploit::Model::Search::Operator::Group::Base }
+RSpec.describe Metasploit::Model::Search::Operator::Group::Union, type: :model do
+  it { is_expected.to be_a Metasploit::Model::Search::Operator::Group::Base }
 
   context 'operation_class_name' do
     subject(:operation_class_name) {
       described_class.operation_class_name
     }
 
-    it { should == 'Metasploit::Model::Search::Operation::Group::Union' }
+    it { is_expected.to eq('Metasploit::Model::Search::Operation::Group::Union') }
   end
 end

data/spec/app/models/metasploit/model/search/operator/null_spec.rb

@@ -1,11 +1,9 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operator::Null do
+RSpec.describe Metasploit::Model::Search::Operator::Null, type: :model do
   subject(:operator) do
     described_class.new
   end
 
-  it { should be_a Metasploit::Model::Search::Operator::Single }
+  it { is_expected.to be_a Metasploit::Model::Search::Operator::Single }
 
   context 'validations' do
     context 'name' do
@@ -18,7 +16,7 @@ describe Metasploit::Model::Search::Operator::Null do
       end
 
       it 'should record error' do
-        operator.errors[:name].should include(error)
+        expect(operator.errors[:name]).to include(error)
       end
     end
   end
@@ -28,7 +26,7 @@ describe Metasploit::Model::Search::Operator::Null do
       operator.type
     end
 
-    it { should be_nil }
+    it { is_expected.to be_nil }
   end
 
   context '#operation_class' do
@@ -36,6 +34,6 @@ describe Metasploit::Model::Search::Operator::Null do
       operator.send(:operation_class)
     end
 
-    it { should == Metasploit::Model::Search::Operation::Null }
+    it { is_expected.to eq(Metasploit::Model::Search::Operation::Null) }
   end
 end

data/spec/app/models/metasploit/model/search/operator/single_spec.rb

@@ -1,11 +1,9 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operator::Single do
+RSpec.describe Metasploit::Model::Search::Operator::Single, type: :model do
   subject(:operator) do
     described_class.new
   end
 
-  it { should be_a Metasploit::Model::Search::Operator::Base }
+  it { is_expected.to be_a Metasploit::Model::Search::Operator::Base }
 
   context 'CONSTANTS' do
     context 'MODULE_SEPARATOR' do
@@ -13,7 +11,7 @@ describe Metasploit::Model::Search::Operator::Single do
         described_class::MODULE_SEPARATOR
       end
 
-      it { should == '::' }
+      it { is_expected.to eq('::') }
     end
 
     context 'OPERATION_NAMESPACE_NAME' do
@@ -21,7 +19,7 @@ describe Metasploit::Model::Search::Operator::Single do
         described_class::OPERATION_NAMESPACE_NAME
       end
 
-      it { should == 'Metasploit::Model::Search::Operation' }
+      it { is_expected.to eq('Metasploit::Model::Search::Operation') }
     end
   end
 
@@ -67,7 +65,7 @@ describe Metasploit::Model::Search::Operator::Single do
         end
 
         it 'should be the constant_name of the key and value separated by MODULE_SEPARATOR' do
-          constant_name.should == "#{key_constant_name}#{described_class::MODULE_SEPARATOR}#{value_constant_name}"
+          expect(constant_name).to eq("#{key_constant_name}#{described_class::MODULE_SEPARATOR}#{value_constant_name}")
         end
       end
 
@@ -93,7 +91,7 @@ describe Metasploit::Model::Search::Operator::Single do
       end
 
       it 'should constantize string version of Symbol' do
-        constant_name.should == 'Integer'
+        expect(constant_name).to eq('Integer')
       end
     end
 
@@ -124,20 +122,20 @@ describe Metasploit::Model::Search::Operator::Single do
     end
 
     before(:each) do
-      operator.stub(:operation_class => operation_class)
+      allow(operator).to receive(:operation_class).and_return(operation_class)
     end
 
     it 'should call new on #operation_class' do
-      operation_class.should_receive(:new).with(:value => formatted_value, :operator => operator)
+      expect(operation_class).to receive(:new).with(:value => formatted_value, :operator => operator)
 
       operate_on
     end
 
     it 'should return instance of #operation_class' do
       operation = double('Operation')
-      operation_class.stub(:new => operation)
+      allow(operation_class).to receive(:new).and_return(operation)
 
-      operate_on.should == operation
+      expect(operate_on).to eq(operation)
     end
   end
 
@@ -147,7 +145,7 @@ describe Metasploit::Model::Search::Operator::Single do
     end
 
     before(:each) do
-      operator.stub(:type => type)
+      allow(operator).to receive(:type).and_return(type)
     end
 
     context 'type' do
@@ -156,7 +154,7 @@ describe Metasploit::Model::Search::Operator::Single do
           :boolean
         end
 
-        it { should == Metasploit::Model::Search::Operation::Boolean }
+        it { is_expected.to eq(Metasploit::Model::Search::Operation::Boolean) }
       end
 
       context 'with :date' do
@@ -164,7 +162,7 @@ describe Metasploit::Model::Search::Operator::Single do
           :date
         end
 
-        it { should == Metasploit::Model::Search::Operation::Date }
+        it { is_expected.to eq(Metasploit::Model::Search::Operation::Date) }
       end
 
       context 'with set: :integer' do
@@ -174,7 +172,7 @@ describe Metasploit::Model::Search::Operator::Single do
           }
         end
 
-        it { should == Metasploit::Model::Search::Operation::Set::Integer }
+        it { is_expected.to eq(Metasploit::Model::Search::Operation::Set::Integer) }
       end
 
       context 'with set: :string' do
@@ -184,7 +182,7 @@ describe Metasploit::Model::Search::Operator::Single do
           }
         end
 
-        it { should == Metasploit::Model::Search::Operation::Set::String }
+        it { is_expected.to eq(Metasploit::Model::Search::Operation::Set::String) }
       end
 
       context 'with :integer' do
@@ -192,7 +190,7 @@ describe Metasploit::Model::Search::Operator::Single do
           :integer
         end
 
-        it { should == Metasploit::Model::Search::Operation::Integer }
+        it { is_expected.to eq(Metasploit::Model::Search::Operation::Integer) }
       end
 
       context 'with :string' do
@@ -200,7 +198,7 @@ describe Metasploit::Model::Search::Operator::Single do
           :string
         end
 
-        it { should == Metasploit::Model::Search::Operation::String }
+        it { is_expected.to eq(Metasploit::Model::Search::Operation::String) }
       end
 
       context 'with nil' do
@@ -213,7 +211,7 @@ describe Metasploit::Model::Search::Operator::Single do
         end
 
         before(:each) do
-          operator.stub(:name => name)
+          allow(operator).to receive(:name).and_return(name)
         end
 
         it 'should raise ArgumentError' do
@@ -233,7 +231,7 @@ describe Metasploit::Model::Search::Operator::Single do
     end
 
     before(:each) do
-      operator.stub(:type => type)
+      allow(operator).to receive(:type).and_return(type)
     end
 
     context 'type' do
@@ -242,7 +240,7 @@ describe Metasploit::Model::Search::Operator::Single do
           :boolean
         end
 
-        it { should == 'Metasploit::Model::Search::Operation::Boolean' }
+        it { is_expected.to eq('Metasploit::Model::Search::Operation::Boolean') }
       end
 
       context 'with :date' do
@@ -250,7 +248,7 @@ describe Metasploit::Model::Search::Operator::Single do
           :date
         end
 
-        it { should == 'Metasploit::Model::Search::Operation::Date' }
+        it { is_expected.to eq('Metasploit::Model::Search::Operation::Date') }
       end
 
       context 'with set: :integer' do
@@ -260,7 +258,7 @@ describe Metasploit::Model::Search::Operator::Single do
           }
         end
 
-        it { should == 'Metasploit::Model::Search::Operation::Set::Integer' }
+        it { is_expected.to eq('Metasploit::Model::Search::Operation::Set::Integer') }
       end
 
       context 'with set: :string' do
@@ -270,7 +268,7 @@ describe Metasploit::Model::Search::Operator::Single do
           }
         end
 
-        it { should == 'Metasploit::Model::Search::Operation::Set::String' }
+        it { is_expected.to eq('Metasploit::Model::Search::Operation::Set::String') }
       end
 
       context 'with :integer' do
@@ -278,7 +276,7 @@ describe Metasploit::Model::Search::Operator::Single do
           :integer
         end
 
-        it { should == 'Metasploit::Model::Search::Operation::Integer' }
+        it { is_expected.to eq('Metasploit::Model::Search::Operation::Integer') }
       end
 
       context 'with :string' do
@@ -286,7 +284,7 @@ describe Metasploit::Model::Search::Operator::Single do
           :string
         end
 
-        it { should == 'Metasploit::Model::Search::Operation::String' }
+        it { is_expected.to eq('Metasploit::Model::Search::Operation::String') }
       end
 
       context 'with nil' do
@@ -299,7 +297,7 @@ describe Metasploit::Model::Search::Operator::Single do
         end
 
         before(:each) do
-          operator.stub(:name => name)
+          allow(operator).to receive(:name).and_return(name)
         end
 
         it 'should raise ArgumentError' do