metasploit_data_models 0.24.4 → 0.24.5

data/spec/app/models/metasploit_data_models/ip_address/v4/segment/segmented_spec.rb

@@ -1,11 +1,13 @@
-RSpec.describe MetasploitDataModels::IPAddress::V4::Segmented, type: :model do
+require 'spec_helper'
+
+describe MetasploitDataModels::IPAddress::V4::Segmented do
   context 'CONSTANTS' do
     context 'SEGMENT_COUNT' do
       subject(:segment_count) {
         described_class::SEGMENT_COUNT
       }
 
-      it { is_expected.to eq(4) }
+      it { should == 4 }
     end
 
     context 'SEPARATOR' do
@@ -13,7 +15,7 @@ RSpec.describe MetasploitDataModels::IPAddress::V4::Segmented, type: :model do
         described_class::SEPARATOR
       }
 
-      it { is_expected.to eq('.') }
+      it { should == '.' }
     end
   end
 
@@ -22,6 +24,6 @@ RSpec.describe MetasploitDataModels::IPAddress::V4::Segmented, type: :model do
       described_class.segment_count
     }
 
-    it { is_expected.to eq(4) }
+    it { should == 4 }
   end
 end

data/spec/app/models/metasploit_data_models/ip_address/v4/segment/single_spec.rb

@@ -1,4 +1,6 @@
-RSpec.describe MetasploitDataModels::IPAddress::V4::Segment::Single, type: :model do
+require 'spec_helper'
+
+describe MetasploitDataModels::IPAddress::V4::Segment::Single do
   subject(:single) {
     described_class.new(
         value: formatted_value
@@ -10,7 +12,7 @@ RSpec.describe MetasploitDataModels::IPAddress::V4::Segment::Single, type: :mode
   }
 
   context 'validations' do
-    it { is_expected.to validate_numericality_of(:value).is_greater_than_or_equal_to(0).is_less_than_or_equal_to(255).only_integer }
+    it { should validate_numericality_of(:value).is_greater_than_or_equal_to(0).is_less_than_or_equal_to(255).only_integer }
   end
 
   it 'can be used in a Range' do
@@ -135,7 +137,7 @@ RSpec.describe MetasploitDataModels::IPAddress::V4::Segment::Single, type: :mode
       described_class.bits
     }
 
-    it { is_expected.to eq(8) }
+    it { should == 8 }
   end
 
   context 'match_regexp' do
@@ -157,22 +159,15 @@ RSpec.describe MetasploitDataModels::IPAddress::V4::Segment::Single, type: :mode
       single <=> other
     }
 
-    let(:formatted_value) {
-      '1'
-    }
-
     let(:other) {
       double('Other')
     }
 
     it 'compares #values' do
       other_value = double('other.value')
-      single_value = double('single.value')
 
       expect(other).to receive(:value).and_return(other_value)
-      # have to use a double because can't expect().to receive on an Integer
-      expect(single).to receive(:value).and_return(single_value)
-      expect(single_value).to receive(:<=>).with(other_value)
+      expect(single.value).to receive(:<=>).with(other_value)
 
       compare
     end
@@ -190,9 +185,7 @@ RSpec.describe MetasploitDataModels::IPAddress::V4::Segment::Single, type: :mode
         }
 
         specify {
-          expect {
-            succ
-          }.not_to raise_error
+          expect(succ).not_to raise_error
         }
       end
 
@@ -205,7 +198,7 @@ RSpec.describe MetasploitDataModels::IPAddress::V4::Segment::Single, type: :mode
           1
         }
 
-        it { is_expected.to be_a described_class }
+        it { should be_a described_class }
 
         context 'succ.value' do
           it 'is succ of #value' do
@@ -219,7 +212,7 @@ RSpec.describe MetasploitDataModels::IPAddress::V4::Segment::Single, type: :mode
           'a'
         }
 
-        it { is_expected.to be_a described_class }
+        it { should be_a described_class }
 
         context 'succ.value' do
           it 'is succ of #value' do
@@ -269,7 +262,7 @@ RSpec.describe MetasploitDataModels::IPAddress::V4::Segment::Single, type: :mode
       end
 
       it 'should pass through Integer' do
-        expect(value).to eq(formatted_value)
+        value.should == formatted_value
       end
     end
 
@@ -283,7 +276,7 @@ RSpec.describe MetasploitDataModels::IPAddress::V4::Segment::Single, type: :mode
       end
 
       it 'should convert String to Integer' do
-        expect(value).to eq(integer)
+        value.should == integer
       end
     end
 
@@ -297,11 +290,11 @@ RSpec.describe MetasploitDataModels::IPAddress::V4::Segment::Single, type: :mode
       end
 
       it 'should not extract the number' do
-        expect(value).not_to eq(integer)
+        value.should_not == integer
       end
 
       it 'should pass through the full value' do
-        expect(value).to eq(formatted_value)
+        value.should == formatted_value
       end
     end
 
@@ -311,11 +304,11 @@ RSpec.describe MetasploitDataModels::IPAddress::V4::Segment::Single, type: :mode
       end
 
       it 'should not truncate Float to Integer' do
-        expect(value).not_to eq(formatted_value.to_i)
+        value.should_not == formatted_value.to_i
       end
 
       it 'should pass through Float' do
-        expect(value).to eq(formatted_value)
+        value.should == formatted_value
       end
     end
   end

data/spec/app/models/metasploit_data_models/ip_address/v4/single_spec.rb

@@ -1,4 +1,6 @@
-RSpec.describe MetasploitDataModels::IPAddress::V4::Single, type: :model do
+require 'spec_helper'
+
+describe MetasploitDataModels::IPAddress::V4::Single do
   subject(:single) {
     described_class.new(
         value: formatted_value
@@ -20,7 +22,7 @@ RSpec.describe MetasploitDataModels::IPAddress::V4::Single, type: :model do
           '1.2.3.4'
         }
 
-        it { is_expected.to be_empty }
+        it { should be_empty }
       end
 
       context 'without segments' do
@@ -35,7 +37,7 @@ RSpec.describe MetasploitDataModels::IPAddress::V4::Single, type: :model do
           )
         }
 
-        it { is_expected.to include length_error }
+        it { should include length_error }
       end
     end
   end
@@ -140,7 +142,7 @@ RSpec.describe MetasploitDataModels::IPAddress::V4::Single, type: :model do
         nil
       }
 
-      it { is_expected.to be_nil }
+      it { should be_nil }
     end
 
     context 'with matching formatted value' do

data/spec/app/models/metasploit_data_models/module_run_spec.rb

@@ -1,4 +1,6 @@
-RSpec.describe MetasploitDataModels::ModuleRun, type: :model do
+require 'spec_helper'
+
+describe MetasploitDataModels::ModuleRun do
 
   subject(:module_run){FactoryGirl.build(:metasploit_data_models_module_run)}
 

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

@@ -1,4 +1,6 @@
-RSpec.describe MetasploitDataModels::Search::Operation::IPAddress, type: :model do
+require 'spec_helper'
+
+describe MetasploitDataModels::Search::Operation::IPAddress do
   subject(:operation) {
     described_class.new(
         operator: operator,
@@ -43,7 +45,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::IPAddress, type: :model
               '1.2.3.4/8'
             }
 
-            it { is_expected.to be_empty }
+            it { should be_empty }
           end
 
           context 'without valid prefix_length' do
@@ -51,17 +53,17 @@ RSpec.describe MetasploitDataModels::Search::Operation::IPAddress, type: :model
               '1.2.3.4/36'
             }
 
-            it { is_expected.to include invalid_error }
+            it { should include invalid_error }
           end
         end
 
-        context 'with Nmap' do
-          context 'with valid segment range', pending: 'MSP-10712' do
+        context 'with Nmap', pending: 'MSP-10712' do
+          context 'with valid segment range' do
             let(:formatted_value) {
               '1-2.3.4.5'
             }
 
-            it { is_expected.to be_empty }
+            it { should be_empty }
           end
 
           context 'without valid segment range' do
@@ -69,7 +71,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::IPAddress, type: :model
               '2-1.3.4.5'
             }
 
-            it { is_expected.to include invalid_error }
+            it { should include invalid_error }
           end
         end
 
@@ -79,7 +81,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::IPAddress, type: :model
               '2.2.2.2-1.1.1.1'
             }
 
-            it { is_expected.to include invalid_error }
+            it { should include invalid_error }
           end
 
           context 'without ordered range' do
@@ -87,7 +89,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::IPAddress, type: :model
               '1.1.1.1-2.2.2.2'
             }
 
-            it { is_expected.to be_empty }
+            it { should be_empty }
           end
         end
 
@@ -105,8 +107,8 @@ RSpec.describe MetasploitDataModels::Search::Operation::IPAddress, type: :model
           nil
         }
 
-        it { is_expected.to include blank_error }
-        it { is_expected.not_to include invalid_error }
+        it { should include blank_error }
+        it { should_not include invalid_error }
       end
 
       context 'with empty string' do
@@ -114,8 +116,8 @@ RSpec.describe MetasploitDataModels::Search::Operation::IPAddress, type: :model
           ''
         }
 
-        it { is_expected.to include blank_error }
-        it { is_expected.not_to include invalid_error }
+        it { should include blank_error }
+        it { should_not include invalid_error }
       end
 
       context 'without matching formatted value' do
@@ -123,7 +125,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::IPAddress, type: :model
           'non_matching_value'
         }
 
-        it { is_expected.to include invalid_error }
+        it { should include invalid_error }
       end
     end
   end
@@ -139,7 +141,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::IPAddress, type: :model
           '1.2.3.4/8'
         }
 
-        it { is_expected.to be_a MetasploitDataModels::IPAddress::V4::CIDR }
+        it { should be_a MetasploitDataModels::IPAddress::V4::CIDR }
       end
 
       context 'with Nmap', pending: 'MSP-10712' do
@@ -147,7 +149,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::IPAddress, type: :model
           '1.2.3.4-5'
         }
 
-        it { is_expected.to be_a MetasploitDataModels::IPAddress::V4::Nmap }
+        it { should be_a MetasploitDataModels::IPAddress::V4::Nmap }
       end
 
       context 'with Range' do
@@ -155,7 +157,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::IPAddress, type: :model
           '1.1.1.1-2.2.2.2'
         }
 
-        it { is_expected.to be_a MetasploitDataModels::IPAddress::V4::Range }
+        it { should be_a MetasploitDataModels::IPAddress::V4::Range }
       end
 
       context 'with address' do
@@ -163,7 +165,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::IPAddress, type: :model
           '1.2.3.4'
         }
 
-        it { is_expected.to be_a MetasploitDataModels::IPAddress::V4::Single }
+        it { should be_a MetasploitDataModels::IPAddress::V4::Single }
       end
     end
 

data/spec/app/models/metasploit_data_models/search/operation/port/number_spec.rb

@@ -1,11 +1,13 @@
-RSpec.describe MetasploitDataModels::Search::Operation::Port::Number, type: :model do
+require 'spec_helper'
+
+describe MetasploitDataModels::Search::Operation::Port::Number do
   context 'CONSTANTS' do
     context 'BITS' do
       subject(:bits) {
         described_class::BITS
       }
 
-      it { is_expected.to eq(16) }
+      it { should == 16 }
     end
 
     context 'MAXIMUM' do
@@ -13,7 +15,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::Port::Number, type: :mod
         described_class::MAXIMUM
       }
 
-      it { is_expected.to eq(65535) }
+      it { should == 65535 }
     end
 
     context 'MINIMUM' do
@@ -21,7 +23,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::Port::Number, type: :mod
         described_class::MINIMUM
       }
 
-      it { is_expected.to eq(0) }
+      it { should == 0 }
     end
 
     context 'RANGE' do
@@ -29,11 +31,11 @@ RSpec.describe MetasploitDataModels::Search::Operation::Port::Number, type: :mod
         described_class::RANGE
       }
 
-      it { is_expected.to eq((0..65535)) }
+      it { should == (0..65535) }
     end
   end
 
   context 'validations' do
-    it { is_expected.to ensure_inclusion_of(:value).in_range(described_class::RANGE) }
+    it { should ensure_inclusion_of(:value).in_range(described_class::RANGE) }
   end
 end

data/spec/app/models/metasploit_data_models/search/operation/port/range_spec.rb

@@ -1,4 +1,6 @@
-RSpec.describe MetasploitDataModels::Search::Operation::Port::Range, type: :model do
+require 'spec_helper'
+
+describe MetasploitDataModels::Search::Operation::Port::Range do
   subject(:port_range_operation) {
     described_class.new(
         value: formatted_value
@@ -9,7 +11,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::Port::Range, type: :mode
     '1'
   }
 
-  it { is_expected.to be_a MetasploitDataModels::Search::Operation::Range }
+  it { should be_a MetasploitDataModels::Search::Operation::Range }
 
   context 'validations' do
     before(:each) do
@@ -28,7 +30,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::Port::Range, type: :mode
               '1-2'
             }
 
-            it { is_expected.to be_empty }
+            it { should be_empty }
           end
 
           # this can't actually happen because the minimum is 0 and a negative number can't be parsed, but validation
@@ -62,7 +64,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::Port::Range, type: :mode
               1
             }
 
-            it { is_expected.to include error }
+            it { should include error }
           end
 
           context 'without Range#begin covered by MetasploitDataModels::Search::Operation::Port::Number::RANGE' do
@@ -84,7 +86,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::Port::Range, type: :mode
               MetasploitDataModels::Search::Operation::Port::Number::MAXIMUM + 1
             }
 
-            it { is_expected.to include error }
+            it { should include error }
           end
         end
 
@@ -117,8 +119,8 @@ RSpec.describe MetasploitDataModels::Search::Operation::Port::Range, type: :mode
             'b'
           }
 
-          it { is_expected.to include begin_error }
-          it { is_expected.to include end_error }
+          it { should include begin_error }
+          it { should include end_error }
         end
       end
 
@@ -131,7 +133,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::Port::Range, type: :mode
           '1'
         }
 
-        it { is_expected.to include(error) }
+        it { should include(error) }
       end
     end
   end

data/spec/app/models/metasploit_data_models/search/operation/range_spec.rb

@@ -1,4 +1,6 @@
-RSpec.describe MetasploitDataModels::Search::Operation::Range, type: :model do
+require 'spec_helper'
+
+describe MetasploitDataModels::Search::Operation::Range do
   subject(:range_operation) {
     described_class.new(attributes)
   }
@@ -9,7 +11,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::Range, type: :model do
         described_class::SEPARATOR
       }
 
-      it { is_expected.to eq('-') }
+      it { should == '-' }
     end
   end
 
@@ -55,7 +57,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::Range, type: :model do
               '1-2'
             }
 
-            it { is_expected.not_to include(error) }
+            it { should_not include(error) }
           end
 
           context 'with begin same as end' do
@@ -70,7 +72,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::Range, type: :model do
               '1-1'
             }
 
-            it { is_expected.not_to include(error) }
+            it { should_not include(error) }
           end
 
           context 'with begin after end' do
@@ -85,7 +87,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::Range, type: :model do
               '2-1'
             }
 
-            it { is_expected.to include error }
+            it { should include error }
           end
         end
 
@@ -101,7 +103,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::Range, type: :model do
             '1..2'
           }
 
-          it { is_expected.not_to include(error) }
+          it { should_not include(error) }
         end
       end
 
@@ -111,7 +113,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::Range, type: :model do
             '1-2'
           }
 
-          it { is_expected.to be_empty }
+          it { should be_empty }
         end
 
         context 'without Range' do
@@ -123,7 +125,7 @@ RSpec.describe MetasploitDataModels::Search::Operation::Range, type: :model do
             '1..2'
           }
 
-          it { is_expected.to include error }
+          it { should include error }
         end
       end
     end