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

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

data/spec/app/models/metasploit/model/search/query_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Query do
+RSpec.describe Metasploit::Model::Search::Query, type: :model do
   context 'validations' do
-    it { should validate_presence_of :klass }
+    it { is_expected.to validate_presence_of :klass }
 
     context 'operations' do
       let(:errors) do
@@ -45,11 +43,11 @@ describe Metasploit::Model::Search::Query do
           end
 
           it 'should have no operations' do
-            query.operations.length.should == 0
+            expect(query.operations.length).to eq(0)
           end
 
           it 'should record error on operations' do
-            errors.should include(error)
+            expect(errors).to include(error)
           end
         end
 
@@ -59,7 +57,7 @@ describe Metasploit::Model::Search::Query do
           end
 
           it 'should not record error on operations' do
-            errors.should_not include(error)
+            expect(errors).not_to include(error)
           end
         end
       end
@@ -75,7 +73,7 @@ describe Metasploit::Model::Search::Query do
 
         before(:each) do
           operation = double('Invalid Operation', :valid? => valid)
-          query.stub(:operations).and_return([operation])
+          allow(query).to receive(:operations).and_return([operation])
         end
 
         context 'with invalid operation' do
@@ -84,7 +82,7 @@ describe Metasploit::Model::Search::Query do
           end
 
           it 'should record error on operations' do
-            errors.should_not include(error)
+            expect(errors).not_to include(error)
           end
         end
 
@@ -94,7 +92,7 @@ describe Metasploit::Model::Search::Query do
           end
 
           it 'should not record error on options' do
-            errors.should_not include(error)
+            expect(errors).not_to include(error)
           end
         end
       end
@@ -117,11 +115,11 @@ describe Metasploit::Model::Search::Query do
       end
 
       it 'should include operation with space in value' do
-        formatted_operations.should include('formatted_operator1:formatted value:1')
+        expect(formatted_operations).to include('formatted_operator1:formatted value:1')
       end
 
       it 'should include operation without space in value' do
-        formatted_operations.should include('formatted_operator2:formatted_value2')
+        expect(formatted_operations).to include('formatted_operator2:formatted_value2')
       end
     end
 
@@ -172,7 +170,7 @@ describe Metasploit::Model::Search::Query do
       end
 
       it 'should equal attribute passed to #initialize' do
-        formatted_operations.should == expected_formatted_operations
+        expect(formatted_operations).to eq(expected_formatted_operations)
       end
     end
 
@@ -208,7 +206,7 @@ describe Metasploit::Model::Search::Query do
       end
 
       it 'should parse #formatted with formatted_operations' do
-        described_class.should_receive(:formatted_operations).with(formatted).and_return([])
+        expect(described_class).to receive(:formatted_operations).with(formatted).and_return([])
 
         formatted_operations
       end
@@ -232,7 +230,7 @@ describe Metasploit::Model::Search::Query do
       end
 
       it 'should use attribute passed to #initialize' do
-        operations.should == expected_operations
+        expect(operations).to eq(expected_operations)
       end
     end
 
@@ -272,7 +270,7 @@ describe Metasploit::Model::Search::Query do
       end
 
       it 'should call #formatted_operations' do
-        query.should_receive(:formatted_operations).and_return([])
+        expect(query).to receive(:formatted_operations).and_return([])
 
         operations
       end
@@ -299,14 +297,14 @@ describe Metasploit::Model::Search::Query do
             :boolean
           end
 
-          it { should be_a Metasploit::Model::Search::Operation::Boolean }
+          it { is_expected.to be_a Metasploit::Model::Search::Operation::Boolean }
 
           context "with 'true'" do
             let(:formatted_value) do
               'true'
             end
 
-            it { should be_valid }
+            it { is_expected.to be_valid }
           end
 
           context "with 'false'" do
@@ -314,7 +312,7 @@ describe Metasploit::Model::Search::Query do
               'false'
             end
 
-            it { should be_valid }
+            it { is_expected.to be_valid }
           end
 
           context "without 'false' or 'true'" do
@@ -322,7 +320,7 @@ describe Metasploit::Model::Search::Query do
               'no'
             end
 
-            it { should_not be_valid }
+            it { is_expected.to_not be_valid }
           end
         end
 
@@ -331,14 +329,14 @@ describe Metasploit::Model::Search::Query do
             :date
           end
 
-          it { should be_a Metasploit::Model::Search::Operation::Date }
+          it { is_expected.to be_a Metasploit::Model::Search::Operation::Date }
 
           context 'with date' do
             let(:formatted_value) do
               Date.today.to_s
             end
 
-            it { should be_valid }
+            it { is_expected.to be_valid }
           end
 
           context 'without date' do
@@ -346,7 +344,7 @@ describe Metasploit::Model::Search::Query do
               'yesterday'
             end
 
-            it { should_not be_valid }
+            it { is_expected.to_not be_valid }
           end
         end
 
@@ -355,14 +353,14 @@ describe Metasploit::Model::Search::Query do
             :integer
           end
 
-          it { should be_a Metasploit::Model::Search::Operation::Integer }
+          it { is_expected.to be_a Metasploit::Model::Search::Operation::Integer }
 
           context 'with integer' do
             let(:formatted_value) do
               '100'
             end
 
-            it { should be_valid }
+            it { is_expected.to be_valid }
           end
 
           context 'with float' do
@@ -370,7 +368,7 @@ describe Metasploit::Model::Search::Query do
               '100.5'
             end
 
-            it { should be_invalid }
+            it { is_expected.to be_invalid }
           end
 
           context 'with integer embedded in text' do
@@ -378,7 +376,7 @@ describe Metasploit::Model::Search::Query do
               'a2c'
             end
 
-            it { should be_invalid }
+            it { is_expected.to be_invalid }
           end
         end
 
@@ -387,14 +385,14 @@ describe Metasploit::Model::Search::Query do
             :string
           end
 
-          it { should be_a Metasploit::Model::Search::Operation::String }
+          it { is_expected.to be_a Metasploit::Model::Search::Operation::String }
 
           context 'with value' do
             let(:formatted_value) do
               'formatted_value'
             end
 
-            it { should be_valid }
+            it { is_expected.to be_valid }
           end
 
           context 'without value' do
@@ -402,7 +400,7 @@ describe Metasploit::Model::Search::Query do
               ''
             end
 
-            it { should_not be_valid }
+            it { is_expected.to_not be_valid }
           end
         end
       end
@@ -420,9 +418,9 @@ describe Metasploit::Model::Search::Query do
           'unknown_value'
         end
 
-        it { should be_a Metasploit::Model::Search::Operation::Base }
+        it { is_expected.to be_a Metasploit::Model::Search::Operation::Base }
 
-        it { should be_invalid }
+        it { is_expected.to be_invalid }
       end
     end
   end
@@ -468,7 +466,7 @@ describe Metasploit::Model::Search::Query do
       end
 
       it 'should have correct number of groups' do
-        operations_by_operator.length.should == @operators.length
+        expect(operations_by_operator.length).to eq(@operators.length)
       end
 
       it 'should have correct value for each operator' do
@@ -489,7 +487,7 @@ describe Metasploit::Model::Search::Query do
           query
         end
 
-        it { should be_valid }
+        it { is_expected.to be_valid }
       end
     end
 
@@ -503,7 +501,7 @@ describe Metasploit::Model::Search::Query do
           query
         end
 
-        it { should_not be_valid }
+        it { is_expected.to_not be_valid }
       end
     end
   end
@@ -542,7 +540,7 @@ describe Metasploit::Model::Search::Query do
 
       context 'with String' do
         it 'should find operator' do
-          parse_operator.should == @operator
+          expect(parse_operator).to eq(@operator)
         end
       end
 
@@ -552,7 +550,7 @@ describe Metasploit::Model::Search::Query do
         end
 
         it 'should find operator' do
-          parse_operator.should == @operator
+          expect(parse_operator).to eq(@operator)
         end
       end
     end
@@ -562,7 +560,7 @@ describe Metasploit::Model::Search::Query do
         'unknown_operator'
       end
 
-      it { should be_a Metasploit::Model::Search::Operator::Null }
+      it { is_expected.to be_a Metasploit::Model::Search::Operator::Null }
     end
   end
 
@@ -599,7 +597,7 @@ describe Metasploit::Model::Search::Query do
         tree
       end
 
-      it { should be_a Metasploit::Model::Search::Group::Intersection }
+      it { is_expected.to be_a Metasploit::Model::Search::Group::Intersection }
 
       context 'children' do
         subject(:children) do
@@ -608,17 +606,17 @@ describe Metasploit::Model::Search::Query do
 
         it 'should be an Array<Metasploit::Model::Search::Group::Union>' do
           children.each do |child|
-            child.should be_a Metasploit::Model::Search::Group::Union
+            expect(child).to be_a Metasploit::Model::Search::Group::Union
           end
         end
 
         it 'should have same operator for each child of a union' do
           children.each do |child|
-            operator_set = child.children.inject(Set.new) { |operator_set, operation|
-              operator_set.add operation.operator
+            operator_set = child.children.inject(Set.new) { |block_operator_set, operation|
+              block_operator_set.add operation.operator
             }
 
-            operator_set.length.should == 1
+            expect(operator_set.length).to eq(1)
           end
         end
 
@@ -635,7 +633,7 @@ describe Metasploit::Model::Search::Query do
 
           it 'should be Array<Metasploit::Model::Search::Operation::Base>' do
             grandchildren.each do |grandchild|
-              grandchild.should be_a Metasploit::Model::Search::Operation::Base
+              expect(grandchild).to be_a Metasploit::Model::Search::Operation::Base
             end
           end
         end
@@ -701,15 +699,15 @@ describe Metasploit::Model::Search::Query do
       end
 
       it 'should return a new query' do
-        without_operator.should_not be query
+        expect(without_operator).not_to be query
       end
 
       it 'should not have operations on the removed operator' do
-        without_operator.operations_by_operator[filtered_operator].should be_blank
+        expect(without_operator.operations_by_operator[filtered_operator]).to be_blank
       end
 
       it 'should have same #klass as this query' do
-        without_operator.klass.should == query.klass
+        expect(without_operator.klass).to eq(query.klass)
       end
 
       context 'with no other operators' do
@@ -719,11 +717,11 @@ describe Metasploit::Model::Search::Query do
           ]
         end
 
-        it { should_not be_valid }
+        it { is_expected.to_not be_valid }
       end
 
       context 'with other operators' do
-        it { should be_valid }
+        it { is_expected.to be_valid }
       end
     end
 
@@ -735,7 +733,7 @@ describe Metasploit::Model::Search::Query do
       end
 
       it 'should return this query' do
-        without_operator.should be query
+        expect(without_operator).to be query
       end
     end
   end