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

data/spec/app/models/metasploit_data_models/automatic_exploitation/match_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe MetasploitDataModels::AutomaticExploitation::Match do
+RSpec.describe MetasploitDataModels::AutomaticExploitation::Match, type: :model do
   it_should_behave_like 'Metasploit::Concern.run'
 
   describe "associations" do

data/spec/app/models/metasploit_data_models/automatic_exploitation/run_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe MetasploitDataModels::AutomaticExploitation::Run do
+RSpec.describe MetasploitDataModels::AutomaticExploitation::Run, type: :model do
   subject(:run) { FactoryGirl.create(:automatic_exploitation_run) }
 
 

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

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe MetasploitDataModels::IPAddress::V4::CIDR do
+RSpec.describe MetasploitDataModels::IPAddress::V4::CIDR, type: :model do
   subject(:cidr) {
     described_class.new(
         value: formatted_value
@@ -11,14 +9,14 @@ describe MetasploitDataModels::IPAddress::V4::CIDR do
     nil
   }
 
-  it { should be_a MetasploitDataModels::IPAddress::CIDR }
+  it { is_expected.to be_a MetasploitDataModels::IPAddress::CIDR }
 
   context 'address_class' do
     subject(:address_class) {
       described_class.address_class
     }
 
-    it { should == MetasploitDataModels::IPAddress::V4::Single }
+    it { is_expected.to eq(MetasploitDataModels::IPAddress::V4::Single) }
   end
 
   context 'validations' do
@@ -35,7 +33,7 @@ describe MetasploitDataModels::IPAddress::V4::CIDR do
         "#{formatted_address}/#{formatted_prefix_length}"
       }
 
-      it { should be_valid }
+      it { is_expected.to be_valid }
     end
 
     context 'with IPv4 address' do
@@ -43,7 +41,7 @@ describe MetasploitDataModels::IPAddress::V4::CIDR do
         formatted_address
       }
 
-      it { should_not be_valid }
+      it { is_expected.not_to be_valid }
 
       context 'errors' do
         before(:each) do
@@ -55,7 +53,7 @@ describe MetasploitDataModels::IPAddress::V4::CIDR do
             cidr.errors[:address]
           }
 
-          it { should be_empty }
+          it { is_expected.to be_empty }
         end
 
         context 'on #prefix_length' do
@@ -67,7 +65,7 @@ describe MetasploitDataModels::IPAddress::V4::CIDR do
             I18n.translate!('errors.messages.not_a_number')
           }
 
-          it { should include(blank_error) }
+          it { is_expected.to include(blank_error) }
         end
       end
     end
@@ -85,7 +83,7 @@ describe MetasploitDataModels::IPAddress::V4::CIDR do
         '48'
       }
 
-      it { should_not be_valid }
+      it { is_expected.not_to be_valid }
 
       context 'errors' do
         before(:each) do
@@ -101,7 +99,7 @@ describe MetasploitDataModels::IPAddress::V4::CIDR do
             I18n.translate!('errors.messages.invalid')
           }
 
-          it { should include(invalid_error) }
+          it { is_expected.to include(invalid_error) }
         end
 
         context 'on #prefix_length' do
@@ -113,7 +111,7 @@ describe MetasploitDataModels::IPAddress::V4::CIDR do
             I18n.translate!('errors.messages.less_than_or_equal_to', count: 32)
           }
 
-          it { should include(too_big_error) }
+          it { is_expected.to include(too_big_error) }
         end
       end
     end

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

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe MetasploitDataModels::IPAddress::V4::Nmap do
+RSpec.describe MetasploitDataModels::IPAddress::V4::Nmap, type: :model do
   subject(:nmap) {
     described_class.new(
         value: formatted_value
@@ -41,7 +39,7 @@ describe MetasploitDataModels::IPAddress::V4::Nmap do
             '1.2.3.4'
           }
 
-          it { should be_empty }
+          it { is_expected.to be_empty }
         end
       end
 
@@ -57,7 +55,7 @@ describe MetasploitDataModels::IPAddress::V4::Nmap do
           )
         }
 
-        it { should include length_error }
+        it { is_expected.to include length_error }
       end
     end
   end
@@ -86,7 +84,7 @@ describe MetasploitDataModels::IPAddress::V4::Nmap 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/ip_address/v4/range_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe MetasploitDataModels::IPAddress::V4::Range do
+RSpec.describe MetasploitDataModels::IPAddress::V4::Range, type: :model do
   subject(:range) {
     described_class.new(
         value: formatted_value
@@ -47,7 +45,7 @@ describe MetasploitDataModels::IPAddress::V4::Range do
             nil
           }
 
-          it { should include presence_error }
+          it { is_expected.to include presence_error }
         end
 
         context 'with MetasploitDataModels::IPAddress::V4::Single' do
@@ -56,7 +54,7 @@ describe MetasploitDataModels::IPAddress::V4::Range do
               '1.1.1.1-256.256.256.256'
             }
 
-            it { should_not include invalid_error }
+            it { is_expected.not_to include invalid_error }
           end
 
           context 'without valid' do
@@ -64,7 +62,7 @@ describe MetasploitDataModels::IPAddress::V4::Range do
               '256.256.256.256-257.257.257.257'
             }
 
-            it { should include invalid_error }
+            it { is_expected.to include invalid_error }
           end
         end
       end
@@ -81,7 +79,7 @@ describe MetasploitDataModels::IPAddress::V4::Range do
             nil
           }
 
-          it { should include presence_error }
+          it { is_expected.to include presence_error }
         end
 
         context 'with MetasploitDataModels::IPAddress::V4::Single' do
@@ -90,7 +88,7 @@ describe MetasploitDataModels::IPAddress::V4::Range do
               '256.256.256.256-1.1.1.1'
             }
 
-            it { should_not include invalid_error }
+            it { is_expected.not_to include invalid_error }
           end
 
           context 'without valid' do
@@ -98,7 +96,7 @@ describe MetasploitDataModels::IPAddress::V4::Range do
               '257.257.257.257-256.256.256.256'
             }
 
-            it { should include invalid_error }
+            it { is_expected.to include invalid_error }
           end
         end
       end
@@ -122,7 +120,7 @@ describe MetasploitDataModels::IPAddress::V4::Range do
           nil
         }
 
-        it { should_not include error }
+        it { is_expected.not_to include error }
       end
 
       context 'with incomparables' do
@@ -130,7 +128,7 @@ describe MetasploitDataModels::IPAddress::V4::Range do
           'a-1'
         }
 
-        it { should_not include error }
+        it { is_expected.not_to include error }
       end
 
       context 'with numbers' do
@@ -139,7 +137,7 @@ describe MetasploitDataModels::IPAddress::V4::Range do
             '1.1.1.1-2.2.2.2'
           }
 
-          it { should_not include error }
+          it { is_expected.not_to include error }
         end
 
         context 'out of order' do
@@ -147,7 +145,7 @@ describe MetasploitDataModels::IPAddress::V4::Range do
             '2.2.2.2-1.1.1.1'
           }
 
-          it { should include error }
+          it { is_expected.to include error }
         end
       end
     end
@@ -206,7 +204,7 @@ describe MetasploitDataModels::IPAddress::V4::Range do
         '1..2'
       }
 
-      it { should == '-' }
+      it { is_expected.to eq('-') }
     end
   end
 
@@ -221,14 +219,14 @@ describe MetasploitDataModels::IPAddress::V4::Range do
           '1.1.1.1-2.2.2.2'
         }
 
-        it { should be_a Range }
+        it { is_expected.to be_a Range }
 
         context 'Range#begin' do
           subject(:range_begin) {
             value.begin
           }
 
-          it { should be_a MetasploitDataModels::IPAddress::V4::Single }
+          it { is_expected.to be_a MetasploitDataModels::IPAddress::V4::Single }
 
           it "is value before '-'" do
             expect(range_begin).to eq(MetasploitDataModels::IPAddress::V4::Single.new(value: '1.1.1.1'))
@@ -240,7 +238,7 @@ describe MetasploitDataModels::IPAddress::V4::Range do
             value.end
           }
 
-          it { should be_a MetasploitDataModels::IPAddress::V4::Single }
+          it { is_expected.to be_a MetasploitDataModels::IPAddress::V4::Single }
 
           it "is value after '-'" do
             expect(range_end).to eq(MetasploitDataModels::IPAddress::V4::Single.new(value: '2.2.2.2'))
@@ -253,21 +251,21 @@ describe MetasploitDataModels::IPAddress::V4::Range do
           '-'
         }
 
-        it { should be_a Range }
+        it { is_expected.to be_a Range }
 
         context 'Range#begin' do
           subject(:range_begin) {
             value.begin
           }
 
-          it { should be_a MetasploitDataModels::IPAddress::V4::Single }
+          it { is_expected.to be_a MetasploitDataModels::IPAddress::V4::Single }
 
           context 'MetasploitDataModels::IPAddress::V4::Single#value' do
             subject(:begin_value) {
               range_begin.value
             }
 
-            it { should == '' }
+            it { is_expected.to eq('') }
           end
         end
 
@@ -276,14 +274,14 @@ describe MetasploitDataModels::IPAddress::V4::Range do
             value.end
           }
 
-          it { should be_a MetasploitDataModels::IPAddress::V4::Single }
+          it { is_expected.to be_a MetasploitDataModels::IPAddress::V4::Single }
 
           context 'MetasploitDataModels::IPAddress::V4::Single#value' do
             subject(:end_value) {
               range_end.value
             }
 
-            it { should == '' }
+            it { is_expected.to eq('') }
           end
         end
       end
@@ -294,7 +292,7 @@ describe MetasploitDataModels::IPAddress::V4::Range do
         '1'
       end
 
-      it { should_not be_a Range }
+      it { is_expected.not_to be_a Range }
     end
   end
 end

data/spec/app/models/metasploit_data_models/ip_address/v4/segment/nmap/list_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::List do
+RSpec.describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::List, type: :model do
   subject(:nmap) {
     described_class.new(
         value: formatted_value
@@ -68,7 +66,7 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::List do
         described_class::SEPARATOR
       }
 
-      it { should == ',' }
+      it { is_expected.to eq(',') }
     end
   end
 
@@ -91,7 +89,7 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::List do
           nil
         }
 
-        it { should include blank_error }
+        it { is_expected.to include blank_error }
       end
 
       context 'with matching String' do
@@ -100,7 +98,7 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::List do
             '1,2-3'
           }
 
-          it { should be_empty }
+          it { is_expected.to be_empty }
         end
 
         context 'with invalid MetasploitDataModels::IPAddress::V4::Nmap::Range' do
@@ -131,7 +129,7 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::List do
           'non_matching_string'
         }
 
-        it { should include array_error }
+        it { is_expected.to include array_error }
       end
     end
   end
@@ -185,7 +183,7 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::List do
           value.first
         }
 
-        it { should be_a MetasploitDataModels::IPAddress::V4::Segment::Single }
+        it { is_expected.to be_a MetasploitDataModels::IPAddress::V4::Segment::Single }
 
         context 'MetasploitDataModels::IPAddress::V4::Segment::Single#value' do
           it 'is value from formatted_value' do
@@ -217,7 +215,7 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::List do
           value.first
         }
 
-        it { should be_a MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range }
+        it { is_expected.to be_a MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range }
 
         context 'MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range#value' do
           subject(:element_value) {
@@ -229,7 +227,7 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::List do
               element_value.begin
             }
 
-            it { should be_a MetasploitDataModels::IPAddress::V4::Segment::Single }
+            it { is_expected.to be_a MetasploitDataModels::IPAddress::V4::Segment::Single }
 
             context 'MetasploitDataModels::IPAddress::V4::Segment::Single#value' do
               it 'is beginning of formatted value' do
@@ -243,7 +241,7 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::List do
               element_value.end
             }
 
-            it { should be_a MetasploitDataModels::IPAddress::V4::Segment::Single }
+            it { is_expected.to be_a MetasploitDataModels::IPAddress::V4::Segment::Single }
 
             context 'MetasploitDataModels::IPAddress::V4::Segment::Single#value' do
               it 'is beginning of formatted value' do

data/spec/app/models/metasploit_data_models/ip_address/v4/segment/nmap/range_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range do
+RSpec.describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range, type: :model do
   subject(:range) {
     described_class.new(
         value: formatted_value
@@ -47,7 +45,7 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range do
             nil
           }
 
-          it { should include presence_error }
+          it { is_expected.to include presence_error }
         end
 
         context 'with MetasploitDataModels::IPAddress::V4::Segment' do
@@ -56,7 +54,7 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range do
               '1-256'
             }
 
-            it { should_not include invalid_error }
+            it { is_expected.not_to include invalid_error }
           end
 
           context 'without valid' do
@@ -64,7 +62,7 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range do
               '256-257'
             }
 
-            it { should include invalid_error }
+            it { is_expected.to include invalid_error }
           end
         end
       end
@@ -81,7 +79,7 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range do
             nil
           }
 
-          it { should include presence_error }
+          it { is_expected.to include presence_error }
         end
 
         context 'with MetasploitDataModels::IPAddress::V4::Segment' do
@@ -90,7 +88,7 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range do
               '256-1'
             }
 
-            it { should_not include invalid_error }
+            it { is_expected.not_to include invalid_error }
           end
 
           context 'without valid' do
@@ -98,7 +96,7 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range do
               '257-256'
             }
 
-            it { should include invalid_error }
+            it { is_expected.to include invalid_error }
           end
         end
       end
@@ -122,7 +120,7 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range do
           nil
         }
 
-        it { should_not include error }
+        it { is_expected.not_to include error }
       end
 
       context 'with incomparables' do
@@ -130,7 +128,7 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range do
           'a-1'
         }
 
-        it { should_not include error }
+        it { is_expected.not_to include error }
       end
 
       context 'with numbers' do
@@ -139,7 +137,7 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range do
             '1-2'
           }
 
-          it { should_not include error }
+          it { is_expected.not_to include error }
         end
 
         context 'out of order' do
@@ -147,7 +145,7 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range do
             '2-1'
           }
 
-          it { should include error }
+          it { is_expected.to include error }
         end
       end
     end
@@ -206,7 +204,7 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range do
         '1..2'
       }
 
-      it { should == '-' }
+      it { is_expected.to eq('-') }
     end
   end
 
@@ -221,14 +219,14 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range do
           '1-2'
         }
 
-        it { should be_a Range }
+        it { is_expected.to be_a Range }
 
         context 'Range#begin' do
           subject(:range_begin) {
             value.begin
           }
 
-          it { should be_a MetasploitDataModels::IPAddress::V4::Segment::Single }
+          it { is_expected.to be_a MetasploitDataModels::IPAddress::V4::Segment::Single }
 
           context 'MetasploitDataModels::IPAddress::V4::Segment::Single#value' do
             it "is value before '-'" do
@@ -242,7 +240,7 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range do
             value.end
           }
 
-          it { should be_a MetasploitDataModels::IPAddress::V4::Segment::Single }
+          it { is_expected.to be_a MetasploitDataModels::IPAddress::V4::Segment::Single }
 
           context 'MetasploitDataModels::IPAddress::V4::Segment::Single#value' do
             it "is value after '-'" do
@@ -257,21 +255,21 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range do
           '-'
         }
 
-        it { should be_a Range }
+        it { is_expected.to be_a Range }
 
         context 'Range#begin' do
           subject(:range_begin) {
             value.begin
           }
 
-          it { should be_a MetasploitDataModels::IPAddress::V4::Segment::Single }
+          it { is_expected.to be_a MetasploitDataModels::IPAddress::V4::Segment::Single }
 
           context 'MetasploitDataModels::IPAddress::V4::Segment::Single#value' do
             subject(:begin_value) {
               range_begin.value
             }
 
-            it { should == '' }
+            it { is_expected.to eq('') }
           end
         end
 
@@ -280,14 +278,14 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range do
             value.end
           }
 
-          it { should be_a MetasploitDataModels::IPAddress::V4::Segment::Single }
+          it { is_expected.to be_a MetasploitDataModels::IPAddress::V4::Segment::Single }
 
           context 'MetasploitDataModels::IPAddress::V4::Segment::Single#value' do
             subject(:end_value) {
               range_end.value
             }
 
-            it { should == '' }
+            it { is_expected.to eq('') }
           end
         end
       end
@@ -298,7 +296,7 @@ describe MetasploitDataModels::IPAddress::V4::Segment::Nmap::Range do
         '1'
       end
 
-      it { should_not be_a Range }
+      it { is_expected.not_to be_a Range }
     end
   end
 end