Skip to content
Browse files

Get all of rake tests to pass

  • Loading branch information...
1 parent c7ba9aa commit 7b1f483fda4fc8e4fc931649364a211a9f9d945f Yehuda Katz + Carl Lerche committed Jun 15, 2009
Showing with 9 additions and 1 deletion.
  1. +2 −0 actionpack/lib/action_controller.rb
  2. +7 −1 railties/test/rails_info_controller_test.rb
View
2 actionpack/lib/action_controller.rb
@@ -20,12 +20,14 @@ module ActionController
# require 'action_controller/routing'
autoload :Caching, 'action_controller/caching'
autoload :Dispatcher, 'action_controller/dispatch/dispatcher'
+ autoload :Integration, 'action_controller/testing/integration'
autoload :MimeResponds, 'action_controller/old_base/mime_responds'
autoload :PolymorphicRoutes, 'action_controller/routing/generation/polymorphic_routes'
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 :TestProcess, 'action_controller/testing/process'
autoload :UrlRewriter, 'action_controller/routing/generation/url_rewriter'
autoload :UrlWriter, 'action_controller/routing/generation/url_rewriter'
View
8 railties/test/rails_info_controller_test.rb
@@ -1,6 +1,6 @@
require 'abstract_unit'
require 'action_controller'
-require 'action_controller/testing/process'
+require 'action_controller/testing/process2'
require 'rails/info'
require 'rails/info_controller'
@@ -9,6 +9,12 @@
map.connect ':controller/:action/:id'
end
+module ActionController
+ class Base
+ include ActionController::Testing
+ end
+end
+
class InfoControllerTest < ActionController::TestCase
tests Rails::InfoController

0 comments on commit 7b1f483

Please sign in to comment.
Something went wrong with that request. Please try again.