Get Railties tests passing

3 files changed, 5 insertions, 2 deletions

diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index 4c48d2bed6..7622a90b17 100644
--- a/actionmailer/lib/action_mailer/railtie.rb
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -6,7 +6,7 @@ module ActionMailer
     railtie_name :action_mailer
 
     initializer "action_mailer.url_for", :before => :load_environment_config do |app|
-      ActionMailer::Base.send(:include, ActionController::UrlFor) if defined?(ActionController)
+      ActionMailer::Base.send(:include, app.routes.named_url_helpers)
     end
 
     require "action_mailer/railties/log_subscriber"
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 67094392ee..a74550b302 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -48,7 +48,7 @@ module Rails
     end
 
     def routes
-      ::ActionDispatch::Routing::Routes
+      @routes ||= ActionDispatch::Routing::RouteSet.new
     end
 
     def railties
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index a6fc23d95b..017e51326c 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -18,6 +18,9 @@ class InfoControllerTest < ActionController::TestCase
       match ':controller/:action'
     end
     @controller.stubs(:consider_all_requests_local? => false, :local_request? => true)
+    @router = Rails.application.routes
+
+    Rails::InfoController.send(:include, @router.named_url_helpers)
   end
 
   test "info controller does not allow remote requests" do