aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/transactions_test.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb
index a9ccd00fac..3efaaef7de 100644
--- a/activerecord/test/cases/transactions_test.rb
+++ b/activerecord/test/cases/transactions_test.rb
@@ -363,10 +363,12 @@ class TransactionTest < ActiveRecord::TestCase
end
def test_rollback_when_saving_a_frozen_record
+ expected_raise = (RUBY_VERSION < '1.9') ? TypeError : RuntimeError
+
topic = Topic.new(:title => 'test')
topic.freeze
- e = assert_raise(RuntimeError) { topic.save }
- assert_equal "can't modify frozen Hash", e.message
+ e = assert_raise(expected_raise) { topic.save }
+ assert_equal "can't modify frozen hash", e.message.downcase
assert !topic.persisted?, 'not persisted'
assert_nil topic.id
assert topic.frozen?, 'not frozen'