diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-25 18:48:46 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-25 18:48:46 -0800 |
| commit | 8d2ca7dde1993dea6f01ea504e7c1e154a09dbd0 (patch) | |
| tree | c68b0a9a12b4079ad375a1172b3186a83755cabf /actionpack/test/controller/action_pack_assertions_test.rb | |
| parent | d9c95c82e5d522f42ac866462773ee078afcddf2 (diff) | |
| parent | c80fe1093deeb57eee8df11d3c4120158634cb81 (diff) | |
| download | rails-8d2ca7dde1993dea6f01ea504e7c1e154a09dbd0.tar.gz rails-8d2ca7dde1993dea6f01ea504e7c1e154a09dbd0.tar.bz2 rails-8d2ca7dde1993dea6f01ea504e7c1e154a09dbd0.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/test/controller/action_pack_assertions_test.rb')
| -rw-r--r-- | actionpack/test/controller/action_pack_assertions_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb index 6cad0e2827..ea56048f37 100644 --- a/actionpack/test/controller/action_pack_assertions_test.rb +++ b/actionpack/test/controller/action_pack_assertions_test.rb @@ -461,14 +461,14 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase def test_assert_valid get :get_valid_record - assert_valid assigns('record') + assert_deprecated { assert_valid assigns('record') } end def test_assert_valid_failing get :get_invalid_record begin - assert_valid assigns('record') + assert_deprecated { assert_valid assigns('record') } assert false rescue ActiveSupport::TestCase::Assertion => e end |