Rails 2.1 RC1

Updated Instiki to Rails 2.1 RC1 (aka 2.0.991).

vendor/rails/actionpack/lib/action_controller/test_case.rb

@@ -3,14 +3,43 @@ require 'active_support/test_case'
 module ActionController
   class NonInferrableControllerError < ActionControllerError
     def initialize(name)
+      @name = name
       super "Unable to determine the controller to test from #{name}. " +
         "You'll need to specify it using 'tests YourController' in your " +
-        "test case definition"
+        "test case definition. This could mean that #{inferred_controller_name} does not exist " +
+        "or it contains syntax errors"
+    end
+
+    def inferred_controller_name
+      @name.sub(/Test$/, '')
     end
   end
 
   class TestCase < ActiveSupport::TestCase
+    # When the request.remote_addr remains the default for testing, which is 0.0.0.0, the exception is simply raised inline
+    # (bystepping the regular exception handling from rescue_action). If the request.remote_addr is anything else, the regular
+    # rescue_action process takes place. This means you can test your rescue_action code by setting remote_addr to something else
+    # than 0.0.0.0.
+    #
+    # The exception is stored in the exception accessor for further inspection.
+    module RaiseActionExceptions
+      attr_accessor :exception
+
+      def rescue_action(e)
+        self.exception = e
+        
+        if request.remote_addr == "0.0.0.0"
+          raise(e)
+        else
+          super(e)
+        end
+      end
+    end
+
+    setup :setup_controller_request_and_response
+
     @@controller_class = nil
+
     class << self
       def tests(controller_class)
         self.controller_class = controller_class
@@ -25,7 +54,7 @@ module ActionController
         if current_controller_class = read_inheritable_attribute(:controller_class)
           current_controller_class
         else
-          self.controller_class= determine_default_controller_class(name)
+          self.controller_class = determine_default_controller_class(name)
         end
       end
 
@@ -36,18 +65,19 @@ module ActionController
       end
 
       def prepare_controller_class(new_class)
-        new_class.class_eval do
-          def rescue_action(e)
-            raise e
-          end
-        end
+        new_class.send :include, RaiseActionExceptions
       end
     end
 
-    def setup
+    def setup_controller_request_and_response
       @controller = self.class.controller_class.new
-      @request    = TestRequest.new
-      @response   = TestResponse.new
+      @controller.request = @request = TestRequest.new
+      @response = TestResponse.new
     end
-  end
-end
+    
+    # Cause the action to be rescued according to the regular rules for rescue_action when the visitor is not local
+    def rescue_action_in_public!
+      @request.remote_addr = '208.77.188.166' # example.com
+    end
+ end
+end