diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-22 15:35:23 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-22 15:35:23 -0700 |
| commit | ff3cddf8763e100947cdffe9c25716e93ccbac62 (patch) | |
| tree | 202e4e9b367c14334b7e6d24c70cc4f9c6f6952b | |
| parent | 9ee85281bca899fc521200a087149d7c8c3940d9 (diff) | |
| parent | d3715f65734a10eac228359b9073bbc5aa3ecdbb (diff) | |
| download | rails-ff3cddf8763e100947cdffe9c25716e93ccbac62.tar.gz rails-ff3cddf8763e100947cdffe9c25716e93ccbac62.tar.bz2 rails-ff3cddf8763e100947cdffe9c25716e93ccbac62.zip | |
Merge pull request #6451 from chancancode/3-2-stable_restore_frozen_state_on_rollback
Fixes the build break caused by 9ee8528 in #6445.
| -rw-r--r-- | activerecord/test/cases/transactions_test.rb | 6 |
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' |