metasploit-model 0.30.0-java → 0.30.1-java

data/spec/app/validators/nil_validator_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe NilValidator do
+RSpec.describe NilValidator do
   subject(:nil_validator) do
     described_class.new(
         :attributes => attributes
@@ -50,7 +48,7 @@ describe NilValidator do
       it 'should record error on attribute' do
         validate_each
 
-        record.errors[attribute].should include('must be nil')
+        expect(record.errors[attribute]).to include('must be nil')
       end
     end
 
@@ -62,7 +60,7 @@ describe NilValidator do
       it 'should not record any error' do
         validate_each
 
-        record.errors.should be_empty
+        expect(record.errors).to be_empty
       end
     end
   end

data/spec/app/validators/parameters_validator_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ParametersValidator do
+RSpec.describe ParametersValidator do
   subject(:parameters_validator) do
     described_class.new(
         :attributes => attributes
@@ -29,7 +27,7 @@ describe ParametersValidator do
 
   context 'CONSTANTS' do
     it 'should define TYPE_SIGNATURE_SENTENCE' do
-      described_class::TYPE_SIGNATURE_SENTENCE.should == type_signature_sentence
+      expect(described_class::TYPE_SIGNATURE_SENTENCE).to eq(type_signature_sentence)
     end
   end
 
@@ -48,7 +46,7 @@ describe ParametersValidator do
     end
 
     it 'should include prefix' do
-      error_at.should include(prefix)
+      expect(error_at).to include(prefix)
     end
 
     it 'should include location_clause in same sentence as prefix' do
@@ -58,11 +56,11 @@ describe ParametersValidator do
           :index => index
       )
 
-      error_at.should include("#{prefix} #{location_clause}.")
+      expect(error_at).to include("#{prefix} #{location_clause}.")
     end
 
     it 'should include TYPE_SIGNATURE_SENTENCE' do
-      error_at.should include(type_signature_sentence)
+      expect(error_at).to include(type_signature_sentence)
     end
   end
 
@@ -81,9 +79,9 @@ describe ParametersValidator do
     end
 
     it 'should include extreme in prefix' do
-      parameters_validator.should_receive(:error_at) do |*args|
+      expect(parameters_validator).to receive(:error_at) do |*args|
         options = args.first
-        options[:prefix].should include(extreme.to_s)
+        expect(options[:prefix]).to include(extreme.to_s)
       end
 
       length_error_at
@@ -100,11 +98,11 @@ describe ParametersValidator do
     end
 
     it 'should include numerical index' do
-      location_clause.should include("at index #{index}")
+      expect(location_clause).to include("at index #{index}")
     end
 
     it 'should include inspect of element' do
-      location_clause.should include(element.inspect)
+      expect(location_clause).to include(element.inspect)
     end
   end
 
@@ -144,7 +142,7 @@ describe ParametersValidator do
             end
 
             it 'should call #length_error_at with :extreme => :few' do
-              parameters_validator.should_receive(:length_error_at).with(
+              expect(parameters_validator).to receive(:length_error_at).with(
                   hash_including(
                       :extreme => :few
                   )
@@ -156,7 +154,7 @@ describe ParametersValidator do
             it 'should record error' do
               validate_each
 
-              errors.should_not be_empty
+              expect(errors).not_to be_empty
             end
           end
 
@@ -166,7 +164,7 @@ describe ParametersValidator do
             end
 
             it 'should call #length_error_at with :extreme => :many' do
-              parameters_validator.should_receive(:length_error_at).with(
+              expect(parameters_validator).to receive(:length_error_at).with(
                   hash_including(
                       :extreme => :many
                   )
@@ -178,7 +176,7 @@ describe ParametersValidator do
             it 'should record error' do
               validate_each
 
-              errors.should_not be_empty
+              expect(errors).not_to be_empty
             end
           end
 
@@ -203,7 +201,7 @@ describe ParametersValidator do
                   end
 
                   it 'should call error_at with blank parameter name prefix' do
-                    parameters_validator.should_receive(:error_at).with(
+                    expect(parameters_validator).to receive(:error_at).with(
                         hash_including(
                           :prefix => 'has blank parameter name'
                         )
@@ -215,7 +213,7 @@ describe ParametersValidator do
                   it 'should record error' do
                     validate_each
 
-                    errors.should_not be_empty
+                    expect(errors).not_to be_empty
                   end
                 end
 
@@ -227,7 +225,7 @@ describe ParametersValidator do
                   it 'should not record error' do
                     validate_each
 
-                    errors.should be_blank
+                    expect(errors).to be_blank
                   end
                 end
               end
@@ -238,7 +236,7 @@ describe ParametersValidator do
                 end
 
                 it 'should call error_at with non-String prefix' do
-                  parameters_validator.should_receive(:error_at).with(
+                  expect(parameters_validator).to receive(:error_at).with(
                       hash_including(
                           :prefix => "has non-String parameter name (#{parameter_name.inspect})"
                       )
@@ -250,7 +248,7 @@ describe ParametersValidator do
                 it 'should record error' do
                   validate_each
 
-                  errors.should_not be_empty
+                  expect(errors).not_to be_empty
                 end
               end
             end
@@ -264,7 +262,7 @@ describe ParametersValidator do
                 it 'should not record error' do
                   validate_each
 
-                  errors.should be_blank
+                  expect(errors).to be_blank
                 end
               end
 
@@ -274,7 +272,7 @@ describe ParametersValidator do
                 end
 
                 it 'should call error_at with non-String prefix' do
-                  parameters_validator.should_receive(:error_at).with(
+                  expect(parameters_validator).to receive(:error_at).with(
                       hash_including(
                           :prefix => "has non-String parameter value (#{parameter_value.inspect})"
                       )
@@ -286,7 +284,7 @@ describe ParametersValidator do
                 it 'should record error' do
                   validate_each
 
-                  errors.should_not be_empty
+                  expect(errors).not_to be_empty
                 end
               end
             end
@@ -299,7 +297,7 @@ describe ParametersValidator do
           end
 
           it 'should use #error_at with has non-Array for prefix' do
-            parameters_validator.should_receive(:error_at).with(
+            expect(parameters_validator).to receive(:error_at).with(
                 hash_including(
                     :prefix => 'has non-Array'
                 )
@@ -311,7 +309,7 @@ describe ParametersValidator do
           it 'should record error' do
             validate_each
 
-            errors.should_not be_empty
+            expect(errors).not_to be_empty
           end
         end
       end
@@ -327,14 +325,16 @@ describe ParametersValidator do
       end
 
       it 'should error that attribute is not an array' do
-        errors.any? { |error|
-          error.include? 'is not an Array.'
-        }.should be_true
+        expect(
+            errors.any? { |error|
+              error.include? 'is not an Array.'
+            }
+        ).to eq(true)
       end
 
       it 'should include TYPE_SIGNATURE_SENTENCE' do
         errors.each do |error|
-          error.should include(type_signature_sentence)
+          expect(error).to include(type_signature_sentence)
         end
       end
     end

data/spec/app/validators/password_is_strong_validator_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe PasswordIsStrongValidator do
+RSpec.describe PasswordIsStrongValidator do
   subject(:password_is_strong_validator) do
     described_class.new(
         :attributes => attributes
@@ -27,7 +25,7 @@ describe PasswordIsStrongValidator do
         'aaaaa'
       end
 
-      it { should be_true }
+      it { is_expected.to eq(true) }
     end
 
     context 'with repeats of 2 characters' do
@@ -35,7 +33,7 @@ describe PasswordIsStrongValidator do
         'abab'
       end
 
-      it { should be_true }
+      it { is_expected.to eq(true) }
     end
 
     context 'with repeats of 3 characters' do
@@ -43,7 +41,7 @@ describe PasswordIsStrongValidator do
         'abcabc'
       end
 
-      it { should be_true }
+      it { is_expected.to eq(true) }
     end
 
     context 'with repeats of 4 characters' do
@@ -51,7 +49,7 @@ describe PasswordIsStrongValidator do
         'abcdabcd'
       end
 
-      it { should be_true }
+      it { is_expected.to eq(true) }
     end
 
     context 'without any repeats' do
@@ -59,7 +57,7 @@ describe PasswordIsStrongValidator do
         'abcdefgh'
       end
 
-      it { should be_false }
+      it { is_expected.to eq(false) }
     end
   end
 
@@ -77,7 +75,7 @@ describe PasswordIsStrongValidator do
         ''
       end
 
-      it { should be_false }
+      it { is_expected.to eq(false) }
     end
 
     context 'without blank password' do
@@ -90,7 +88,7 @@ describe PasswordIsStrongValidator do
           ''
         end
 
-        it { should be_false }
+        it { is_expected.to eq(false) }
       end
 
       context 'without blank username' do
@@ -99,7 +97,7 @@ describe PasswordIsStrongValidator do
         end
 
         it 'should escape username' do
-          Regexp.should_receive(:escape).with(username).and_call_original
+          expect(Regexp).to receive(:escape).with(username).and_call_original
 
           contains_username?
         end
@@ -110,7 +108,7 @@ describe PasswordIsStrongValidator do
               username.titleize
             end
 
-            it { should be_true }
+            it { is_expected.to eq(true) }
           end
 
           context 'of same case' do
@@ -118,7 +116,7 @@ describe PasswordIsStrongValidator do
               username
             end
 
-            it { should be_true }
+            it { is_expected.to eq(true) }
           end
         end
       end
@@ -167,7 +165,7 @@ describe PasswordIsStrongValidator do
       it 'should not record any error' do
         validate_each
 
-        record.errors.should be_empty
+        expect(record.errors).to be_empty
       end
     end
 
@@ -180,7 +178,7 @@ describe PasswordIsStrongValidator do
         it 'should record error on attributes' do
           validate_each
 
-          record.errors[attribute].should include('must contain letters, numbers, and at least one special character')
+          expect(record.errors[attribute]).to include('must contain letters, numbers, and at least one special character')
         end
       end
 
@@ -201,7 +199,7 @@ describe PasswordIsStrongValidator do
           it 'should record error on attribute' do
             validate_each
 
-            record.errors[attribute].should include('must not contain the username')
+            expect(record.errors[attribute]).to include('must not contain the username')
           end
         end
 
@@ -214,7 +212,7 @@ describe PasswordIsStrongValidator do
             it 'should record error on attribute' do
               validate_each
 
-              record.errors[attribute].should include('must not be a common password')
+              expect(record.errors[attribute]).to include('must not be a common password')
             end
           end
 
@@ -227,7 +225,7 @@ describe PasswordIsStrongValidator do
               it 'should record error on attribute' do
                 validate_each
 
-                record.errors[attribute].should include('must not be a predictable sequence of characters')
+                expect(record.errors[attribute]).to include('must not be a predictable sequence of characters')
               end
             end
 
@@ -239,7 +237,7 @@ describe PasswordIsStrongValidator do
               it 'should not record any errors' do
                 validate_each
 
-                record.errors.should be_empty
+                expect(record.errors).to be_empty
               end
             end
           end

data/spec/lib/metasploit/model/association/error_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Association::Error do
+RSpec.describe Metasploit::Model::Association::Error do
   context '#initialize' do
     let(:attributes) do
       {

data/spec/lib/metasploit/model/association_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Association do
+RSpec.describe Metasploit::Model::Association do
   subject(:base_class) do
     described_class = self.described_class
 
@@ -54,7 +52,7 @@ describe Metasploit::Model::Association do
           end
 
           it 'should be class on which association was called' do
-            model.should == base_class
+            expect(model).to eq(base_class)
           end
         end
 
@@ -64,7 +62,7 @@ describe Metasploit::Model::Association do
           end
 
           it 'should be name passed to association as a Symbol' do
-            reflection_name.should == name.to_sym
+            expect(reflection_name).to eq(name.to_sym)
           end
         end
 
@@ -74,7 +72,7 @@ describe Metasploit::Model::Association do
           end
 
           it 'should be :class_name passed to association' do
-            reflection_class_name.should == class_name
+            expect(reflection_class_name).to eq(class_name)
           end
         end
       end
@@ -87,7 +85,7 @@ describe Metasploit::Model::Association do
     end
 
     it 'should default to empty Hash' do
-      association_by_name.should == {}
+      expect(association_by_name).to eq({})
     end
   end
 
@@ -119,7 +117,7 @@ describe Metasploit::Model::Association do
         end
 
         it 'should be class_name passed to association' do
-          reflection_class_name.should == class_name
+          expect(reflection_class_name).to eq(class_name)
         end
       end
 
@@ -129,7 +127,7 @@ describe Metasploit::Model::Association do
         end
 
         it 'should have the reflected name' do
-          reflection.name.should == reflected_name
+          expect(reflection.name).to eq(reflected_name)
         end
       end
     end
@@ -139,7 +137,7 @@ describe Metasploit::Model::Association do
         :unassociated_things
       end
 
-      it { should be_nil }
+      it { is_expected.to be_nil }
     end
   end
 end