Merge branch 'master' of github.com:rails/rails

1 files changed, 23 insertions, 21 deletions

diff --git a/actionmailer/test/url_test.rb b/actionmailer/test/url_test.rb
index 71286bd1cf..2224f6321c 100644
--- a/actionmailer/test/url_test.rb
+++ b/actionmailer/test/url_test.rb
@@ -1,9 +1,9 @@
 require 'abstract_unit'
 
 class TestMailer < ActionMailer::Base
-  
+
   default_url_options[:host] = 'www.basecamphq.com'
-  
+
   def signed_up_with_url(recipient)
     @recipients   = recipient
     @subject      = "[Signed up] Welcome #{recipient}"
@@ -52,25 +52,27 @@ class ActionMailerUrlTest < Test::Unit::TestCase
   end
 
   def test_signed_up_with_url
-    ActionController::Routing::Routes.draw do |map| 
-      map.connect ':controller/:action/:id' 
-      map.welcome 'welcome', :controller=>"foo", :action=>"bar"
-    end
+    ActionController::Routing.use_controllers! ['welcome'] do
+      ActionController::Routing::Routes.draw do |map|
+        map.connect ':controller/:action/:id'
+        map.welcome 'welcome', :controller=>"foo", :action=>"bar"
+      end
 
-    expected = new_mail
-    expected.to      = @recipient
-    expected.subject = "[Signed up] Welcome #{@recipient}"
-    expected.body    = "Hello there, \n\nMr. #{@recipient}. Please see our greeting at http://example.com/welcome/greeting http://www.basecamphq.com/welcome\n\n<img alt=\"Somelogo\" src=\"/images/somelogo.png\" />"
-    expected.from    = "system@loudthinking.com"
-    expected.date    = Time.local(2004, 12, 12)
-
-    created = nil
-    assert_nothing_raised { created = TestMailer.create_signed_up_with_url(@recipient) }
-    assert_not_nil created
-    assert_equal expected.encoded, created.encoded
-
-    assert_nothing_raised { TestMailer.deliver_signed_up_with_url(@recipient) }
-    assert_not_nil ActionMailer::Base.deliveries.first
-    assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
+      expected = new_mail
+      expected.to      = @recipient
+      expected.subject = "[Signed up] Welcome #{@recipient}"
+      expected.body    = "Hello there, \n\nMr. #{@recipient}. Please see our greeting at http://example.com/welcome/greeting http://www.basecamphq.com/welcome\n\n<img alt=\"Somelogo\" src=\"/images/somelogo.png\" />"
+      expected.from    = "system@loudthinking.com"
+      expected.date    = Time.local(2004, 12, 12)
+
+      created = nil
+      assert_nothing_raised { created = TestMailer.create_signed_up_with_url(@recipient) }
+      assert_not_nil created
+      assert_equal expected.encoded, created.encoded
+
+      assert_nothing_raised { TestMailer.deliver_signed_up_with_url(@recipient) }
+      assert_not_nil ActionMailer::Base.deliveries.first
+      assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
+    end
   end
 end