diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-05-22 18:40:26 +0200 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-05-22 19:01:52 +0200 |
| commit | 9d08f86cd45ed939ecf2e24e81655371910c8045 (patch) | |
| tree | fd29fc131279e8633921804a593fa80df0e695d2 /actionpack/test/controller | |
| parent | d1d9a6c26113cf4a0decb504c46e4e7fe4351ce6 (diff) | |
| download | rails-9d08f86cd45ed939ecf2e24e81655371910c8045.tar.gz rails-9d08f86cd45ed939ecf2e24e81655371910c8045.tar.bz2 rails-9d08f86cd45ed939ecf2e24e81655371910c8045.zip | |
Make assertion tests pass with the new base
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/action_pack_assertions_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb index c3c769919a..24686ab4b6 100644 --- a/actionpack/test/controller/action_pack_assertions_test.rb +++ b/actionpack/test/controller/action_pack_assertions_test.rb @@ -1,4 +1,5 @@ require 'abstract_unit' +require 'action_controller/vendor/html-scanner' # a controller class to facilitate the tests class ActionPackAssertionsController < ActionController::Base @@ -295,8 +296,8 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase # make sure that the template objects exist def test_template_objects_alive process :assign_this - assert !@controller.template.assigns['hi'] - assert @controller.template.assigns['howdy'] + assert !@controller.template.instance_variable_get(:"@hi") + assert @controller.template.instance_variable_get(:"@howdy") end # make sure we don't have template objects when we shouldn't @@ -444,7 +445,6 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase assert_equal "Mr. David", @response.body end - def test_assert_redirection_fails_with_incorrect_controller process :redirect_to_controller assert_raise(ActiveSupport::TestCase::Assertion) do |