aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-06-01 23:13:40 +0100
committerJon Leighton <j@jonathanleighton.com>2011-06-01 23:13:40 +0100
commitf064664de72a34d24568eadf7340f41876df4b20 (patch)
treee2c7a38f1435d1f2a50e059ce0931d2a8c754a22 /activerecord/test
parent04593742c4bcb4d7dd107b6fd1234a4f42c23a10 (diff)
downloadrails-f064664de72a34d24568eadf7340f41876df4b20.tar.gz
rails-f064664de72a34d24568eadf7340f41876df4b20.tar.bz2
rails-f064664de72a34d24568eadf7340f41876df4b20.zip
Fix broken test. You know, the merge button will be the end of us...
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/attribute_methods_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb
index 2712fa8e1d..b0896fb236 100644
--- a/activerecord/test/cases/attribute_methods_test.rb
+++ b/activerecord/test/cases/attribute_methods_test.rb
@@ -135,10 +135,10 @@ class AttributeMethodsTest < ActiveRecord::TestCase
def test_read_attributes_before_type_cast_on_boolean
bool = Boolean.create({ "value" => false })
if RUBY_PLATFORM =~ /java/
- #JRuby will returns the value before typecast as integer
- assert_equal 0, bool.reload.attributes_before_type_cast["value"]
- else
+ # JRuby will return the value before typecast as string
assert_equal "0", bool.reload.attributes_before_type_cast["value"]
+ else
+ assert_equal 0, bool.reload.attributes_before_type_cast["value"]
end
end
end