2 files changed, 5 insertions, 3 deletions
diff --git a/actionpack/test/abstract/callbacks_test.rb b/actionpack/test/abstract/callbacks_test.rb
index b2d4d5f79a..2d02078020 100644
--- a/actionpack/test/abstract/callbacks_test.rb
+++ b/actionpack/test/abstract/callbacks_test.rb
@@ -47,6 +47,7 @@ module AbstractController
       end
 
       def index
+        @text ||= nil
         self.response_body = @text.to_s
       end
     end
@@ -152,7 +153,7 @@ module AbstractController
 
       test "when :except is specified, an after filter is not triggered on that action" do
         result = @controller.process(:index)
-        assert_nil @controller.instance_variable_get("@authenticated")
+        assert !@controller.instance_variable_defined?("@authenticated")
       end
     end
 
@@ -196,7 +197,7 @@ module AbstractController
 
       test "when :except is specified with an array, an after filter is not triggered on that action" do
         result = @controller.process(:index)
-        assert_nil @controller.instance_variable_get("@authenticated")
+        assert !@controller.instance_variable_defined?("@authenticated")
       end
     end
 
@@ -204,6 +205,7 @@ module AbstractController
       before_filter :first, :only => :index
 
       def not_index
+        @text ||= nil
         self.response_body = @text.to_s
       end
     end
diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb
index f580ad40f7..5ed6aa68b5 100644
--- a/actionpack/test/abstract/layouts_test.rb
+++ b/actionpack/test/abstract/layouts_test.rb
@@ -225,7 +225,7 @@ module AbstractControllerTests
       end
 
       test "when the layout is specified as a symbol and the method doesn't exist, raise an exception" do
-        assert_raises(NoMethodError) { WithSymbolAndNoMethod.new.process(:index) }
+        assert_raises(NameError) { WithSymbolAndNoMethod.new.process(:index) }
       end
 
       test "when the layout is specified as a symbol and the method returns something besides a string/false/nil, raise an exception" do