Get tests to run (with failures) without old base around

rails · Jun 15, 2009 · a63caa4 · a63caa4 · rubys · Jun 16, 2009
1 parent 614374b
commit a63caa4
Show file tree

Hide file tree

Showing 42 changed files with 1,687 additions and 1,685 deletions.
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
@@ -1,3 +1,5 @@
+require "active_support/core_ext/class"
+
 module ActionMailer #:nodoc:
   # Action Mailer allows you to send email from your application using a mailer model and views.
   #
@@ -248,7 +250,7 @@ class Base
     include AdvAttrAccessor, PartContainer, Quoting, Utils
     if Object.const_defined?(:ActionController)
       include ActionController::UrlWriter
-      include ActionController::Layout
+      include ActionController::Layouts
     end
 
     private_class_method :new #:nodoc:

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
@@ -1,81 +1,44 @@
-#--
-# Copyright (c) 2004-2009 David Heinemeier Hansson
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-
-activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
-$:.unshift activesupport_path if File.directory?(activesupport_path)
-require 'active_support'
-
-require File.join(File.dirname(__FILE__), "action_pack")
-
 module ActionController
-  # TODO: Review explicit to see if they will automatically be handled by
-  # the initilizer if they are really needed.
-  def self.load_all!
-    [Base, Request, Response, UrlRewriter, UrlWriter]
-    [ActionDispatch::Http::Headers]
-  end
+  autoload :Base,                 "action_controller/base/base"
+  autoload :ConditionalGet,       "action_controller/base/conditional_get"
+  autoload :HideActions,          "action_controller/base/hide_actions"
+  autoload :Http,                 "action_controller/base/http"
+  autoload :Layouts,              "action_controller/base/layouts"
+  autoload :RackConvenience,      "action_controller/base/rack_convenience"
+  autoload :Rails2Compatibility,  "action_controller/base/compatibility"
+  autoload :Redirector,           "action_controller/base/redirector"
+  autoload :Renderer,             "action_controller/base/renderer"
+  autoload :RenderOptions,        "action_controller/base/render_options"
+  autoload :Renderers,            "action_controller/base/render_options"
+  autoload :Rescue,               "action_controller/base/rescuable"
+  autoload :Testing,              "action_controller/base/testing"
+  autoload :UrlFor,               "action_controller/base/url_for"
+  autoload :Session,              "action_controller/base/session"
+  autoload :Helpers,              "action_controller/base/helpers"
 
-  autoload :Base, 'action_controller/base/base'
-  autoload :Benchmarking, 'action_controller/base/chained/benchmarking'
-  autoload :Caching, 'action_controller/caching'
-  autoload :Cookies, 'action_controller/base/cookies'
-  autoload :Dispatcher, 'action_controller/dispatch/dispatcher'
-  autoload :Filters, 'action_controller/base/chained/filters'
-  autoload :Flash, 'action_controller/base/chained/flash'
-  autoload :Helpers, 'action_controller/base/helpers'
-  autoload :HttpAuthentication, 'action_controller/base/http_authentication'
-  autoload :Integration, 'action_controller/testing/integration'
-  autoload :IntegrationTest, 'action_controller/testing/integration'
-  autoload :Layout, 'action_controller/base/layout'
-  autoload :MimeResponds, 'action_controller/base/mime_responds'
+  # Ported modules
+  # require 'action_controller/routing'
+  autoload :Caching,           'action_controller/caching'
+  autoload :Dispatcher,        'action_controller/dispatch/dispatcher'
+  autoload :MimeResponds,      'action_controller/old_base/mime_responds'
   autoload :PolymorphicRoutes, 'action_controller/routing/generation/polymorphic_routes'
-  autoload :RecordIdentifier, 'action_controller/record_identifier'
-  autoload :Redirector, 'action_controller/base/redirect'
-  autoload :Renderer, 'action_controller/base/render'
-  autoload :RequestForgeryProtection, 'action_controller/base/request_forgery_protection'
-  autoload :Rescue, 'action_controller/base/rescue'
-  autoload :Resources, 'action_controller/routing/resources'
-  autoload :Responder, 'action_controller/base/responder'
-  autoload :Routing, 'action_controller/routing'
-  autoload :SessionManagement, 'action_controller/base/session_management'
-  autoload :Streaming, 'action_controller/base/streaming'
-  autoload :TestCase, 'action_controller/testing/test_case'
-  autoload :TestProcess, 'action_controller/testing/process'
-  autoload :Translation, 'action_controller/translation'
-  autoload :UrlEncodedPairParser, 'action_controller/dispatch/url_encoded_pair_parser'
-  autoload :UrlRewriter, 'action_controller/routing/generation/url_rewriter'
-  autoload :UrlWriter, 'action_controller/routing/generation/url_rewriter'
-  autoload :Verification, 'action_controller/base/verification'
-  autoload :FilterParameterLogging, 'action_controller/base/filter_parameter_logging'
+  autoload :RecordIdentifier,  'action_controller/record_identifier'
+  autoload :Resources,         'action_controller/routing/resources'
+  autoload :SessionManagement, 'action_controller/old_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'
+
+  autoload :Verification,             'action_controller/old_base/verification'
+  autoload :Flash,                    'action_controller/old_base/chained/flash'
+  autoload :RequestForgeryProtection, 'action_controller/old_base/request_forgery_protection'
+  autoload :Streaming,                'action_controller/old_base/streaming'
+  autoload :HttpAuthentication,       'action_controller/old_base/http_authentication'
+  autoload :FilterParameterLogging,   'action_controller/old_base/filter_parameter_logging'
+  autoload :Translation,              'action_controller/translation'
+  autoload :Cookies,                  'action_controller/old_base/cookies'
 
-  module Assertions
-    autoload :DomAssertions, 'action_controller/testing/assertions/dom'
-    autoload :ModelAssertions, 'action_controller/testing/assertions/model'
-    autoload :ResponseAssertions, 'action_controller/testing/assertions/response'
-    autoload :RoutingAssertions, 'action_controller/testing/assertions/routing'
-    autoload :SelectorAssertions, 'action_controller/testing/assertions/selector'
-    autoload :TagAssertions, 'action_controller/testing/assertions/tag'
-  end
+  require 'action_controller/routing'
 end
 
 autoload :HTML, 'action_controller/vendor/html-scanner'