From 1fb2c6f63527408c8dbb00d6483ee6cf677db2df Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Wed, 24 Feb 2010 16:21:21 -0800
Subject: Get ActionMailer's tests passing with the non global router

---
 actionmailer/test/old_base/url_test.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/actionmailer/test/old_base/url_test.rb b/actionmailer/test/old_base/url_test.rb
index 53664480ff..0e8917b427 100644
--- a/actionmailer/test/old_base/url_test.rb
+++ b/actionmailer/test/old_base/url_test.rb
@@ -4,8 +4,10 @@ require 'action_controller'
 class WelcomeController < ActionController::Base
 end
 
+AppRoutes = ActionDispatch::Routing::RouteSet.new
+
 class ActionMailer::Base
-  include ActionController::UrlFor
+  include AppRoutes.named_url_helpers
 end
 
 class TestMailer < ActionMailer::Base
@@ -61,7 +63,7 @@ class ActionMailerUrlTest < Test::Unit::TestCase
   def test_signed_up_with_url
     TestMailer.delivery_method = :test
     
-    ActionDispatch::Routing::Routes.draw do |map|
+    AppRoutes.draw do |map|
       map.connect ':controller/:action/:id'
       map.welcome 'welcome', :controller=>"foo", :action=>"bar"
     end
-- 
cgit v1.2.3