diff options
| author | Jose and Yehuda <wycats@gmail.com> | 2012-04-24 23:55:39 -0500 |
|---|---|---|
| committer | Jose and Yehuda <wycats@gmail.com> | 2012-04-24 23:55:39 -0500 |
| commit | a837b30f8450ceac3813983b8ee3b90be5f2898a (patch) | |
| tree | 2d6f18973d4d5609492563bac0d03cdf8f77e448 /actionmailer/test | |
| parent | 56cdc81c08b1847c5c1f699810a8c3b9ac3715a6 (diff) | |
| download | rails-a837b30f8450ceac3813983b8ee3b90be5f2898a.tar.gz rails-a837b30f8450ceac3813983b8ee3b90be5f2898a.tar.bz2 rails-a837b30f8450ceac3813983b8ee3b90be5f2898a.zip | |
Clean up some straggling build failures
Diffstat (limited to 'actionmailer/test')
| -rw-r--r-- | actionmailer/test/i18n_with_controller_test.rb | 2 | ||||
| -rw-r--r-- | actionmailer/test/url_test.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionmailer/test/i18n_with_controller_test.rb b/actionmailer/test/i18n_with_controller_test.rb index 7040ae6f8d..68ed86e0d4 100644 --- a/actionmailer/test/i18n_with_controller_test.rb +++ b/actionmailer/test/i18n_with_controller_test.rb @@ -24,7 +24,7 @@ end class ActionMailerI18nWithControllerTest < ActionDispatch::IntegrationTest Routes = ActionDispatch::Routing::RouteSet.new Routes.draw do - match ':controller(/:action(/:id))' + get ':controller(/:action(/:id))' end def app diff --git a/actionmailer/test/url_test.rb b/actionmailer/test/url_test.rb index 0536e83098..2ea1723434 100644 --- a/actionmailer/test/url_test.rb +++ b/actionmailer/test/url_test.rb @@ -57,8 +57,8 @@ class ActionMailerUrlTest < ActionMailer::TestCase UrlTestMailer.delivery_method = :test AppRoutes.draw do - match ':controller(/:action(/:id))' - match '/welcome' => "foo#bar", :as => "welcome" + get ':controller(/:action(/:id))' + get '/welcome' => "foo#bar", :as => "welcome" end expected = new_mail |