metasploit_data_models 0.24.0 → 0.24.1.pre.rspec.pre.3.pre.1

data/spec/support/shared/examples/mdm/module/detail/supports_stance_with_mtype.rb

@@ -6,7 +6,7 @@ shared_examples_for 'Mdm::Module::Detail supports stance with mtype' do |mtype|
     end
 
     it 'should return true for supports_stance?' do
-      detail.supports_stance?.should be_true
+      expect(detail.supports_stance?).to eq(true)
     end
 
     context 'with nil stance' do
@@ -14,7 +14,7 @@ shared_examples_for 'Mdm::Module::Detail supports stance with mtype' do |mtype|
         nil
       end
 
-      it { should be_invalid }
+      it { is_expected.to be_invalid }
     end
 
     context "with 'aggresive' stance" do
@@ -22,7 +22,7 @@ shared_examples_for 'Mdm::Module::Detail supports stance with mtype' do |mtype|
         'aggressive'
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
 
     context "with 'passive' stance" do
@@ -30,7 +30,7 @@ shared_examples_for 'Mdm::Module::Detail supports stance with mtype' do |mtype|
         'passive'
       end
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
   end
 end

data/spec/support/shared/examples/metasploit_data_models/search/operation/ipaddress/match.rb

@@ -11,7 +11,7 @@ shared_examples_for 'MetasploitDataModels::Search::Operation::IPAddress::*.match
 
   shared_examples_for 'match' do |boolean|
     if boolean
-      it { should be_a described_class }
+      it { is_expected.to be_a described_class }
 
       it 'does not set #operator' do
         expect(match.operator).to be_nil
@@ -21,7 +21,7 @@ shared_examples_for 'MetasploitDataModels::Search::Operation::IPAddress::*.match
         expect(match.value).not_to be_nil
       end
     else
-      it { should be_nil }
+      it { is_expected.to be_nil }
     end
   end
 

data/spec/support/shared/examples/metasploit_data_models/search/visitor/includes/visit/with_children.rb

@@ -13,10 +13,10 @@ shared_examples_for 'MetasploitDataModels::Search::Visitor::Includes#visit with
 
   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
@@ -25,14 +25,14 @@ shared_examples_for 'MetasploitDataModels::Search::Visitor::Includes#visit with
   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

data/spec/support/shared/examples/metasploit_data_models/search/visitor/includes/visit/with_metasploit_model_search_operation_base.rb

@@ -10,17 +10,17 @@ shared_examples_for 'MetasploitDataModels::Search::Visitor::Includes#visit with
   end
 
   it 'should visit operator' do
-    visitor.should_receive(:visit).with(node).and_call_original
-    visitor.should_receive(:visit).with(operator).and_return([])
+    expect(visitor).to receive(:visit).with(node).and_call_original
+    expect(visitor).to receive(:visit).with(operator).and_return([])
 
     visit
   end
 
   it 'should return operator visit' do
     operator_visit = ["Visited Operator"]
-    visitor.should_receive(:visit).with(node).and_call_original
-    visitor.stub(:visit).with(operator).and_return(operator_visit)
+    expect(visitor).to receive(:visit).with(node).and_call_original
+    allow(visitor).to receive(:visit).with(operator).and_return(operator_visit)
 
-    visit.should == operator_visit
+    expect(visit).to eq(operator_visit)
   end
 end

data/spec/support/shared/examples/metasploit_data_models/search/visitor/where/visit/with_equality.rb

@@ -18,16 +18,16 @@ shared_examples_for 'MetasploitDataModels::Search::Visitor::Where#visit with equ
   end
 
   it 'should visit operation.operator with attribute_visitor' do
-    visitor.attribute_visitor.should_receive(:visit).with(operator).and_call_original
+    expect(visitor.attribute_visitor).to receive(:visit).with(operator).and_call_original
 
     visit
   end
 
   it 'should call eq on Arel::Attributes::Attribute from attribute_visitor' do
     attribute = double('Visited Operator')
-    visitor.attribute_visitor.stub(:visit).with(operator).and_return(attribute)
+    allow(visitor.attribute_visitor).to receive(:visit).with(operator).and_return(attribute)
 
-    attribute.should_receive(:eq).with(value)
+    expect(attribute).to receive(:eq).with(value)
 
     visit
   end

data/spec/support/shared/examples/metasploit_data_models/search/visitor/where/visit/with_metasploit_model_search_group_base.rb

@@ -16,22 +16,22 @@ shared_examples_for 'MetasploitDataModels::Search::Visitor::Where#visit with Met
   end
 
   it 'should visit each child' do
-    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(Arel::Nodes::Equality.new(1, 1))
+      expect(visitor).to receive(:visit).with(child).and_return(Arel::Nodes::Equality.new(1, 1))
     end
 
     visit
   end
 
   it "should combine children AREL with #{arel_class}" do
-    visitor.stub(:visit).with(node).and_call_original
+    allow(visitor).to receive(:visit).with(node).and_call_original
     child_visits = []
 
     children.each_with_index do |child, i|
       child_visit = Arel::Nodes::Equality.new(i, i)
-      visitor.stub(:visit).with(child).and_return(child_visit)
+      allow(visitor).to receive(:visit).with(child).and_return(child_visit)
       child_visits << child_visit
     end
 
@@ -43,8 +43,9 @@ shared_examples_for 'MetasploitDataModels::Search::Visitor::Where#visit with Met
       arel_pair = root
     end
 
-    arel_pair.should be_a arel_class
+    expect(arel_pair).to be_a arel_class
 
-    expect([arel_pair.left, arel_pair.right]).to match_array(child_visits)
+    expect(arel_pair.left).to eq(child_visits[0])
+    expect(arel_pair.right).to eq(child_visits[1])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.24.1.pre.rspec.pre.3.pre.1
 platform: ruby
 authors:
 - Samuel Huckins
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -123,14 +123,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.30.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.30.1
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -636,9 +636,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.3