A few more tweaks to get new Base running old render tests again

3 files changed, 10 insertions, 17 deletions

diff --git a/actionpack/lib/action_controller/new_base.rb b/actionpack/lib/action_controller/new_base.rb
index b292fd579d..7098b812f6 100644
--- a/actionpack/lib/action_controller/new_base.rb
+++ b/actionpack/lib/action_controller/new_base.rb
@@ -10,10 +10,14 @@ module ActionController
   
   # Ported modules
   # require 'action_controller/routing'
-  autoload :Dispatcher, 'action_controller/dispatch/dispatcher'
+  autoload :Dispatcher,        'action_controller/dispatch/dispatcher'
   autoload :PolymorphicRoutes, 'action_controller/routing/generation/polymorphic_routes'
-  autoload :Resources, 'action_controller/routing/resources'
+  autoload :RecordIdentifier,  'action_controller/record_identifier'
+  autoload :Resources,         'action_controller/routing/resources'
   autoload :SessionManagement, 'action_controller/base/session_management'
+  autoload :TestCase,          'action_controller/testing/test_case'
+  autoload :UrlRewriter,       'action_controller/routing/generation/url_rewriter'
+  autoload :UrlWriter,         'action_controller/routing/generation/url_rewriter'
   
   require 'action_controller/routing'
 end
diff --git a/actionpack/lib/action_controller/testing/process2.rb b/actionpack/lib/action_controller/testing/process2.rb
index 7111733d0d..d9af7add5f 100644
--- a/actionpack/lib/action_controller/testing/process2.rb
+++ b/actionpack/lib/action_controller/testing/process2.rb
@@ -1,7 +1,7 @@
 require "action_controller/testing/process"
 
 module ActionController
-  module TestProcess2
+  module TestProcess
     
     # Executes a request simulating GET HTTP method and set/volley the response
     def get(action, parameters = nil, session = nil, flash = nil)
@@ -60,7 +60,7 @@ module ActionController
         options.update(:only_path => true, :action => action)
 
         url = ActionController::UrlRewriter.new(@request, parameters)
-        @request.set_REQUEST_URI(url.rewrite(options))
+        @request.request_uri = url.rewrite(options)
       end
     end      
       
diff --git a/actionpack/test/abstract_unit2.rb b/actionpack/test/abstract_unit2.rb
index c1e2631ac2..b95bfa0202 100644
--- a/actionpack/test/abstract_unit2.rb
+++ b/actionpack/test/abstract_unit2.rb
@@ -2,14 +2,6 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 $:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib')
 $:.unshift(File.dirname(__FILE__) + '/lib')
 
-# HAX
-module ActionController
-
-end
-
-# TestCase
-#  include TestProcess2
-
 
 require 'test/unit'
 require 'active_support'
@@ -17,16 +9,13 @@ require 'active_support/core/all'
 require 'active_support/test_case'
 require 'action_controller/abstract'
 require 'action_controller/new_base'
-require 'action_controller/new_base/base'
-require 'action_controller/new_base/renderer' # HAX
-require 'action_controller'
 require 'fixture_template'
+require 'action_controller/testing/process2'
 require 'action_view/test_case'
 
 FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
 
 module ActionController
-  autoload :TestProcess2, 'action_controller/testing/process2'
   
   class ActionControllerError < StandardError #:nodoc:
   end
@@ -158,7 +147,7 @@ module ActionController
   Base.view_paths = FIXTURE_LOAD_PATH
   
   class TestCase
-    include TestProcess2
+    include TestProcess
     setup do
       ActionController::Routing::Routes.draw do |map|
         map.connect ':controller/:action/:id'