diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2016-09-17 08:54:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-17 08:54:35 -0400 |
| commit | 2159a932335486d6e982bfb42ca297f42e0e42c0 (patch) | |
| tree | f59392db833567ad37a1878f00edf45986faa583 /activerecord/test | |
| parent | b5ef59f234b821988d5afcfc8bcca9999892577e (diff) | |
| parent | e835596ae882e748e452e52131c2a4244336660b (diff) | |
| download | rails-2159a932335486d6e982bfb42ca297f42e0e42c0.tar.gz rails-2159a932335486d6e982bfb42ca297f42e0e42c0.tar.bz2 rails-2159a932335486d6e982bfb42ca297f42e0e42c0.zip | |
Merge pull request #26497 from koppen/26496-touch_with_optimistic_locking
Clear attribute changes after handling locking
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/locking_test.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb index 5c55584ff7..13b6f6daaf 100644 --- a/activerecord/test/cases/locking_test.rb +++ b/activerecord/test/cases/locking_test.rb @@ -181,6 +181,7 @@ class OptimisticLockingTest < ActiveRecord::TestCase p1.touch assert_equal 1, p1.lock_version + assert_not p1.changed?, "Changes should have been cleared" end def test_touch_stale_object |