MONGOID-5222 fix tests

Author: neilshweky

lib/mongoid/extensions/date.rb

@@ -52,19 +52,21 @@ def demongoize(object)
         #
         # @return [ Time ] The object mongoized.
         def mongoize(object)
-          return if object.nil? || object.blank?
-          begin
-            if object.is_a?(String)
-              # https://jira.mongodb.org/browse/MONGOID-4460
-              time = ::Time.parse(object)
-            else
-              time = object.__mongoize_time__
+          return if object.nil?
+          unless object.blank?
+            begin
+              if object.is_a?(String)
+                # https://jira.mongodb.org/browse/MONGOID-4460
+                time = ::Time.parse(object)
+              else
+                time = object.__mongoize_time__
+              end
+              if time.acts_like?(:time)
+                ::Time.utc(time.year, time.month, time.day)
+              end
+            rescue ArgumentError
+              nil
             end
-            if time.acts_like?(:time)
-              ::Time.utc(time.year, time.month, time.day)
-            end
-          rescue ArgumentError
-            nil
           end.tap do |res|
             if res.nil?
               raise Errors::InvalidValue.new(self, object)

lib/mongoid/extensions/range.rb

@@ -67,7 +67,8 @@ def mongoize(object)
           case object
           when Hash then __mongoize_hash__(object)
           when Range then __mongoize_range__(object)
-          else raise Errors::InvalidValue.new(self, object)
+          end.tap do |res|
+            raise Errors::InvalidValue.new(self, object) unless res
           end
         end
 

spec/mongoid/attributes_spec.rb

@@ -1586,13 +1586,13 @@
       it "raises an error when trying to set a value of invalid type - array" do
         expect do
           person.map = []
-        end.to raise_error(Mongoid::Errors::InvalidValue, /Value of type Array cannot be written to a field of type Hash/)
+        end.to raise_error(Mongoid::Errors::InvalidValue, /The value \[\] cannot be written to a field of type Hash/)
       end
 
       it "raises an error when trying to set a value of invalid type - boolean" do
         expect do
           person.map = false
-        end.to raise_error(Mongoid::Errors::InvalidValue, /Value of type FalseClass cannot be written to a field of type Hash/)
+        end.to raise_error(Mongoid::Errors::InvalidValue, /The value false cannot be written to a field of type Hash/)
       end
 
       it "can set a Hash value" do
@@ -1610,13 +1610,13 @@
       it "raises an error when trying to set a value of invalid type - hash" do
         expect do
           person.aliases = {}
-        end.to raise_error(Mongoid::Errors::InvalidValue, /Value of type Hash cannot be written to a field of type Array/)
+        end.to raise_error(Mongoid::Errors::InvalidValue, /The value {} cannot be written to a field of type Array/)
       end
 
       it "raises an error when trying to set a value of invalid type - boolean" do
         expect do
           person.aliases = false
-        end.to raise_error(Mongoid::Errors::InvalidValue, /Value of type FalseClass cannot be written to a field of type Array/)
+        end.to raise_error(Mongoid::Errors::InvalidValue, /The value false cannot be written to a field of type Array/)
       end
     end