dm-core 0.10.2 → 1.0.0.rc1

data/spec/semipublic/query/conditions/comparison_spec.rb

@@ -62,37 +62,37 @@ shared_examples_for 'DataMapper::Query::Conditions::AbstractComparison' do
 
   describe '#==' do
     describe 'when the other AbstractComparison is equal' do
-      # artifically modify the object so #== will throw an
+      # artificially modify the object so #== will throw an
       # exception if the equal? branch is not followed when heckling
-      before { @comparison.meta_class.send(:undef_method, :slug) }
+      before { @comparison.singleton_class.send(:undef_method, :slug) }
 
       subject { @comparison == @comparison }
 
-      it { should be_true }
+      it { should be(true) }
     end
 
     describe 'when the other AbstractComparison is the same class' do
       subject { @comparison == DataMapper::Query::Conditions::Comparison.new(@slug, @property, @value) }
 
-      it { should be_true }
+      it { should be(true) }
     end
 
     describe 'when the other AbstractComparison is a different class' do
       subject { @comparison == DataMapper::Query::Conditions::Comparison.new(:other, @property, @value) }
 
-      it { should be_false }
+      it { should be(false) }
     end
 
     describe 'when the other AbstractComparison is the same class, with different property' do
       subject { @comparison == DataMapper::Query::Conditions::Comparison.new(@slug, @other_property, @value) }
 
-      it { should be_false }
+      it { should be(false) }
     end
 
     describe 'when the other AbstractComparison is the same class, with different value' do
       subject { @comparison == DataMapper::Query::Conditions::Comparison.new(@slug, @property, @other_value) }
 
-      it { should be_false }
+      it { should be(false) }
     end
   end
 
@@ -100,37 +100,37 @@ shared_examples_for 'DataMapper::Query::Conditions::AbstractComparison' do
 
   describe '#eql?' do
     describe 'when the other AbstractComparison is equal' do
-      # artifically modify the object so #eql? will throw an
+      # artificially modify the object so #eql? will throw an
       # exception if the equal? branch is not followed when heckling
-      before { @comparison.meta_class.send(:undef_method, :slug) }
+      before { @comparison.singleton_class.send(:undef_method, :slug) }
 
       subject { @comparison.eql?(@comparison) }
 
-      it { should be_true }
+      it { should be(true) }
     end
 
     describe 'when the other AbstractComparison is the same class' do
       subject { @comparison.eql?(DataMapper::Query::Conditions::Comparison.new(@slug, @property, @value)) }
 
-      it { should be_true }
+      it { should be(true) }
     end
 
     describe 'when the other AbstractComparison is a different class' do
       subject { @comparison.eql?(DataMapper::Query::Conditions::Comparison.new(:other, @property, @value)) }
 
-      it { should be_false }
+      it { should be(false) }
     end
 
     describe 'when the other AbstractComparison is the same class, with different property' do
       subject { @comparison.eql?(DataMapper::Query::Conditions::Comparison.new(@slug, @other_property, @value)) }
 
-      it { should be_false }
+      it { should be(false) }
     end
 
     describe 'when the other AbstractComparison is the same class, with different value' do
       subject { @comparison.eql?(DataMapper::Query::Conditions::Comparison.new(@slug, @property, @other_value)) }
 
-      it { should be_false }
+      it { should be(false) }
     end
   end
 
@@ -214,7 +214,7 @@ shared_examples_for 'DataMapper::Query::Conditions::AbstractComparison' do
   describe '#property?' do
     subject { @comparison.property? }
 
-    it { should be_true }
+    it { should be(true) }
   end
 
   it { should respond_to(:slug) }
@@ -239,7 +239,7 @@ shared_examples_for 'DataMapper::Query::Conditions::AbstractComparison' do
     subject { @comparison.valid? }
 
     describe 'when the value is valid for the subject' do
-      it { should be_true }
+      it { should be(true) }
     end
 
     describe 'when the value is not valid for the subject' do
@@ -247,7 +247,7 @@ shared_examples_for 'DataMapper::Query::Conditions::AbstractComparison' do
         @comparison = DataMapper::Query::Conditions::Comparison.new(@slug, @property, nil)
       end
 
-      it { should be_false }
+      it { should be(false) }
     end
   end
 
@@ -343,7 +343,7 @@ describe DataMapper::Query::Conditions::EqualToComparison do
   describe '#inspect' do
     subject { @comparison.inspect }
 
-    it { should == '#<DataMapper::Query::Conditions::EqualToComparison @subject=#<DataMapper::Property @model=Blog::Article @name=:id> @dumped_value=1 @loaded_value=1>' }
+    it { should == '#<DataMapper::Query::Conditions::EqualToComparison @subject=#<DataMapper::Property::Serial @model=Blog::Article @name=:id> @dumped_value=1 @loaded_value=1>' }
   end
 
   it { should respond_to(:matches?) }
@@ -355,25 +355,25 @@ describe DataMapper::Query::Conditions::EqualToComparison do
           describe 'with a matching Hash' do
             subject { @comparison.matches?(@property.field => 1) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Hash' do
             subject { @comparison.matches?(@property.field => 2) }
 
-            it { should be_false }
+            it { should be(false) }
           end
 
           describe 'with a matching Resource' do
             subject { @comparison.matches?(@model.new(@property => 1)) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Resource' do
             subject { @comparison.matches?(@model.new(@property => 2)) }
 
-            it { should be_false }
+            it { should be(false) }
           end
         end
 
@@ -385,25 +385,25 @@ describe DataMapper::Query::Conditions::EqualToComparison do
           describe 'with a matching Hash' do
             subject { @comparison.matches?(@property.field => nil) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Hash' do
             subject { @comparison.matches?(@property.field => 1) }
 
-            it { should be_false }
+            it { should be(false) }
           end
 
           describe 'with a matching Resource' do
             subject { @comparison.matches?(@model.new(@property => nil)) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Resource' do
             subject { @comparison.matches?(@model.new(@property => 1)) }
 
-            it { should be_false }
+            it { should be(false) }
           end
         end
       end
@@ -420,25 +420,25 @@ describe DataMapper::Query::Conditions::EqualToComparison do
           describe 'with a matching Hash' do
             subject { @comparison.matches?({ @relationship.field => nil }) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Hash' do
             subject { @comparison.matches?({ @relationship.field => {} }) }
 
-            it { pending { should be_false } }
+            it { pending { should be(false) } }
           end
 
           describe 'with a matching Resource' do
             subject { @comparison.matches?(@parent) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Resource' do
             subject { @comparison.matches?(@child) }
 
-            it { should be_false }
+            it { should be(false) }
           end
         end
 
@@ -453,25 +453,25 @@ describe DataMapper::Query::Conditions::EqualToComparison do
           describe 'with a matching Hash' do
             subject { @comparison.matches?({ @relationship.field => @parent.attributes(:field) }) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Hash' do
             subject { @comparison.matches?({ @relationship.field => @child.attributes(:field) }) }
 
-            it { pending { should be_false } }
+            it { pending { should be(false) } }
           end
 
           describe 'with a matching Resource' do
             subject { @comparison.matches?(@child) }
 
-            it { pending { should be_true } }
+            it { pending { should be(true) } }
           end
 
           describe 'with a not matching Resource' do
             subject { @comparison.matches?(@parent) }
 
-            it { pending { should be_false } }
+            it { pending { should be(false) } }
           end
         end
 
@@ -488,25 +488,25 @@ describe DataMapper::Query::Conditions::EqualToComparison do
           describe 'with a matching Hash' do
             subject { @comparison.matches?({ @relationship.field => @parent.attributes(:field) }) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Hash' do
             subject { @comparison.matches?({ @relationship.field => @child.attributes(:field) }) }
 
-            it { pending { should be_false } }
+            it { pending { should be(false) } }
           end
 
           describe 'with a matching Resource' do
             subject { @comparison.matches?(@child) }
 
-            it { pending { should be_true } }
+            it { pending { should be(true) } }
           end
 
           describe 'with a not matching Resource' do
             subject { @comparison.matches?(@parent) }
 
-            it { pending { should be_false } }
+            it { pending { should be(false) } }
           end
         end
 
@@ -521,25 +521,25 @@ describe DataMapper::Query::Conditions::EqualToComparison do
           describe 'with a matching Hash' do
             subject { @comparison.matches?({ @relationship.field => @parent.attributes(:field) }) }
 
-            it { pending { should be_true } }
+            it { pending { should be(true) } }
           end
 
           describe 'with a not matching Hash' do
             subject { @comparison.matches?({ @relationship.field => @child.attributes(:field) }) }
 
-            it { should be_false }
+            it { should be(false) }
           end
 
           describe 'with a matching Resource' do
             subject { @comparison.matches?(@child) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Resource' do
             subject { @comparison.matches?(@parent) }
 
-            it { should be_false }
+            it { should be(false) }
           end
         end
       end
@@ -551,7 +551,7 @@ describe DataMapper::Query::Conditions::EqualToComparison do
   describe '#relationship?' do
     subject { @comparison.relationship? }
 
-    it { should be_false }
+    it { should be(false) }
   end
 
   it { should respond_to(:to_s) }
@@ -645,7 +645,7 @@ describe DataMapper::Query::Conditions::InclusionComparison do
   describe '#inspect' do
     subject { @comparison.inspect }
 
-    it { should == '#<DataMapper::Query::Conditions::InclusionComparison @subject=#<DataMapper::Property @model=Blog::Article @name=:id> @dumped_value=[1] @loaded_value=[1]>' }
+    it { should == '#<DataMapper::Query::Conditions::InclusionComparison @subject=#<DataMapper::Property::Serial @model=Blog::Article @name=:id> @dumped_value=[1] @loaded_value=[1]>' }
   end
 
   it { should respond_to(:matches?) }
@@ -657,25 +657,25 @@ describe DataMapper::Query::Conditions::InclusionComparison do
           describe 'with a matching Hash' do
             subject { @comparison.matches?(@property.field => 1) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Hash' do
             subject { @comparison.matches?(@property.field => 2) }
 
-            it { should be_false }
+            it { should be(false) }
           end
 
           describe 'with a matching Resource' do
             subject { @comparison.matches?(@model.new(@property => 1)) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Resource' do
             subject { @comparison.matches?(@model.new(@property => 2)) }
 
-            it { should be_false }
+            it { should be(false) }
           end
         end
 
@@ -688,25 +688,25 @@ describe DataMapper::Query::Conditions::InclusionComparison do
           describe 'with a matching Hash' do
             subject { @comparison.matches?(@property.field => 1) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Hash' do
             subject { @comparison.matches?(@property.field => 2) }
 
-            it { should be_false }
+            it { should be(false) }
           end
 
           describe 'with a matching Resource' do
             subject { @comparison.matches?(@model.new(@property => 1)) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Resource' do
             subject { @comparison.matches?(@model.new(@property => 2)) }
 
-            it { should be_false }
+            it { should be(false) }
           end
         end
 
@@ -719,25 +719,25 @@ describe DataMapper::Query::Conditions::InclusionComparison do
           describe 'with a matching Hash' do
             subject { @comparison.matches?(@property.field => 1) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Hash' do
             subject { @comparison.matches?(@property.field => 0) }
 
-            it { should be_false }
+            it { should be(false) }
           end
 
           describe 'with a matching Resource' do
             subject { @comparison.matches?(@model.new(@property => 1)) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Resource' do
             subject { @comparison.matches?(@model.new(@property => 0)) }
 
-            it { should be_false }
+            it { should be(false) }
           end
         end
 
@@ -750,25 +750,25 @@ describe DataMapper::Query::Conditions::InclusionComparison do
           describe 'with a matching Hash' do
             subject { @comparison.matches?(@property.field => 1) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Hash' do
             subject { @comparison.matches?(@property.field => 2) }
 
-            it { should be_false }
+            it { should be(false) }
           end
 
           describe 'with a matching Resource' do
             subject { @comparison.matches?(@model.new(@property => 1)) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Resource' do
             subject { @comparison.matches?(@model.new(@property => 2)) }
 
-            it { should be_false }
+            it { should be(false) }
           end
         end
       end
@@ -785,25 +785,25 @@ describe DataMapper::Query::Conditions::InclusionComparison do
           describe 'with a matching Hash' do
             subject { @comparison.matches?({ @relationship.field => @parent.attributes(:field) }) }
 
-            it { pending { should be_true } }
+            it { pending { should be(true) } }
           end
 
           describe 'with a not matching Hash' do
             subject { @comparison.matches?({ @relationship.field => @child.attributes(:field) }) }
 
-            it { should be_false }
+            it { should be(false) }
           end
 
           describe 'with a matching Resource' do
             subject { @comparison.matches?(@child) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Resource' do
             subject { @comparison.matches?(@parent) }
 
-            it { should be_false }
+            it { should be(false) }
           end
         end
 
@@ -820,25 +820,25 @@ describe DataMapper::Query::Conditions::InclusionComparison do
           describe 'with a matching Hash' do
             subject { @comparison.matches?({ @relationship.field => @parent.attributes(:field) }) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Hash' do
             subject { @comparison.matches?({ @relationship.field => @child.attributes(:field) }) }
 
-            it { pending { should be_false } }
+            it { pending { should be(false) } }
           end
 
           describe 'with a matching Resource' do
             subject { @comparison.matches?(@child) }
 
-            it { pending { should be_true } }
+            it { pending { should be(true) } }
           end
 
           describe 'with a not matching Resource' do
             subject { @comparison.matches?(@parent) }
 
-            it { pending { should be_false } }
+            it { pending { should be(false) } }
           end
         end
 
@@ -853,25 +853,25 @@ describe DataMapper::Query::Conditions::InclusionComparison do
           describe 'with a matching Hash' do
             subject { @comparison.matches?({ @relationship.field => @parent.attributes(:field) }) }
 
-            it { pending { should be_true } }
+            it { pending { should be(true) } }
           end
 
           describe 'with a not matching Hash' do
             subject { @comparison.matches?({ @relationship.field => @child.attributes(:field) }) }
 
-            it { should be_false }
+            it { should be(false) }
           end
 
           describe 'with a matching Resource' do
             subject { @comparison.matches?(@child) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Resource' do
             subject { @comparison.matches?(@parent) }
 
-            it { should be_false }
+            it { should be(false) }
           end
         end
 
@@ -886,25 +886,25 @@ describe DataMapper::Query::Conditions::InclusionComparison do
           describe 'with a matching Hash' do
             subject { @comparison.matches?({ @relationship.field => @parent.attributes(:field) }) }
 
-            it { pending { should be_true } }
+            it { pending { should be(true) } }
           end
 
           describe 'with a not matching Hash' do
             subject { @comparison.matches?({ @relationship.field => @child.attributes(:field) }) }
 
-            it { should be_false }
+            it { should be(false) }
           end
 
           describe 'with a matching Resource' do
             subject { @comparison.matches?(@child) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Resource' do
             subject { @comparison.matches?(@parent) }
 
-            it { should be_false }
+            it { should be(false) }
           end
         end
 
@@ -919,25 +919,25 @@ describe DataMapper::Query::Conditions::InclusionComparison do
           describe 'with a matching Hash' do
             subject { @comparison.matches?({ @relationship.field => @parent.attributes(:field) }) }
 
-            it { pending { should be_true } }
+            it { pending { should be(true) } }
           end
 
           describe 'with a not matching Hash' do
             subject { @comparison.matches?({ @relationship.field => @child.attributes(:field) }) }
 
-            it { should be_false }
+            it { should be(false) }
           end
 
           describe 'with a matching Resource' do
             subject { @comparison.matches?(@child) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Resource' do
             subject { @comparison.matches?(@parent) }
 
-            it { should be_false }
+            it { should be(false) }
           end
         end
 
@@ -954,25 +954,25 @@ describe DataMapper::Query::Conditions::InclusionComparison do
           describe 'with a matching Hash' do
             subject { @comparison.matches?({ @relationship.field => @parent.attributes(:field) }) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Hash' do
             subject { @comparison.matches?({ @relationship.field => @child.attributes(:field) }) }
 
-            it { pending { should be_false } }
+            it { pending { should be(false) } }
           end
 
           describe 'with a matching Resource' do
             subject { @comparison.matches?(@child) }
 
-            it { pending { should be_true } }
+            it { pending { should be(true) } }
           end
 
           describe 'with a not matching Resource' do
             subject { @comparison.matches?(@parent) }
 
-            it { pending { should be_false } }
+            it { pending { should be(false) } }
           end
         end
 
@@ -987,25 +987,25 @@ describe DataMapper::Query::Conditions::InclusionComparison do
           describe 'with a matching Hash' do
             subject { @comparison.matches?({ @relationship.field => @parent.attributes(:field) }) }
 
-            it { pending { should be_true } }
+            it { pending { should be(true) } }
           end
 
           describe 'with a not matching Hash' do
             subject { @comparison.matches?({ @relationship.field => @child.attributes(:field) }) }
 
-            it { should be_false }
+            it { should be(false) }
           end
 
           describe 'with a matching Resource' do
             subject { @comparison.matches?(@child) }
 
-            it { should be_true }
+            it { should be(true) }
           end
 
           describe 'with a not matching Resource' do
             subject { @comparison.matches?(@parent) }
 
-            it { should be_false }
+            it { should be(false) }
           end
         end
       end
@@ -1017,7 +1017,7 @@ describe DataMapper::Query::Conditions::InclusionComparison do
   describe '#relationship?' do
     subject { @comparison.relationship? }
 
-    it { should be_false }
+    it { should be(false) }
   end
 
   it { should respond_to(:to_s) }
@@ -1035,7 +1035,7 @@ describe DataMapper::Query::Conditions::InclusionComparison do
 
     describe 'with a Property subject' do
       describe 'with a valid Array value' do
-        it { should be_true }
+        it { should be(true) }
       end
 
       describe 'with a valid Array value that needs typecasting' do
@@ -1044,7 +1044,7 @@ describe DataMapper::Query::Conditions::InclusionComparison do
           @comparison = DataMapper::Query::Conditions::Comparison.new(@slug, @property, @value)
         end
 
-        it { should be_true }
+        it { should be(true) }
       end
 
       describe 'with an invalid Array value' do
@@ -1053,7 +1053,7 @@ describe DataMapper::Query::Conditions::InclusionComparison do
           @comparison = DataMapper::Query::Conditions::Comparison.new(@slug, @property, @value)
         end
 
-        it { should be_false }
+        it { should be(false) }
       end
 
       describe 'with an empty Array value' do
@@ -1062,7 +1062,7 @@ describe DataMapper::Query::Conditions::InclusionComparison do
           @comparison = DataMapper::Query::Conditions::Comparison.new(@slug, @property, @value)
         end
 
-        it { should be_false }
+        it { should be(false) }
       end
 
       describe 'with a valid Range value' do
@@ -1071,7 +1071,7 @@ describe DataMapper::Query::Conditions::InclusionComparison do
           @comparison = DataMapper::Query::Conditions::Comparison.new(@slug, @property, @value)
         end
 
-        it { should be_true }
+        it { should be(true) }
       end
 
       describe 'with a valid Range value that needs typecasting' do
@@ -1080,7 +1080,7 @@ describe DataMapper::Query::Conditions::InclusionComparison do
           @comparison = DataMapper::Query::Conditions::Comparison.new(@slug, @property, @value)
         end
 
-        it { should be_true }
+        it { should be(true) }
       end
 
       describe 'with an invalid Range value' do
@@ -1089,7 +1089,7 @@ describe DataMapper::Query::Conditions::InclusionComparison do
           @comparison = DataMapper::Query::Conditions::Comparison.new(@slug, @property, @value)
         end
 
-        it { should be_false }
+        it { should be(false) }
       end
 
       describe 'with an empty Range value' do
@@ -1098,45 +1098,47 @@ describe DataMapper::Query::Conditions::InclusionComparison do
           @comparison = DataMapper::Query::Conditions::Comparison.new(@slug, @property, @value)
         end
 
-        it { should be_false }
+        it { should be(false) }
       end
     end
 
     describe 'with a Relationship subject' do
-      describe 'with a valid Array value' do
-        before do
-          @value      = [ @model.new(:id => 1) ]
-          @comparison = DataMapper::Query::Conditions::Comparison.new(@slug, @relationship, @value)
+      supported_by :all do
+        describe 'with a valid Array value' do
+          before do
+            @value      = [ @model.new(:id => 1) ]
+            @comparison = DataMapper::Query::Conditions::Comparison.new(@slug, @relationship, @value)
+          end
+
+          it { should be(true) }
         end
 
-        it { should be_true }
-      end
+        describe 'with an invalid Array value' do
+          before do
+            @value      = [ @model.new ]
+            @comparison = DataMapper::Query::Conditions::Comparison.new(@slug, @relationship, @value)
+          end
 
-      describe 'with an invalid Array value' do
-        before do
-          @value      = [ @model.new ]
-          @comparison = DataMapper::Query::Conditions::Comparison.new(@slug, @relationship, @value)
+          it { should be(false) }
         end
 
-        it { should be_false }
-      end
+        describe 'with an empty Array value' do
+          before do
+            @value      = []
+            @comparison = DataMapper::Query::Conditions::Comparison.new(@slug, @relationship, @value)
+          end
 
-      describe 'with an empty Array value' do
-        before do
-          @value      = []
-          @comparison = DataMapper::Query::Conditions::Comparison.new(@slug, @relationship, @value)
+          it { should be(false) }
         end
 
-        it { should be_false }
-      end
+        describe 'with a valid Collection' do
+          before do
+            @value      = @model.all
+            @comparison = DataMapper::Query::Conditions::Comparison.new(@slug, @relationship, @value)
+          end
 
-      describe 'with a valid Collection' do
-        before do
-          @value      = @model.all
-          @comparison = DataMapper::Query::Conditions::Comparison.new(@slug, @relationship, @value)
+          it { should be(true) }
         end
-
-        it { should be_true }
       end
     end
   end
@@ -1246,7 +1248,7 @@ describe DataMapper::Query::Conditions::RegexpComparison do
   describe '#inspect' do
     subject { @comparison.inspect }
 
-    it { should == '#<DataMapper::Query::Conditions::RegexpComparison @subject=#<DataMapper::Property @model=Blog::Article @name=:title> @dumped_value=/Title/ @loaded_value=/Title/>' }
+    it { should == '#<DataMapper::Query::Conditions::RegexpComparison @subject=#<DataMapper::Property::String @model=Blog::Article @name=:title> @dumped_value=/Title/ @loaded_value=/Title/>' }
   end
 
   it { should respond_to(:matches?) }
@@ -1256,37 +1258,37 @@ describe DataMapper::Query::Conditions::RegexpComparison do
       describe 'with a matching Hash' do
         subject { @comparison.matches?(@property.field => 'Title') }
 
-        it { should be_true }
+        it { should be(true) }
       end
 
       describe 'with a not matching Hash' do
         subject { @comparison.matches?(@property.field => 'Other') }
 
-        it { should be_false }
+        it { should be(false) }
       end
 
       describe 'with a matching Resource' do
         subject { @comparison.matches?(@model.new(@property => 'Title')) }
 
-        it { should be_true }
+        it { should be(true) }
       end
 
       describe 'with a not matching Resource' do
         subject { @comparison.matches?(@model.new(@property => 'Other')) }
 
-        it { should be_false }
+        it { should be(false) }
       end
 
       describe 'with a not matching nil field' do
         subject { @comparison.matches?(@property.field => nil) }
 
-        it { should be_false }
+        it { should be(false) }
       end
 
       describe 'with a not matching nil attribute' do
         subject { @comparison.matches?(@model.new(@property => nil)) }
 
-        it { should be_false }
+        it { should be(false) }
       end
     end
   end
@@ -1296,7 +1298,7 @@ describe DataMapper::Query::Conditions::RegexpComparison do
   describe '#relationship?' do
     subject { @comparison.relationship? }
 
-    it { should be_false }
+    it { should be(false) }
   end
 
   it { should respond_to(:to_s) }
@@ -1328,7 +1330,7 @@ describe DataMapper::Query::Conditions::LikeComparison do
   describe '#inspect' do
     subject { @comparison.inspect }
 
-    it { should == '#<DataMapper::Query::Conditions::LikeComparison @subject=#<DataMapper::Property @model=Blog::Article @name=:title> @dumped_value="_it%" @loaded_value="_it%">' }
+    it { should == '#<DataMapper::Query::Conditions::LikeComparison @subject=#<DataMapper::Property::String @model=Blog::Article @name=:title> @dumped_value="_it%" @loaded_value="_it%">' }
   end
 
   it { should respond_to(:matches?) }
@@ -1338,37 +1340,37 @@ describe DataMapper::Query::Conditions::LikeComparison do
       describe 'with a matching Hash' do
         subject { @comparison.matches?(@property.field => 'Title') }
 
-        it { should be_true }
+        it { should be(true) }
       end
 
       describe 'with a not matching Hash' do
         subject { @comparison.matches?(@property.field => 'Other Title') }
 
-        it { should be_false }
+        it { should be(false) }
       end
 
       describe 'with a matching Resource' do
         subject { @comparison.matches?(@model.new(@property => 'Title')) }
 
-        it { should be_true }
+        it { should be(true) }
       end
 
       describe 'with a not matching Resource' do
         subject { @comparison.matches?(@model.new(@property => 'Other Title')) }
 
-        it { should be_false }
+        it { should be(false) }
       end
 
       describe 'with a not matching nil field' do
         subject { @comparison.matches?(@property.field => nil) }
 
-        it { should be_false }
+        it { should be(false) }
       end
 
       describe 'with a not matching nil attribute' do
         subject { @comparison.matches?(@model.new(@property => nil)) }
 
-        it { should be_false }
+        it { should be(false) }
       end
     end
   end
@@ -1378,7 +1380,7 @@ describe DataMapper::Query::Conditions::LikeComparison do
   describe '#relationship?' do
     subject { @comparison.relationship? }
 
-    it { should be_false }
+    it { should be(false) }
   end
 
   it { should respond_to(:to_s) }
@@ -1410,7 +1412,7 @@ describe DataMapper::Query::Conditions::GreaterThanComparison do
   describe '#inspect' do
     subject { @comparison.inspect }
 
-    it { should == '#<DataMapper::Query::Conditions::GreaterThanComparison @subject=#<DataMapper::Property @model=Blog::Article @name=:id> @dumped_value=1 @loaded_value=1>' }
+    it { should == '#<DataMapper::Query::Conditions::GreaterThanComparison @subject=#<DataMapper::Property::Serial @model=Blog::Article @name=:id> @dumped_value=1 @loaded_value=1>' }
   end
 
   it { should respond_to(:matches?) }
@@ -1420,37 +1422,37 @@ describe DataMapper::Query::Conditions::GreaterThanComparison do
       describe 'with a matching Hash' do
         subject { @comparison.matches?(@property.field => 2) }
 
-        it { should be_true }
+        it { should be(true) }
       end
 
       describe 'with a not matching Hash' do
         subject { @comparison.matches?(@property.field => 1) }
 
-        it { should be_false }
+        it { should be(false) }
       end
 
       describe 'with a matching Resource' do
         subject { @comparison.matches?(@model.new(@property => 2)) }
 
-        it { should be_true }
+        it { should be(true) }
       end
 
       describe 'with a not matching Resource' do
         subject { @comparison.matches?(@model.new(@property => 1)) }
 
-        it { should be_false }
+        it { should be(false) }
       end
 
       describe 'with a not matching nil field' do
         subject { @comparison.matches?(@property.field => nil) }
 
-        it { should be_false }
+        it { should be(false) }
       end
 
       describe 'with a not matching nil attribute' do
         subject { @comparison.matches?(@model.new(@property => nil)) }
 
-        it { should be_false }
+        it { should be(false) }
       end
     end
   end
@@ -1460,7 +1462,7 @@ describe DataMapper::Query::Conditions::GreaterThanComparison do
   describe '#relationship?' do
     subject { @comparison.relationship? }
 
-    it { should be_false }
+    it { should be(false) }
   end
 
   it { should respond_to(:to_s) }
@@ -1492,7 +1494,7 @@ describe DataMapper::Query::Conditions::LessThanComparison do
   describe '#inspect' do
     subject { @comparison.inspect }
 
-    it { should == '#<DataMapper::Query::Conditions::LessThanComparison @subject=#<DataMapper::Property @model=Blog::Article @name=:id> @dumped_value=1 @loaded_value=1>' }
+    it { should == '#<DataMapper::Query::Conditions::LessThanComparison @subject=#<DataMapper::Property::Serial @model=Blog::Article @name=:id> @dumped_value=1 @loaded_value=1>' }
   end
 
   it { should respond_to(:matches?) }
@@ -1502,37 +1504,37 @@ describe DataMapper::Query::Conditions::LessThanComparison do
       describe 'with a matching Hash' do
         subject { @comparison.matches?(@property.field => 0) }
 
-        it { should be_true }
+        it { should be(true) }
       end
 
       describe 'with a not matching Hash' do
         subject { @comparison.matches?(@property.field => 1) }
 
-        it { should be_false }
+        it { should be(false) }
       end
 
       describe 'with a matching Resource' do
         subject { @comparison.matches?(@model.new(@property => 0)) }
 
-        it { should be_true }
+        it { should be(true) }
       end
 
       describe 'with a not matching Resource' do
         subject { @comparison.matches?(@model.new(@property => 1)) }
 
-        it { should be_false }
+        it { should be(false) }
       end
 
       describe 'with a not matching nil field' do
         subject { @comparison.matches?(@property.field => nil) }
 
-        it { should be_false }
+        it { should be(false) }
       end
 
       describe 'with a not matching nil attribute' do
         subject { @comparison.matches?(@model.new(@property => nil)) }
 
-        it { should be_false }
+        it { should be(false) }
       end
     end
   end
@@ -1542,7 +1544,7 @@ describe DataMapper::Query::Conditions::LessThanComparison do
   describe '#relationship?' do
     subject { @comparison.relationship? }
 
-    it { should be_false }
+    it { should be(false) }
   end
 
   it { should respond_to(:to_s) }
@@ -1574,7 +1576,7 @@ describe DataMapper::Query::Conditions::GreaterThanOrEqualToComparison do
   describe '#inspect' do
     subject { @comparison.inspect }
 
-    it { should == '#<DataMapper::Query::Conditions::GreaterThanOrEqualToComparison @subject=#<DataMapper::Property @model=Blog::Article @name=:id> @dumped_value=1 @loaded_value=1>' }
+    it { should == '#<DataMapper::Query::Conditions::GreaterThanOrEqualToComparison @subject=#<DataMapper::Property::Serial @model=Blog::Article @name=:id> @dumped_value=1 @loaded_value=1>' }
   end
 
   it { should respond_to(:matches?) }
@@ -1584,37 +1586,37 @@ describe DataMapper::Query::Conditions::GreaterThanOrEqualToComparison do
       describe 'with a matching Hash' do
         subject { @comparison.matches?(@property.field => 1) }
 
-        it { should be_true }
+        it { should be(true) }
       end
 
       describe 'with a not matching Hash' do
         subject { @comparison.matches?(@property.field => 0) }
 
-        it { should be_false }
+        it { should be(false) }
       end
 
       describe 'with a matching Resource' do
         subject { @comparison.matches?(@model.new(@property => 1)) }
 
-        it { should be_true }
+        it { should be(true) }
       end
 
       describe 'with a not matching Resource' do
         subject { @comparison.matches?(@model.new(@property => 0)) }
 
-        it { should be_false }
+        it { should be(false) }
       end
 
       describe 'with a not matching nil field' do
         subject { @comparison.matches?(@property.field => nil) }
 
-        it { should be_false }
+        it { should be(false) }
       end
 
       describe 'with a not matching nil attribute' do
         subject { @comparison.matches?(@model.new(@property => nil)) }
 
-        it { should be_false }
+        it { should be(false) }
       end
     end
   end
@@ -1624,7 +1626,7 @@ describe DataMapper::Query::Conditions::GreaterThanOrEqualToComparison do
   describe '#relationship?' do
     subject { @comparison.relationship? }
 
-    it { should be_false }
+    it { should be(false) }
   end
 
   it { should respond_to(:to_s) }
@@ -1656,7 +1658,7 @@ describe DataMapper::Query::Conditions::LessThanOrEqualToComparison do
   describe '#inspect' do
     subject { @comparison.inspect }
 
-    it { should == '#<DataMapper::Query::Conditions::LessThanOrEqualToComparison @subject=#<DataMapper::Property @model=Blog::Article @name=:id> @dumped_value=1 @loaded_value=1>' }
+    it { should == '#<DataMapper::Query::Conditions::LessThanOrEqualToComparison @subject=#<DataMapper::Property::Serial @model=Blog::Article @name=:id> @dumped_value=1 @loaded_value=1>' }
   end
 
   it { should respond_to(:matches?) }
@@ -1666,37 +1668,37 @@ describe DataMapper::Query::Conditions::LessThanOrEqualToComparison do
       describe 'with a matching Hash' do
         subject { @comparison.matches?(@property.field => 1) }
 
-        it { should be_true }
+        it { should be(true) }
       end
 
       describe 'with a not matching Hash' do
         subject { @comparison.matches?(@property.field => 2) }
 
-        it { should be_false }
+        it { should be(false) }
       end
 
       describe 'with a matching Resource' do
         subject { @comparison.matches?(@model.new(@property => 1)) }
 
-        it { should be_true }
+        it { should be(true) }
       end
 
       describe 'with a not matching Resource' do
         subject { @comparison.matches?(@model.new(@property => 2)) }
 
-        it { should be_false }
+        it { should be(false) }
       end
 
       describe 'with a not matching nil field' do
         subject { @comparison.matches?(@property.field => nil) }
 
-        it { should be_false }
+        it { should be(false) }
       end
 
       describe 'with a not matching nil attribute' do
         subject { @comparison.matches?(@model.new(@property => nil)) }
 
-        it { should be_false }
+        it { should be(false) }
       end
     end
   end
@@ -1706,7 +1708,7 @@ describe DataMapper::Query::Conditions::LessThanOrEqualToComparison do
   describe '#relationship?' do
     subject { @comparison.relationship? }
 
-    it { should be_false }
+    it { should be(false) }
   end
 
   it { should respond_to(:to_s) }