aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/action_pack_assertions_test.rb
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-03-17 16:28:05 -0700
committerCarlhuda <carlhuda@engineyard.com>2010-03-17 16:29:35 -0700
commitd9375f3f302a5d1856ad57946c7263d4e6a45a2a (patch)
tree76769a45da7b1315df173976067ff37edcb59b49 /actionpack/test/controller/action_pack_assertions_test.rb
parent7872fa9a4397c450ee22c511966e149d594d153e (diff)
downloadrails-d9375f3f302a5d1856ad57946c7263d4e6a45a2a.tar.gz
rails-d9375f3f302a5d1856ad57946c7263d4e6a45a2a.tar.bz2
rails-d9375f3f302a5d1856ad57946c7263d4e6a45a2a.zip
Modify assert_template to use notifications. Also, remove ActionController::Base#template since it is no longer needed.
Diffstat (limited to 'actionpack/test/controller/action_pack_assertions_test.rb')
-rw-r--r--actionpack/test/controller/action_pack_assertions_test.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index b6810b0c27..1741b58f72 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -181,6 +181,8 @@ module Admin
end
end
+# require "action_dispatch/test_process"
+
# a test case to exercise the new capabilities TestRequest & TestResponse
class ActionPackAssertionsControllerTest < ActionController::TestCase
# -- assertion-based testing ------------------------------------------------
@@ -303,14 +305,14 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
# make sure that the template objects exist
def test_template_objects_alive
process :assign_this
- assert !@controller.template.instance_variable_get(:"@hi")
- assert @controller.template.instance_variable_get(:"@howdy")
+ assert !@controller.instance_variable_get(:"@hi")
+ assert @controller.instance_variable_get(:"@howdy")
end
# make sure we don't have template objects when we shouldn't
def test_template_object_missing
process :nothing
- assert_nil @controller.template.assigns['howdy']
+ assert_nil @controller.instance_variable_get(:@howdy)
end
# check the empty flashing