Merge pull request rails#1454 from sikachu/revert_failing_commit

Revert failing commit
arunagw · Jun 2, 2011 · 9f50123 · 9f50123
2 parents 4c0bed0 + 4b8b16b
commit 9f50123
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb
@@ -125,10 +125,10 @@ def test_read_attributes_before_type_cast
     def test_read_attributes_before_type_cast_on_boolean
       bool = Boolean.create({ "value" => false })
       if RUBY_PLATFORM =~ /java/
-        # JRuby will return the value before typecast as string
-        assert_equal "0", bool.reload.attributes_before_type_cast["value"]
-      else
+        #JRuby will returns the value before typecast as integer
         assert_equal 0, bool.reload.attributes_before_type_cast["value"]
+      else
+        assert_equal "0", bool.reload.attributes_before_type_cast["value"]
       end
     end
   end