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

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

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

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

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

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

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

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

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

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

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

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

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

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

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