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

2 files changed, 8 insertions, 5 deletions

diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index 88e38a583b..5bc0491cff 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'abstract_unit'
+require 'active_support/time'
 
 class BaseTest < ActiveSupport::TestCase
   # TODO Add some tests for implicity layout render and url helpers
diff --git a/actionmailer/test/old_base/url_test.rb b/actionmailer/test/old_base/url_test.rb
index 6895fb230e..b6496bfe1b 100644
--- a/actionmailer/test/old_base/url_test.rb
+++ b/actionmailer/test/old_base/url_test.rb
@@ -28,7 +28,7 @@ class UrlTestMailer < ActionMailer::Base
   end
 end
 
-class ActionMailerUrlTest < Test::Unit::TestCase
+class ActionMailerUrlTest < ActionMailer::TestCase
 
   def encode( text, charset="UTF-8" )
     quoted_printable( text, charset )
@@ -57,10 +57,12 @@ class ActionMailerUrlTest < Test::Unit::TestCase
 
   def test_signed_up_with_url
     UrlTestMailer.delivery_method = :test
-    
-    AppRoutes.draw do |map|
-      map.connect ':controller/:action/:id'
-      map.welcome 'welcome', :controller=>"foo", :action=>"bar"
+
+    assert_deprecated do
+      AppRoutes.draw do |map|
+        map.connect ':controller/:action/:id'
+        map.welcome 'welcome', :controller=>"foo", :action=>"bar"
+      end
     end
 
     expected = new_mail