metasploit-model 0.30.0-java → 0.30.1-java

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

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Base do
+RSpec.describe Metasploit::Model::Base do
   subject(:base_class) do
     Class.new(described_class)
   end
@@ -12,7 +10,7 @@ describe Metasploit::Model::Base do
     it 'should use public_send to set attributes' do
       attribute = :attribute
       value = double('Value')
-      base_class.any_instance.should_receive(:public_send).with("#{attribute}=", value)
+      expect_any_instance_of(base_class).to receive(:public_send).with("#{attribute}=", value)
 
       base_class.new(attribute => value)
     end
@@ -28,7 +26,7 @@ describe Metasploit::Model::Base do
     end
 
     before(:each) do
-      base_instance.stub(:valid? => valid)
+      allow(base_instance).to receive(:valid?).and_return(valid)
     end
 
     context 'with valid' do

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

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Engine do
+RSpec.describe Metasploit::Model::Engine do
   context 'config' do
     subject(:config) do
       described_class.config
@@ -21,7 +19,13 @@ describe Metasploit::Model::Engine do
             options[:factory_girl]
           end
 
-          its([:dir]) { should == 'spec/factories' }
+          context 'dir' do
+            subject(:dir) {
+              factory_girl[:dir]
+            }
+
+            it { is_expected.to eq('spec/factories') }
+          end
         end
 
         context 'rails' do
@@ -29,10 +33,37 @@ describe Metasploit::Model::Engine do
             options[:rails]
           end
 
-          its([:assets]) { should be_false }
-          its([:fixture_replacement]) { should == :factory_girl }
-          its([:helper]) { should be_false }
-          its([:test_framework]) { should == :rspec }
+          context 'assets' do
+            subject(:assets) {
+              rails[:assets]
+            }
+
+            it { is_expected.to eq(false) }
+          end
+
+          context 'fixture_replacement' do
+            subject(:fixture_replacement) {
+              rails[:fixture_replacement]
+            }
+
+            it { is_expected.to eq(:factory_girl) }
+          end
+
+          context 'helper' do
+            subject(:helper) {
+              rails[:helper]
+            }
+
+            it { is_expected.to eq(false) }
+          end
+
+          context 'test_framework' do
+            subject(:test_framework) {
+              rails[:test_framework]
+            }
+
+            it { is_expected.to eq(:rspec) }
+          end
         end
 
         context 'rspec' do
@@ -40,7 +71,13 @@ describe Metasploit::Model::Engine do
             options[:rspec]
           end
 
-          its([:fixture]) { should be_false }
+          context 'fixture' do
+            subject(:fixture) {
+              rspec[:fixture]
+            }
+
+            it { is_expected.to eq(false) }
+          end
         end
       end
     end
@@ -61,7 +98,7 @@ describe Metasploit::Model::Engine do
       end
 
       it 'should run after factory_girl.set_factory_paths' do
-        initializer.after.should == 'factory_girl.set_factory_paths'
+        expect(initializer.after).to eq('factory_girl.set_factory_paths')
       end
 
       context 'running' do
@@ -73,7 +110,7 @@ describe Metasploit::Model::Engine do
           it 'should prepend full path to spec/factories to FactoryGirl.definition_file_paths' do
             definition_file_path = Metasploit::Model::Engine.root.join('spec', 'factories')
 
-            FactoryGirl.definition_file_paths.should_receive(:unshift).with(definition_file_path)
+            expect(FactoryGirl.definition_file_paths).to receive(:unshift).with(definition_file_path)
 
             run
           end

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

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::File do
+RSpec.describe Metasploit::Model::File do
   unless RUBY_PLATFORM =~ /java/ && Gem::Version.new(JRUBY_VERSION) < Gem::Version.new('1.7.14')
     it 'aliases ::File' do
       expect(described_class).to equal(::File)
@@ -38,12 +36,12 @@ describe Metasploit::Model::File do
 
     if RUBY_PLATFORM =~ /java/ && Gem::Version.new(JRUBY_VERSION) < Gem::Version.new('1.7.14')
       it 'should be necessary because File.realpath does not resolve symlinks' do
-        File.realpath(symlink_pathname.to_path).should_not == real_pathname.to_path
+        expect(File.realpath(symlink_pathname.to_path)).not_to eq(real_pathname.to_path)
       end
     end
 
     it 'should resolve symlink to real (canonical) path' do
-      realpath.should == real_pathname.to_path
+      expect(realpath).to eq(real_pathname.to_path)
     end
   end
 end

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

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Invalid do
+RSpec.describe Metasploit::Model::Invalid do
   subject(:invalid) do
     described_class.new(model)
   end
@@ -15,16 +13,16 @@ describe Metasploit::Model::Invalid do
     end
   end
 
-  it { should be_a Metasploit::Model::Error }
+  it { is_expected.to be_a Metasploit::Model::Error }
 
   it 'should use ActiveModel::Errors#full_messages' do
-    model.errors.should_receive(:full_messages).and_call_original
+    expect(model.errors).to receive(:full_messages).and_call_original
 
     described_class.new(model)
   end
 
   it 'should translate errors using metasploit.model.invalid' do
-    I18n.should_receive(:translate).with(
+    expect(I18n).to receive(:translate).with(
         'metasploit.model.errors.messages.model_invalid',
         hash_including(
             :errors => anything
@@ -36,10 +34,10 @@ describe Metasploit::Model::Invalid do
 
   it 'should set translated errors as message' do
     message = "translated message"
-    I18n.stub(:translate).with('metasploit.model.errors.messages.model_invalid', anything).and_return(message)
+    allow(I18n).to receive(:translate).with('metasploit.model.errors.messages.model_invalid', anything).and_return(message)
     instance = described_class.new(model)
 
-    instance.message.should == message
+    expect(instance.message).to eq(message)
   end
 
   context '#model' do
@@ -48,7 +46,7 @@ describe Metasploit::Model::Invalid do
     end
 
     it 'should be the passed in model' do
-      error_model.should == model
+      expect(error_model).to eq(model)
     end
   end
 end

data/spec/lib/metasploit/model/login/status_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Login::Status do
+RSpec.describe Metasploit::Model::Login::Status do
   context 'CONSTANTS' do
     context 'ALL' do
       subject(:all) {

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

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::NilifyBlanks do
+RSpec.describe Metasploit::Model::NilifyBlanks do
   let(:base_class) do
     # capture for class_eval scope
     described_class = self.described_class
@@ -24,7 +22,7 @@ describe Metasploit::Model::NilifyBlanks do
     end
 
     it 'should register #nilify_blanks as a before validation callback' do
-      base_class.should_receive(:before_validation).with(:nilify_blanks)
+      expect(base_class).to receive(:before_validation).with(:nilify_blanks)
 
       # capture for class_eval scope
       described_class = self.described_class
@@ -39,10 +37,10 @@ describe Metasploit::Model::NilifyBlanks do
     it 'should support adding multiple attributes' do
       attributes = [:a, :b]
 
-      base_class.nilify_blank *attributes
+      base_class.nilify_blank(*attributes)
 
       attributes.each do |attribute|
-        base_class.nilify_blank_attribute_set.should include(attribute)
+        expect(base_class.nilify_blank_attribute_set).to include(attribute)
       end
     end
 
@@ -52,7 +50,7 @@ describe Metasploit::Model::NilifyBlanks do
       base_class.nilify_blank attribute
       base_class.nilify_blank attribute
 
-      base_class.nilify_blank_attribute_set.length.should == 1
+      expect(base_class.nilify_blank_attribute_set.length).to eq(1)
     end
   end
 
@@ -90,14 +88,14 @@ describe Metasploit::Model::NilifyBlanks do
     end
 
     it 'should check if value responds to blank?' do
-      value.should_receive(:respond_to?).with(:blank?)
+      expect(value).to receive(:respond_to?).with(:blank?)
 
       nilify_blanks
     end
 
     context 'with value responds to blank?' do
       it 'should call blank?' do
-        value.should_receive(:blank?)
+        expect(value).to receive(:blank?)
 
         nilify_blanks
       end
@@ -110,7 +108,7 @@ describe Metasploit::Model::NilifyBlanks do
         it 'should set attribute to nil' do
           nilify_blanks
 
-          base_instance.blank.should be_nil
+          expect(base_instance.blank).to be_nil
         end
       end
 
@@ -133,11 +131,11 @@ describe Metasploit::Model::NilifyBlanks do
       end
 
       before(:each) do
-        value.stub(:respond_to?).with(:blank?).and_return(false)
+        allow(value).to receive(:respond_to?).with(:blank?).and_return(false)
       end
 
       it 'should not call blank?' do
-        value.should_not_receive(:blank?)
+        expect(value).not_to receive(:blank?)
 
         nilify_blanks
       end
@@ -150,7 +148,7 @@ describe Metasploit::Model::NilifyBlanks do
     end
 
     it 'should default to an empty Set' do
-      nilify_blank_attribute_set.should == Set.new
+      expect(nilify_blank_attribute_set).to eq(Set.new)
     end
   end
 end

data/spec/lib/metasploit/model/realm/key_spec.rb

@@ -1,14 +1,12 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Realm::Key do
+RSpec.describe Metasploit::Model::Realm::Key do
   context 'CONSTANTS' do
     context 'ACTIVE_DIRECTORY_DOMAIN' do
       subject(:active_directory_domain) do
         described_class::ACTIVE_DIRECTORY_DOMAIN
       end
 
-      it { should == 'Active Directory Domain' }
-      it { should be_in described_class::ALL }
+      it { is_expected.to eq('Active Directory Domain') }
+      it { is_expected.to be_in described_class::ALL }
     end
 
     context 'ALL' do
@@ -16,10 +14,10 @@ describe Metasploit::Model::Realm::Key do
         described_class::ALL
       end
 
-      it { should include described_class::ACTIVE_DIRECTORY_DOMAIN }
-      it { should include described_class::ORACLE_SYSTEM_IDENTIFIER }
-      it { should include described_class::POSTGRESQL_DATABASE }
-      it { should include described_class::WILDCARD }
+      it { is_expected.to include described_class::ACTIVE_DIRECTORY_DOMAIN }
+      it { is_expected.to include described_class::ORACLE_SYSTEM_IDENTIFIER }
+      it { is_expected.to include described_class::POSTGRESQL_DATABASE }
+      it { is_expected.to include described_class::WILDCARD }
     end
 
     context 'ORACLE_SYSTEM_IDENTIFIER' do
@@ -27,8 +25,8 @@ describe Metasploit::Model::Realm::Key do
         described_class::ORACLE_SYSTEM_IDENTIFIER
       end
 
-      it { should == 'Oracle System Identifier' }
-      it { should be_in described_class::ALL }
+      it { is_expected.to eq('Oracle System Identifier') }
+      it { is_expected.to be_in described_class::ALL }
     end
 
     context 'POSTGRESQL DATABASE' do
@@ -36,8 +34,8 @@ describe Metasploit::Model::Realm::Key do
         described_class::POSTGRESQL_DATABASE
       end
 
-      it { should == 'PostgreSQL Database' }
-      it { should be_in described_class::ALL }
+      it { is_expected.to eq('PostgreSQL Database') }
+      it { is_expected.to be_in described_class::ALL }
     end
 
     context 'WILDCARD' do
@@ -45,20 +43,20 @@ describe Metasploit::Model::Realm::Key do
         described_class::WILDCARD
       end
 
-      it { should == '*' }
-      it { should be_in described_class::ALL }
+      it { is_expected.to eq('*') }
+      it { is_expected.to be_in described_class::ALL }
     end
 
     context 'SHORT_NAMES' do
       subject { described_class::SHORT_NAMES }
       it 'should have String keys' do
         subject.keys.each { |key|
-          key.should be_a(String)
+          expect(key).to be_a(String)
         }
       end
       context 'values' do
         subject { described_class::SHORT_NAMES.values.sort }
-        it { should match_array(described_class::ALL.sort) }
+        it { is_expected.to match_array(described_class::ALL.sort) }
       end
     end
   end

data/spec/lib/metasploit/model/search/association/tree_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Association::Tree do
+RSpec.describe Metasploit::Model::Association::Tree do
   context 'expand' do
     subject(:expand) {
       described_class.expand(associations)
@@ -99,7 +97,7 @@ describe Metasploit::Model::Association::Tree do
               nil
             }
 
-            it { should be_nil }
+            it { is_expected.to be_nil }
           end
 
           context 'without nil' do
@@ -311,7 +309,7 @@ describe Metasploit::Model::Association::Tree do
         nil
       }
 
-      it { should == [] }
+      it { is_expected.to eq([]) }
     end
   end
 

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

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Association do
+RSpec.describe Metasploit::Model::Search::Association do
   subject(:base_class) do
     described_class = self.described_class
 
@@ -56,7 +54,7 @@ describe Metasploit::Model::Search::Association do
 
   context 'search_associations' do
     subject(:search_associations) {
-      base_class.search_associations *associations
+      base_class.search_associations(*associations)
     }
 
     let(:associations) {

data/spec/lib/metasploit/model/search/attribute_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Attribute do
+RSpec.describe Metasploit::Model::Search::Attribute do
   subject(:base_class) do
     described_class = self.described_class
 
@@ -26,7 +24,7 @@ describe Metasploit::Model::Search::Attribute do
           end
 
           it 'should call search_with' do
-            base_class.should_receive(:search_with).with(
+            expect(base_class).to receive(:search_with).with(
                 Metasploit::Model::Search::Operator::Attribute,
                 hash_including(
                     :attribute => attribute,
@@ -40,7 +38,7 @@ describe Metasploit::Model::Search::Attribute do
           it 'should be in search_attribute_operator_by_attribute' do
             # grab operator first since it calls search_attribute and populates search_attribute_operator_by_attribute
             cached = operator
-            base_class.search_with_operator_by_name[attribute].should == cached
+            expect(base_class.search_with_operator_by_name[attribute]).to eq(cached)
           end
 
           context 'attribute' do
@@ -49,7 +47,7 @@ describe Metasploit::Model::Search::Attribute do
             end
 
             it 'should be the attribute passed to search_attribute' do
-              operator_attribute.should == attribute
+              expect(operator_attribute).to eq(attribute)
             end
           end
 
@@ -59,7 +57,7 @@ describe Metasploit::Model::Search::Attribute do
             end
 
             it 'should be class on which search_attribute was called' do
-              klass.should == base_class
+              expect(klass).to eq(base_class)
             end
           end
 
@@ -69,7 +67,7 @@ describe Metasploit::Model::Search::Attribute do
             end
 
             it 'should be type passed to search_attribute' do
-              operator_type.should == type
+              expect(operator_type).to eq(type)
             end
           end
         end