Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #6451 from chancancode/3-2-stable_restore_frozen_s…

…tate_on_rollback

Fixes the build break caused by 9ee8528 in #6445.
  • Loading branch information...
commit ff3cddf8763e100947cdffe9c25716e93ccbac62 2 parents 9ee8528 + d3715f6
@rafaelfranca rafaelfranca authored
Showing with 4 additions and 2 deletions.
  1. +4 −2 activerecord/test/cases/transactions_test.rb
View
6 activerecord/test/cases/transactions_test.rb
@@ -363,10 +363,12 @@ def test_rollback_when_commit_raises
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'
Please sign in to comment.
Something went wrong with that request. Please try again.