Factor Integration::Runner behavior out of IntegrationTest. Introduce Session#request_count which counts processed requests.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8064 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 85 insertions, 72 deletions

diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb
index d8a310e0ba..6ab50f3768 100644
--- a/actionpack/lib/action_controller/integration.rb
+++ b/actionpack/lib/action_controller/integration.rb
@@ -51,6 +51,9 @@ module ActionController
       # A reference to the response instance used by the last request.
       attr_reader :response
 
+      # A running counter of the number of requests processed.
+      attr_accessor :request_count
+
       # Create and initialize a new +Session+ instance.
       def initialize
         reset!
@@ -67,6 +70,7 @@ module ActionController
         @https = false
         @cookies = {}
         @controller = @request = @response = nil
+        @request_count = 0
 
         self.host        = "www.example.com"
         self.remote_addr = "127.0.0.1"
@@ -200,14 +204,16 @@ module ActionController
       end
 
       private
-        class MockCGI < CGI #:nodoc:
-          attr_accessor :stdoutput, :env_table
+        class StubCGI < CGI #:nodoc:
+          attr_accessor :stdinput, :stdoutput, :env_table
 
-          def initialize(env, input = nil)
+          def initialize(env, stdinput = nil)
             self.env_table = env
             self.stdoutput = StringIO.new
 
-            super('query', StringIO.new(input || ''))
+            super
+
+            @stdinput = stdinput.is_a?(IO) ? stdinput : StringIO.new(stdinput || '')
           end
         end
 
@@ -258,9 +264,10 @@ module ActionController
 
           ActionController::Base.clear_last_instantiation!
 
-          cgi = MockCGI.new(env, data)
+          cgi = StubCGI.new(env, data)
           Dispatcher.dispatch(cgi, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, cgi.stdoutput)
           @result = cgi.stdoutput.string
+          @request_count += 1
 
           @controller = ActionController::Base.last_instantiation
           @request = @controller.request
@@ -307,7 +314,7 @@ module ActionController
 
         # Get a temporary URL writer object
         def generic_url_rewriter
-          cgi = MockCGI.new('REQUEST_METHOD' => "GET",
+          cgi = StubCGI.new('REQUEST_METHOD' => "GET",
                             'QUERY_STRING'   => "",
                             "REQUEST_URI"    => "/",
                             "HTTP_HOST"      => host,
@@ -362,6 +369,76 @@ module ActionController
         end
       end
     end
+
+    module Runner
+      # Reset the current session. This is useful for testing multiple sessions
+      # in a single test case.
+      def reset!
+        @integration_session = open_session
+      end
+
+      %w(get post put head delete cookies assigns
+         xml_http_request get_via_redirect post_via_redirect).each do |method|
+        define_method(method) do |*args|
+          reset! unless @integration_session
+          # reset the html_document variable, but only for new get/post calls
+          @html_document = nil unless %w(cookies assigns).include?(method)
+          returning @integration_session.send!(method, *args) do
+            copy_session_variables!
+          end
+        end
+      end
+
+      # Open a new session instance. If a block is given, the new session is
+      # yielded to the block before being returned.
+      #
+      #   session = open_session do |sess|
+      #     sess.extend(CustomAssertions)
+      #   end
+      #
+      # By default, a single session is automatically created for you, but you
+      # can use this method to open multiple sessions that ought to be tested
+      # simultaneously.
+      def open_session
+        session = Integration::Session.new
+
+        # delegate the fixture accessors back to the test instance
+        extras = Module.new { attr_accessor :delegate, :test_result }
+        if self.class.respond_to?(:fixture_table_names)
+          self.class.fixture_table_names.each do |table_name|
+            name = table_name.tr(".", "_")
+            next unless respond_to?(name)
+            extras.send!(:define_method, name) { |*args| delegate.send(name, *args) }
+          end
+        end
+
+        # delegate add_assertion to the test case
+        extras.send!(:define_method, :add_assertion) { test_result.add_assertion }
+        session.extend(extras)
+        session.delegate = self
+        session.test_result = @_result
+
+        yield session if block_given?
+        session
+      end
+
+      # Copy the instance variables from the current session instance into the
+      # test instance.
+      def copy_session_variables! #:nodoc:
+        return unless @integration_session
+        %w(controller response request).each do |var|
+          instance_variable_set("@#{var}", @integration_session.send!(var))
+        end
+      end
+
+      # Delegate unhandled messages to the current session instance.
+      def method_missing(sym, *args, &block)
+        reset! unless @integration_session
+        returning @integration_session.send!(sym, *args, &block) do
+          copy_session_variables!
+        end
+      end
+    end
   end
 
   # An IntegrationTest is one that spans multiple controllers and actions,
@@ -440,6 +517,8 @@ module ActionController
   #       end
   #   end
   class IntegrationTest < Test::Unit::TestCase
+    include Integration::Runner
+
     # Work around a bug in test/unit caused by the default test being named
     # as a symbol (:default_test), which causes regex test filters
     # (like "ruby test.rb -n /foo/") to fail because =~ doesn't work on
@@ -487,71 +566,5 @@ module ActionController
           superclass.use_instantiated_fixtures
       end
     end
-
-    # Reset the current session. This is useful for testing multiple sessions
-    # in a single test case.
-    def reset!
-      @integration_session = open_session
-    end
-
-    %w(get post put head delete cookies assigns 
-       xml_http_request get_via_redirect post_via_redirect).each do |method|
-      define_method(method) do |*args|
-        reset! unless @integration_session
-        # reset the html_document variable, but only for new get/post calls
-        @html_document = nil unless %w(cookies assigns).include?(method)
-        returning @integration_session.send!(method, *args) do
-          copy_session_variables!
-        end
-      end
-    end
-
-    # Open a new session instance. If a block is given, the new session is
-    # yielded to the block before being returned.
-    #
-    #   session = open_session do |sess|
-    #     sess.extend(CustomAssertions)
-    #   end
-    #
-    # By default, a single session is automatically created for you, but you
-    # can use this method to open multiple sessions that ought to be tested
-    # simultaneously.
-    def open_session
-      session = Integration::Session.new
-
-      # delegate the fixture accessors back to the test instance
-      extras = Module.new { attr_accessor :delegate, :test_result }
-      self.class.fixture_table_names.each do |table_name|
-        name = table_name.tr(".", "_")
-        next unless respond_to?(name)
-        extras.send!(:define_method, name) { |*args| delegate.send(name, *args) }
-      end
-
-      # delegate add_assertion to the test case
-      extras.send!(:define_method, :add_assertion) { test_result.add_assertion }
-      session.extend(extras)
-      session.delegate = self
-      session.test_result = @_result
-
-      yield session if block_given?
-      session
-    end
-
-    # Copy the instance variables from the current session instance into the
-    # test instance.
-    def copy_session_variables! #:nodoc:
-      return unless @integration_session
-      %w(controller response request).each do |var|
-        instance_variable_set("@#{var}", @integration_session.send!(var))
-      end
-    end
-
-    # Delegate unhandled messages to the current session instance.
-    def method_missing(sym, *args, &block)
-      reset! unless @integration_session
-      returning @integration_session.send!(sym, *args, &block) do
-        copy_session_variables!
-      end
-    end
   end
 end