Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit 7dd072d333040d2bb1197baa55fddfb9b72053bd 1 parent e046f36
Yehuda Katz + Carl Lerche authored
View
8 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
View
4 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 @@ def build_request_uri(action, parameters)
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
View
15 actionpack/test/abstract_unit2.rb
@@ -2,14 +2,6 @@
$:.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 @@ module ActionController
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 @@ def respond_to_action?(action_name)
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'
Please sign in to comment.
Something went wrong with that request. Please try again.