metasploit-model 1.0.0.pre.rails.pre.4.0 → 1.0.0

data/spec/app/models/metasploit/model/search/operation/boolean_spec.rb

@@ -1,21 +1,24 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Boolean do
+RSpec.describe Metasploit::Model::Search::Operation::Boolean, type: :model do
   context 'CONSTANTS' do
     context 'FORMATTED_VALUE_TO_VALUE' do
       subject(:formatted_value_to_value) do
         described_class::FORMATTED_VALUE_TO_VALUE
       end
 
-      its(['false']) { should be_false }
-      its(['true']) { should be_true }
+      it "maps 'false' to false" do
+        expect(formatted_value_to_value['false']).to eq(false)
+      end
+
+      it "maps 'true' to true" do
+        expect(formatted_value_to_value['true']).to eq(true)
+      end
     end
   end
 
   context 'validations' do
-    it { should allow_value(false).for(:value) }
-    it { should allow_value(true).for(:value) }
-    it { should_not allow_value(nil).for(:value) }
+    it { is_expected.to allow_value(false).for(:value) }
+    it { is_expected.to allow_value(true).for(:value) }
+    it { is_expected.not_to allow_value(nil).for(:value) }
   end
 
   context '#value' do
@@ -32,7 +35,7 @@ describe Metasploit::Model::Search::Operation::Boolean do
         'false'
       end
 
-      it { should be_false }
+      it { is_expected.to eq(false) }
     end
 
     context "with 'true'" do
@@ -40,7 +43,7 @@ describe Metasploit::Model::Search::Operation::Boolean do
         'true'
       end
 
-      it { should be_true }
+      it { is_expected.to eq(true) }
     end
 
     context 'with other' do
@@ -49,7 +52,7 @@ describe Metasploit::Model::Search::Operation::Boolean do
       end
 
       it 'should return value unparsed' do
-        value.should == formatted_value
+        expect(value).to eq(formatted_value)
       end
     end
   end

data/spec/app/models/metasploit/model/search/operation/date_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Date do
+RSpec.describe Metasploit::Model::Search::Operation::Date, type: :model do
   context 'validation' do
     context 'value' do
       before(:each) do
@@ -25,7 +23,7 @@ describe Metasploit::Model::Search::Operation::Date do
         end
 
         it 'should not record error' do
-          errors.should_not include(error)
+          expect(errors).not_to include(error)
         end
       end
 
@@ -35,7 +33,7 @@ describe Metasploit::Model::Search::Operation::Date do
         end
 
         it 'should record error' do
-          errors.should include(error)
+          expect(errors).to include(error)
         end
       end
     end
@@ -56,7 +54,7 @@ describe Metasploit::Model::Search::Operation::Date do
       end
 
       it 'should be passed in Date' do
-        value.should == formatted_value
+        expect(value).to eq(formatted_value)
       end
     end
 
@@ -71,7 +69,7 @@ describe Metasploit::Model::Search::Operation::Date do
         end
 
         it 'should be parsed Date' do
-          value.should == date
+          expect(value).to eq(date)
         end
       end
 
@@ -81,7 +79,7 @@ describe Metasploit::Model::Search::Operation::Date do
         end
 
         it 'should pass through value' do
-          value.should be formatted_value
+          expect(value).to be formatted_value
         end
       end
     end

data/spec/app/models/metasploit/model/search/operation/group/base_spec.rb

@@ -1,15 +1,13 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Group::Base do
+RSpec.describe Metasploit::Model::Search::Operation::Group::Base, type: :model do
   subject(:group) do
     described_class.new
   end
 
-  it { should be_a Metasploit::Model::Search::Operation::Base }
+  it { is_expected.to be_a Metasploit::Model::Search::Operation::Base }
 
   context 'validations' do
     context 'children' do
-      it { should ensure_length_of(:children).is_at_least(1).with_short_message('is too short (minimum is 1 child)') }
+      it { is_expected.to ensure_length_of(:children).is_at_least(1).with_short_message('is too short (minimum is 1 child)') }
 
       context '#children_valid' do
         subject(:children_valid) do
@@ -48,25 +46,25 @@ describe Metasploit::Model::Search::Operation::Group::Base do
           context 'with all valid' do
             before(:each) do
               children.each do |child|
-                child.stub(valid?: true)
+                allow(child).to receive(:valid?).and_return(true)
               end
             end
 
             it 'does not add error on :children' do
               group.valid?
 
-              group.errors[:children].should_not include(error)
+              expect(group.errors[:children]).not_to include(error)
             end
           end
 
           context 'with later valid' do
             before(:each) do
-              children.first.stub(valid?: false)
-              children.second.stub(valid?: true)
+              allow(children.first).to receive(:valid?).and_return(false)
+              allow(children.second).to receive(:valid?).and_return(true)
             end
 
             it 'does not short-circuit and validates all children' do
-              children.second.should_receive(:valid?).and_return(true)
+              expect(children.second).to receive(:valid?).and_return(true)
 
               children_valid
             end
@@ -74,7 +72,7 @@ describe Metasploit::Model::Search::Operation::Group::Base do
             it 'should add error on :children' do
               group.valid?
 
-              group.errors[:children].should include(error)
+              expect(group.errors[:children]).to include(error)
             end
           end
         end
@@ -87,7 +85,7 @@ describe Metasploit::Model::Search::Operation::Group::Base do
           it 'does not add error on :children' do
             group.valid?
 
-            group.errors[:children].should_not include(error)
+            expect(group.errors[:children]).not_to include(error)
           end
         end
       end
@@ -100,7 +98,7 @@ describe Metasploit::Model::Search::Operation::Group::Base do
     end
 
     context 'default' do
-      it { should == [] }
+      it { is_expected.to eq([]) }
     end
 
     context 'with attribute' do
@@ -117,7 +115,7 @@ describe Metasploit::Model::Search::Operation::Group::Base do
       end
 
       it 'is the value passed with :children to #new' do
-        children.should == expected_children
+        expect(children).to eq(expected_children)
       end
     end
   end

data/spec/app/models/metasploit/model/search/operation/group/intersection_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Group::Intersection do
-  it { should be_a Metasploit::Model::Search::Operation::Group::Base }
+RSpec.describe Metasploit::Model::Search::Operation::Group::Intersection, type: :model do
+  it { is_expected.to be_a Metasploit::Model::Search::Operation::Group::Base }
 end

data/spec/app/models/metasploit/model/search/operation/group/union_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Group::Union do
-  it { should be_a Metasploit::Model::Search::Operation::Group::Base }
+RSpec.describe Metasploit::Model::Search::Operation::Group::Union, type: :model do
+  it { is_expected.to be_a Metasploit::Model::Search::Operation::Group::Base }
 end

data/spec/app/models/metasploit/model/search/operation/integer_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Integer do
+RSpec.describe Metasploit::Model::Search::Operation::Integer, type: :model do
   context 'validation' do
-    it { should validate_numericality_of(:value).only_integer }
+    it { is_expected.to validate_numericality_of(:value).only_integer }
   end
 
   it_should_behave_like 'Metasploit::Model::Search::Operation::Value::Integer'

data/spec/app/models/metasploit/model/search/operation/null_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Null do
+RSpec.describe Metasploit::Model::Search::Operation::Null, type: :model do
   context 'validation' do
     context 'operator' do
       context 'null' do
@@ -41,7 +39,7 @@ describe Metasploit::Model::Search::Operation::Null do
           end
 
           it 'should not record error' do
-            errors.should_not include(error)
+            expect(errors).not_to include(error)
           end
         end
 
@@ -51,11 +49,11 @@ describe Metasploit::Model::Search::Operation::Null do
           end
 
           it 'should record error' do
-            errors.should include(error)
+            expect(errors).to include(error)
           end
 
           it 'should have no other errors, so that it would be valid without this type check on operator' do
-            operation.errors.size.should == 1
+            expect(operation.errors.size).to eq(1)
           end
         end
       end

data/spec/app/models/metasploit/model/search/operation/set/integer_spec.rb

@@ -1,7 +1,5 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Set::Integer do
-  it { should be_a Metasploit::Model::Search::Operation::Set }
+RSpec.describe Metasploit::Model::Search::Operation::Set::Integer, type: :model do
+  it { is_expected.to be_a Metasploit::Model::Search::Operation::Set }
 
   it_should_behave_like 'Metasploit::Model::Search::Operation::Value::Integer'
 end

data/spec/app/models/metasploit/model/search/operation/set/string_spec.rb

@@ -1,7 +1,5 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Set::String do
-  it { should be_a Metasploit::Model::Search::Operation::Set }
+RSpec.describe Metasploit::Model::Search::Operation::Set::String, type: :model do
+  it { is_expected.to be_a Metasploit::Model::Search::Operation::Set }
 
   it_should_behave_like 'Metasploit::Model::Search::Operation::Value::String'
 end

data/spec/app/models/metasploit/model/search/operation/set_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::Set do
+RSpec.describe Metasploit::Model::Search::Operation::Set, type: :model do
   subject(:set) do
     described_class.new(
         operator: operator,
@@ -97,7 +95,7 @@ describe Metasploit::Model::Search::Operation::Set do
               attribute_set.sample
             end
 
-            it { should_not include(error) }
+            it { is_expected.not_to include(error) }
           end
 
           context 'without value in attribute_set' do
@@ -105,7 +103,7 @@ describe Metasploit::Model::Search::Operation::Set do
               :not_an_member
             end
 
-            it { should include(error) }
+            it { is_expected.to include(error) }
           end
         end
 
@@ -118,7 +116,7 @@ describe Metasploit::Model::Search::Operation::Set do
             nil
           end
 
-          it { should_not include(error) }
+          it { is_expected.not_to include(error) }
         end
       end
     end

data/spec/app/models/metasploit/model/search/operation/string_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operation::String do
+RSpec.describe Metasploit::Model::Search::Operation::String, type: :model do
   context 'validation' do
-    it { should validate_presence_of(:value) }
+    it { is_expected.to validate_presence_of(:value) }
   end
 
   it_should_behave_like 'Metasploit::Model::Search::Operation::Value::String'

data/spec/app/models/metasploit/model/search/operator/association_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operator::Association do
+RSpec.describe Metasploit::Model::Search::Operator::Association, type: :model do
   subject(:operator) do
     described_class.new(
         :association => association,
@@ -16,11 +14,11 @@ describe Metasploit::Model::Search::Operator::Association do
     double('Metasploit::Model::Search::Operator::Base')
   end
 
-  it { should be_a Metasploit::Model::Search::Operator::Base }
+  it { is_expected.to be_a Metasploit::Model::Search::Operator::Base }
 
   context 'validations' do
-    it { should validate_presence_of(:association) }
-    it { should validate_presence_of(:source_operator) }
+    it { is_expected.to validate_presence_of(:association) }
+    it { is_expected.to validate_presence_of(:source_operator) }
   end
 
   context '#help' do
@@ -51,7 +49,7 @@ describe Metasploit::Model::Search::Operator::Association do
       'source_operator_name'
     }
 
-    it { should be_a Symbol }
+    it { is_expected.to be_a Symbol }
 
     it 'should be <association>.<source_operator.name>' do
       expect(name).to eq :"#{association}.#{source_operator_name}"
@@ -81,7 +79,7 @@ describe Metasploit::Model::Search::Operator::Association do
       }
     }
 
-    it { should be_a Metasploit::Model::Search::Operation::Association }
+    it { is_expected.to be_a Metasploit::Model::Search::Operation::Association }
 
     context 'Metasploit::Model::Search::Operation::Association' do
       context '#operator' do

data/spec/app/models/metasploit/model/search/operator/attribute_spec.rb

@@ -1,7 +1,5 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operator::Attribute do
-  it { should be_a Metasploit::Model::Search::Operator::Single }
+RSpec.describe Metasploit::Model::Search::Operator::Attribute, type: :model do
+  it { is_expected.to be_a Metasploit::Model::Search::Operator::Single }
 
   context 'CONSTANTS' do
     context 'TYPES' do
@@ -9,30 +7,30 @@ describe Metasploit::Model::Search::Operator::Attribute do
         described_class::TYPES
       end
 
-      it { should include(:boolean) }
-      it { should include(:date) }
+      it { is_expected.to include(:boolean) }
+      it { is_expected.to include(:date) }
       it {
-        should include(
+        is_expected.to include(
                    {
                        set: :integer
                    }
                )
       }
       it {
-        should include(
+        is_expected.to include(
                    {
                        set: :string
                    }
                )
       }
-      it { should include(:integer) }
-      it { should include(:string) }
+      it { is_expected.to include(:integer) }
+      it { is_expected.to include(:string) }
     end
   end
 
   context 'validations' do
-    it { should validate_presence_of(:attribute) }
-    it { should validate_inclusion_of(:type).in_array(described_class::TYPES) }
+    it { is_expected.to validate_presence_of(:attribute) }
+    it { is_expected.to validate_inclusion_of(:type).in_array(described_class::TYPES) }
   end
 
   context '#attribute_enumerable' do
@@ -77,7 +75,7 @@ describe Metasploit::Model::Search::Operator::Attribute do
       end
 
       it 'should be #klass #<attribute>_set' do
-        attribute_set.should == expected_attribute_set
+        expect(attribute_set).to eq(expected_attribute_set)
       end
     end
   end
@@ -98,7 +96,7 @@ describe Metasploit::Model::Search::Operator::Attribute do
     end
 
     it 'should be #attribute' do
-      name.should == attribute
+      expect(name).to eq(attribute)
     end
   end
-end
+end

data/spec/app/models/metasploit/model/search/operator/base_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Metasploit::Model::Search::Operator::Base do
+RSpec.describe Metasploit::Model::Search::Operator::Base, type: :model do
   subject(:operator) do
     described_class.new
   end
@@ -12,12 +10,12 @@ describe Metasploit::Model::Search::Operator::Base do
 
     before(:each) do
       # have to stub since it's not implemented on base
-      operator.stub(name: name)
+      allow(operator).to receive(:name).and_return(name)
     end
   end
 
   context 'validations' do
-    it { should validate_presence_of(:klass) }
+    it { is_expected.to validate_presence_of(:klass) }
   end
 
   context '#name' do