aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-02-24 16:21:21 -0800
committerCarlhuda <carlhuda@engineyard.com>2010-02-25 17:53:01 -0800
commit1fb2c6f63527408c8dbb00d6483ee6cf677db2df (patch)
treef6a57e606dc2c5f139a61cc6b88c279a350c9d8b /actionmailer
parenta278f2331007411b190d65577082d2710ad9a996 (diff)
downloadrails-1fb2c6f63527408c8dbb00d6483ee6cf677db2df.tar.gz
rails-1fb2c6f63527408c8dbb00d6483ee6cf677db2df.tar.bz2
rails-1fb2c6f63527408c8dbb00d6483ee6cf677db2df.zip
Get ActionMailer's tests passing with the non global router
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/test/old_base/url_test.rb6
1 files 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