diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-03-31 07:47:58 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-03-31 07:47:58 -0700 |
| commit | 824fa10f4d1306cc1e310a7d5de7e95cfb07d6f8 (patch) | |
| tree | 1967c2a945d6e131d467fb4f0178a0f60e01ae8a /actionpack/test/controller/test_test.rb | |
| parent | 1ed1652bef981d9402797b6cb9f0920a40eea21a (diff) | |
| parent | db28d407f76a790a31e27bf51560e23425dd6944 (diff) | |
| download | rails-824fa10f4d1306cc1e310a7d5de7e95cfb07d6f8.tar.gz rails-824fa10f4d1306cc1e310a7d5de7e95cfb07d6f8.tar.bz2 rails-824fa10f4d1306cc1e310a7d5de7e95cfb07d6f8.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/test/controller/test_test.rb')
| -rw-r--r-- | actionpack/test/controller/test_test.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb index f6ba275849..8910454b8b 100644 --- a/actionpack/test/controller/test_test.rb +++ b/actionpack/test/controller/test_test.rb @@ -478,8 +478,8 @@ XML end def test_with_routing_places_routes_back - assert @router - routes_id = @router.object_id + assert @routes + routes_id = @routes.object_id begin with_routing { raise 'fail' } @@ -487,8 +487,8 @@ XML rescue RuntimeError end - assert @router - assert_equal routes_id, @router.object_id + assert @routes + assert_equal routes_id, @routes.object_id end def test_remote_addr |