From 88a3343ed57c01ca358da8473d15fc4d2b4a5bff Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 15 Feb 2005 01:24:55 +0000
Subject: Backed out of routing merge.. investigating missing patches

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@616 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/lib/action_controller/test_process.rb | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

(limited to 'actionpack/lib/action_controller/test_process.rb')

diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb
index 3223da198c..d4dfe7933d 100644
--- a/actionpack/lib/action_controller/test_process.rb
+++ b/actionpack/lib/action_controller/test_process.rb
@@ -31,8 +31,8 @@ module ActionController #:nodoc:
 
   class TestRequest < AbstractRequest #:nodoc:
     attr_accessor :cookies
-    attr_accessor :query_parameters, :request_parameters, :path, :session, :env
-    attr_accessor :host, :remote_addr
+    attr_accessor :query_parameters, :request_parameters, :session, :env
+    attr_accessor :host, :path, :request_uri, :remote_addr
 
     def initialize(query_parameters = nil, request_parameters = nil, session = nil)
       @query_parameters   = query_parameters || {}
@@ -58,28 +58,11 @@ module ActionController #:nodoc:
       @parameters = nil
     end
     
-    # Used to check AbstractRequest's request_uri functionality.
-    # Disables the use of @path and @request_uri so superclass can handle those.
-    def set_REQUEST_URI(value)
-      @env["REQUEST_URI"] = value
-      @request_uri = nil
-      @path = nil
-    end
-
     def request_uri=(uri)
       @request_uri = uri
       @path = uri.split("?").first
     end
 
-    def request_uri
-      @request_uri || super()
-    end
-
-    def path
-      @path || super()
-    end
-    
-
     private
       def initialize_containers
         @env, @cookies = {}, {}
@@ -254,7 +237,6 @@ module Test
         def process(action, parameters = nil, session = nil)
           @request.env['REQUEST_METHOD'] ||= "GET"
           @request.action = action.to_s
-          @request.path_parameters = { :controller => @controller.class.controller_path }
           @request.parameters.update(parameters) unless parameters.nil?
           @request.session = ActionController::TestSession.new(session) unless session.nil?
           @controller.process(@request, @response)
-- 
cgit v1.2.3