aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/action_pack_assertions_test.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-09-29 10:04:42 +0200
committerJosé Valim <jose.valim@gmail.com>2010-09-29 10:04:42 +0200
commit0bbf9029e8089356aed0e3be2f859d56951a89cf (patch)
tree38e41ef8b63140a91c828bec03e06e83f38899b6 /actionpack/test/controller/action_pack_assertions_test.rb
parent006cef7107b648882cfc09f56904c601454cfc77 (diff)
parent17599abc9c06f30ff23d7ad47a3f029e32c26c88 (diff)
downloadrails-0bbf9029e8089356aed0e3be2f859d56951a89cf.tar.gz
rails-0bbf9029e8089356aed0e3be2f859d56951a89cf.tar.bz2
rails-0bbf9029e8089356aed0e3be2f859d56951a89cf.zip
Merge remote branch 'miloops/warnings'
Diffstat (limited to 'actionpack/test/controller/action_pack_assertions_test.rb')
-rw-r--r--actionpack/test/controller/action_pack_assertions_test.rb4
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 a0092a9f73..d9d258e593 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -234,13 +234,13 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
def test_template_objects_exist
process :assign_this
- assert !@controller.instance_variable_get(:"@hi")
+ assert !@controller.instance_variable_defined?(:"@hi")
assert @controller.instance_variable_get(:"@howdy")
end
def test_template_objects_missing
process :nothing
- assert_nil @controller.instance_variable_get(:@howdy)
+ assert !@controller.instance_variable_defined?(:@howdy)
end
def test_empty_flash