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

data/spec/app/models/metasploit_data_models/search/operator/ip_address_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe MetasploitDataModels::Search::Operator::IPAddress do
+RSpec.describe MetasploitDataModels::Search::Operator::IPAddress, type: :model do
   subject(:operator) {
     described_class.new
   }
@@ -14,6 +12,6 @@ describe MetasploitDataModels::Search::Operator::IPAddress do
       nil
     }
 
-    it { should be_a MetasploitDataModels::Search::Operation::IPAddress }
+    it { is_expected.to be_a MetasploitDataModels::Search::Operation::IPAddress }
   end
 end

data/spec/app/models/metasploit_data_models/search/operator/multitext_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe MetasploitDataModels::Search::Operator::Multitext do
+RSpec.describe MetasploitDataModels::Search::Operator::Multitext, type: :model do
   subject(:multitext_operator) {
     described_class.new(
         attributes
@@ -12,8 +10,8 @@ describe MetasploitDataModels::Search::Operator::Multitext do
   }
 
   context 'validations' do
-    it { should ensure_length_of(:operator_names).is_at_least(2) }
-    it { should validate_presence_of :name }
+    it { is_expected.to ensure_length_of(:operator_names).is_at_least(2) }
+    it { is_expected.to validate_presence_of :name }
   end
 
   context '#children' do
@@ -45,7 +43,7 @@ describe MetasploitDataModels::Search::Operator::Multitext do
         nil
       }
 
-      it { should == [] }
+      it { is_expected.to eq([]) }
     end
 
     context 'with empty String' do
@@ -53,7 +51,7 @@ describe MetasploitDataModels::Search::Operator::Multitext do
         ''
       }
 
-      it { should == [] }
+      it { is_expected.to eq([]) }
     end
 
     context 'without quotes' do
@@ -82,7 +80,7 @@ describe MetasploitDataModels::Search::Operator::Multitext do
       }
 
       it 'generates a single union for quoted words as a single argument' do
-        expect(children).to have(1).items
+        expect(children.length).to eq(1)
 
         child = children.first
 
@@ -101,7 +99,7 @@ describe MetasploitDataModels::Search::Operator::Multitext do
     }
 
     context 'default' do
-      it { should be_nil }
+      it { is_expected.to be_nil }
     end
 
     context 'setter' do
@@ -123,7 +121,7 @@ describe MetasploitDataModels::Search::Operator::Multitext do
     }
 
     context 'default' do
-      it { should == [] }
+      it { is_expected.to eq([]) }
     end
   end
 

data/spec/app/models/metasploit_data_models/search/operator/port/list_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe MetasploitDataModels::Search::Operator::Port::List do
+RSpec.describe MetasploitDataModels::Search::Operator::Port::List, type: :model do
   subject(:port_list_operator) {
     described_class.new(
         klass: klass
@@ -17,7 +15,7 @@ describe MetasploitDataModels::Search::Operator::Port::List do
         described_class::SEPARATOR
       }
 
-      it { should == ',' }
+      it { is_expected.to eq(',') }
     end
   end
 
@@ -27,7 +25,7 @@ describe MetasploitDataModels::Search::Operator::Port::List do
     }
 
     context 'default' do
-      it { should == :port }
+      it { is_expected.to eq(:port) }
     end
 
     context 'setter' do
@@ -87,7 +85,7 @@ describe MetasploitDataModels::Search::Operator::Port::List do
               operation_range.value
             }
 
-            it { should be_a Range }
+            it { is_expected.to be_a Range }
           end
         end
       end
@@ -121,7 +119,7 @@ describe MetasploitDataModels::Search::Operator::Port::List do
               operation_range.value
             }
 
-            it { should be_an Integer }
+            it { is_expected.to be_an Integer }
           end
         end
       end
@@ -159,6 +157,6 @@ describe MetasploitDataModels::Search::Operator::Port::List do
       described_class.operator_name
     }
 
-    it { should == 'port_list' }
+    it { is_expected.to eq('port_list') }
   end
 end

data/spec/app/models/metasploit_data_models/search/visitor/attribute_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe MetasploitDataModels::Search::Visitor::Attribute do
+RSpec.describe MetasploitDataModels::Search::Visitor::Attribute, type: :model do
   subject(:visitor) do
     described_class.new
   end
@@ -22,7 +20,7 @@ describe MetasploitDataModels::Search::Visitor::Attribute do
       node_class = options.fetch(:node_class)
 
       context "with #{node_class}" do
-        it { should be_a Arel::Attributes::Attribute }
+        it { is_expected.to be_a Arel::Attributes::Attribute }
 
         context '#name' do
           subject(:name) do
@@ -30,7 +28,7 @@ describe MetasploitDataModels::Search::Visitor::Attribute do
           end
 
           it "should be #{node_class}#attribute" do
-            name.should == node.attribute
+            expect(name).to eq(node.attribute)
           end
         end
 
@@ -40,7 +38,7 @@ describe MetasploitDataModels::Search::Visitor::Attribute do
           end
 
           it "should be Class#arel_table for #{node_class}#klass" do
-            relation.should == node.klass.arel_table
+            expect(relation).to eq(node.klass.arel_table)
           end
         end
       end
@@ -58,19 +56,19 @@ describe MetasploitDataModels::Search::Visitor::Attribute do
       end
 
       it 'should visit Metasploit::Model::Search::Operator::Association#source_operator' do
-        visitor.should_receive(:visit).with(node).and_call_original
-        visitor.should_receive(:visit).with(source_operator)
+        expect(visitor).to receive(:visit).with(node).and_call_original
+        expect(visitor).to receive(:visit).with(source_operator)
 
         visit
       end
 
       it 'should return visit of Metasploit::Model::Search::Operator::Association#source_operator' do
-        visitor.should_receive(:visit).with(node).and_call_original
+        expect(visitor).to receive(:visit).with(node).and_call_original
 
         visited = double('Source Operator Visited')
-        visitor.stub(:visit).with(source_operator).and_return(visited)
+        allow(visitor).to receive(:visit).with(source_operator).and_return(visited)
 
-        visit.should == visited
+        expect(visit).to eq(visited)
       end
     end
 

data/spec/app/models/metasploit_data_models/search/visitor/includes_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe MetasploitDataModels::Search::Visitor::Includes do
+RSpec.describe MetasploitDataModels::Search::Visitor::Includes, type: :model do
   subject(:visitor) do
     described_class.new
   end
@@ -122,7 +120,7 @@ describe MetasploitDataModels::Search::Visitor::Includes do
         Metasploit::Model::Search::Operator::Attribute.new
       end
 
-      it { should == [] }
+      it { is_expected.to eq([]) }
     end
 
     context 'with MetasploitDataModels::Search::Operator::Port::List' do
@@ -130,7 +128,7 @@ describe MetasploitDataModels::Search::Visitor::Includes do
         MetasploitDataModels::Search::Operator::Port::List.new
       end
 
-      it { should == [] }
+      it { is_expected.to eq([]) }
     end
 
     context 'with Metasploit::Model::Search::Query#tree' do
@@ -160,7 +158,7 @@ describe MetasploitDataModels::Search::Visitor::Includes do
               "name:\"#{name}\""
             end
 
-            it { should be_empty }
+            it { is_expected.to be_empty }
           end
 
           context 'with services.name' do
@@ -172,7 +170,7 @@ describe MetasploitDataModels::Search::Visitor::Includes do
               "services.name:\"#{name}\""
             end
 
-            it { should include :services }
+            it { is_expected.to include :services }
           end
         end
       end

data/spec/app/models/metasploit_data_models/search/visitor/joins_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe MetasploitDataModels::Search::Visitor::Joins do
+RSpec.describe MetasploitDataModels::Search::Visitor::Joins, type: :model do
   subject(:visitor) do
     described_class.new
   end
@@ -33,10 +31,10 @@ describe MetasploitDataModels::Search::Visitor::Joins do
 
         it 'should visit each child' do
           # needed for call to visit subject
-          visitor.should_receive(:visit).with(node).and_call_original
+          expect(visitor).to receive(:visit).with(node).and_call_original
 
           children.each do |child|
-            visitor.should_receive(:visit).with(child).and_return([])
+            expect(visitor).to receive(:visit).with(child).and_return([])
           end
 
           visit
@@ -45,15 +43,15 @@ describe MetasploitDataModels::Search::Visitor::Joins do
         it 'should return Array of all child visits' do
           child_visits = []
 
-          visitor.should_receive(:visit).with(node).and_call_original
+          expect(visitor).to receive(:visit).with(node).and_call_original
 
           children.each_with_index do |child, i|
             child_visit = ["Visited Child #{i}"]
-            visitor.stub(:visit).with(child).and_return(child_visit)
+            allow(visitor).to receive(:visit).with(child).and_return(child_visit)
             child_visits.concat(child_visit)
           end
 
-          visit.should == child_visits
+          expect(visit).to eq(child_visits)
         end
       end
     end
@@ -81,7 +79,7 @@ describe MetasploitDataModels::Search::Visitor::Joins do
               }
             end
 
-            it { should == [] }
+            it { is_expected.to eq([]) }
           end
 
           context 'with association and attribute' do
@@ -117,7 +115,7 @@ describe MetasploitDataModels::Search::Visitor::Joins do
               ]
             end
 
-            it { should == [] }
+            it { is_expected.to eq([]) }
           end
 
           context 'with the same child join for all' do
@@ -145,7 +143,7 @@ describe MetasploitDataModels::Search::Visitor::Joins do
             end
 
             it 'should include association' do
-              visit.should include association
+              expect(visit).to include association
             end
           end
 
@@ -215,13 +213,13 @@ describe MetasploitDataModels::Search::Visitor::Joins do
 
               it 'should include common associations' do
                 common_associations.each do |association|
-                  visit.should include(association)
+                  expect(visit).to include(association)
                 end
               end
 
               it 'should not include disjoint associations' do
                 disjoint_associations.each do |association|
-                  visit.should_not include(association)
+                  expect(visit).not_to include(association)
                 end
               end
             end
@@ -231,7 +229,7 @@ describe MetasploitDataModels::Search::Visitor::Joins do
                 []
               end
 
-              it { should == [] }
+              it { is_expected.to eq([]) }
             end
           end
         end
@@ -241,7 +239,7 @@ describe MetasploitDataModels::Search::Visitor::Joins do
             []
           end
 
-          it { should == [] }
+          it { is_expected.to eq([]) }
         end
       end
     end
@@ -339,7 +337,7 @@ describe MetasploitDataModels::Search::Visitor::Joins do
         Metasploit::Model::Search::Operator::Attribute.new
       end
 
-      it { should == [] }
+      it { is_expected.to eq([]) }
     end
 
     context 'with MetasploitDataModels::Search::Operator::Port::List' do
@@ -347,7 +345,7 @@ describe MetasploitDataModels::Search::Visitor::Joins do
         MetasploitDataModels::Search::Operator::Port::List.new
       end
 
-      it { should == [] }
+      it { is_expected.to eq([]) }
     end
 
     context 'with Metasploit::Model::Search::Query#tree' do
@@ -377,7 +375,7 @@ describe MetasploitDataModels::Search::Visitor::Joins do
               "name:\"#{name}\""
             end
 
-            it { should be_empty }
+            it { is_expected.to be_empty }
           end
 
           context 'with services.name' do
@@ -389,7 +387,7 @@ describe MetasploitDataModels::Search::Visitor::Joins do
               "services.name:\"#{name}\""
             end
 
-            it { should include :services }
+            it { is_expected.to include :services }
           end
         end
       end

data/spec/app/models/metasploit_data_models/search/visitor/method_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe MetasploitDataModels::Search::Visitor::Method do
+RSpec.describe MetasploitDataModels::Search::Visitor::Method, type: :model do
   subject(:visitor) do
     described_class.new
   end
@@ -21,7 +19,7 @@ describe MetasploitDataModels::Search::Visitor::Method do
         Metasploit::Model::Search::Group::Intersection
       end
 
-      it { should == :and }
+      it { is_expected.to eq(:and) }
     end
 
     context 'with Metasploit::Model::Search::Operation::Group::Intersection' do
@@ -29,7 +27,7 @@ describe MetasploitDataModels::Search::Visitor::Method do
         Metasploit::Model::Search::Operation::Group::Intersection
       end
 
-      it { should == :and }
+      it { is_expected.to eq(:and) }
     end
 
     context 'with Metasploit::Model::Search::Group::Union' do
@@ -37,7 +35,7 @@ describe MetasploitDataModels::Search::Visitor::Method do
         Metasploit::Model::Search::Group::Union
       end
 
-      it { should == :or }
+      it { is_expected.to eq(:or) }
     end
 
     context 'with Metasploit::Model::Search::Operation::Group::Union' do
@@ -45,7 +43,7 @@ describe MetasploitDataModels::Search::Visitor::Method do
         Metasploit::Model::Search::Operation::Group::Union
       end
 
-      it { should == :or }
+      it { is_expected.to eq(:or) }
     end
   end
 end

data/spec/app/models/metasploit_data_models/search/visitor/relation_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe MetasploitDataModels::Search::Visitor::Relation do
+RSpec.describe MetasploitDataModels::Search::Visitor::Relation, type: :model do
   subject(:visitor) do
     described_class.new(
         :query => query
@@ -31,7 +29,7 @@ describe MetasploitDataModels::Search::Visitor::Relation do
 
   context 'validations' do
     context 'query' do
-      it { should validate_presence_of(:query) }
+      it { is_expected.to validate_presence_of(:query) }
 
       context 'valid' do
         let(:error) do
@@ -48,7 +46,7 @@ describe MetasploitDataModels::Search::Visitor::Relation do
           end
 
           before(:each) do
-            query.stub(:valid? => query)
+            allow(query).to receive(:valid?).and_return(query)
 
             visitor.valid?
           end
@@ -59,7 +57,7 @@ describe MetasploitDataModels::Search::Visitor::Relation do
             end
 
             it 'should not record error' do
-              errors.should_not include(error)
+              expect(errors).not_to include(error)
             end
           end
 
@@ -69,7 +67,7 @@ describe MetasploitDataModels::Search::Visitor::Relation do
             end
 
             it 'should record error' do
-              errors.should_not include(error)
+              expect(errors).not_to include(error)
             end
           end
         end
@@ -80,7 +78,7 @@ describe MetasploitDataModels::Search::Visitor::Relation do
           end
 
           it 'should not record error' do
-            errors.should_not include(error)
+            expect(errors).not_to include(error)
           end
         end
       end
@@ -98,16 +96,16 @@ describe MetasploitDataModels::Search::Visitor::Relation do
       end
 
       it 'should visit Metasploit::Model::Search::Query#tree' do
-        includes_visitor.should_receive(:visit).with(query.tree)
+        expect(includes_visitor).to receive(:visit).with(query.tree)
 
         visit
       end
 
       it 'should pass visited to ActiveRecord::Relation#includes' do
         visited = double('Visited')
-        includes_visitor.stub(:visit).with(query.tree).and_return(visited)
+        allow(includes_visitor).to receive(:visit).with(query.tree).and_return(visited)
 
-        ActiveRecord::Relation.any_instance.should_receive(:includes).with(visited).and_return(query.klass.scoped)
+        expect_any_instance_of(ActiveRecord::Relation).to receive(:includes).with(visited).and_return(query.klass.scoped)
 
         visit
       end
@@ -119,16 +117,16 @@ describe MetasploitDataModels::Search::Visitor::Relation do
       end
 
       it 'should visit Metasploit::Model::Search::Query#tree' do
-        joins_visitor.should_receive(:visit).with(query.tree)
+        expect(joins_visitor).to receive(:visit).with(query.tree)
 
         visit
       end
 
       it 'should pass visited to ActiveRecord::Relation#joins' do
         visited = double('Visited')
-        joins_visitor.stub(:visit).with(query.tree).and_return(visited)
+        allow(joins_visitor).to receive(:visit).with(query.tree).and_return(visited)
 
-        ActiveRecord::Relation.any_instance.should_receive(:joins).with(visited).and_return(query.klass.scoped)
+        expect_any_instance_of(ActiveRecord::Relation).to receive(:joins).with(visited).and_return(query.klass.scoped)
 
         visit
       end
@@ -140,16 +138,16 @@ describe MetasploitDataModels::Search::Visitor::Relation do
       end
 
       it 'should visit Metasploit::Model::Search::Query#tree' do
-        where_visitor.should_receive(:visit).with(query.tree)
+        expect(where_visitor).to receive(:visit).with(query.tree)
 
         visit
       end
 
       it 'should pass visited to ActiveRecord::Relation#includes' do
         visited = double('Visited')
-        where_visitor.stub(:visit).with(query.tree).and_return(visited)
+        allow(where_visitor).to receive(:visit).with(query.tree).and_return(visited)
 
-        ActiveRecord::Relation.any_instance.should_receive(:where).with(visited).and_return(query.klass.scoped)
+        expect_any_instance_of(ActiveRecord::Relation).to receive(:where).with(visited).and_return(query.klass.scoped)
 
         visit
       end
@@ -870,9 +868,29 @@ describe MetasploitDataModels::Search::Visitor::Relation do
       visitor.visitor_by_relation_method
     end
 
-    its([:joins]) { should be_a MetasploitDataModels::Search::Visitor::Joins }
-    its([:includes]) { should be_a MetasploitDataModels::Search::Visitor::Includes }
-    its([:where]) { should be_a MetasploitDataModels::Search::Visitor::Where }
+    context 'joins' do
+      subject(:joins) {
+        visitor_by_relation_method[:joins]
+      }
+
+      it { is_expected.to be_a MetasploitDataModels::Search::Visitor::Joins }
+    end
+
+    context 'includes' do
+      subject(:includes) {
+        visitor_by_relation_method[:includes]
+      }
+
+      it { is_expected.to be_a MetasploitDataModels::Search::Visitor::Includes }
+    end
+
+    context 'where' do
+      subject(:where) {
+        visitor_by_relation_method[:where]
+      }
+
+      it { is_expected.to be_a MetasploitDataModels::Search::Visitor::Where }
+    end
   end
 
   context 'visitor_class_by_relation_method' do
@@ -880,8 +898,28 @@ describe MetasploitDataModels::Search::Visitor::Relation do
       described_class.visitor_class_by_relation_method
     end
 
-    its([:joins]) { should == MetasploitDataModels::Search::Visitor::Joins }
-    its([:includes]) { should == MetasploitDataModels::Search::Visitor::Includes }
-    its([:where]) { should == MetasploitDataModels::Search::Visitor::Where }
+    context 'joins' do
+      subject(:joins) {
+        visitor_class_by_relation_method[:joins]
+      }
+
+      it { is_expected.to eq(MetasploitDataModels::Search::Visitor::Joins) }
+    end
+
+    context 'includes' do
+      subject(:includes) {
+        visitor_class_by_relation_method[:includes]
+      }
+
+      it { is_expected.to eq(MetasploitDataModels::Search::Visitor::Includes) }
+    end
+
+    context 'where' do
+      subject(:where) {
+        visitor_class_by_relation_method[:where]
+      }
+
+      it { is_expected.to eq(MetasploitDataModels::Search::Visitor::Where) }
+    end
   end
 end