diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-08 07:24:41 -0800 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-08 07:24:41 -0800 |
commit | 40991dd4bcbd2d9de0d9ba1b775a103532d9fae7 (patch) | |
tree | a9ebf2deafa6a04bde975886d3fc98b630683ece /actionpack/test/controller | |
parent | bef330803ae4a30bfeaf6dd9c86077cfb5e250e1 (diff) | |
parent | 4ec7493e3cb9366df604f9f3082b4cd6f6dfd4fd (diff) | |
download | rails-40991dd4bcbd2d9de0d9ba1b775a103532d9fae7.tar.gz rails-40991dd4bcbd2d9de0d9ba1b775a103532d9fae7.tar.bz2 rails-40991dd4bcbd2d9de0d9ba1b775a103532d9fae7.zip |
Merge pull request #8465 from frodsan/update_am_action_callbacks
use _action callbacks in actionmailer
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r-- | actionpack/test/controller/default_url_options_with_before_action_test.rb (renamed from actionpack/test/controller/default_url_options_with_filter_test.rb) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/test/controller/default_url_options_with_filter_test.rb b/actionpack/test/controller/default_url_options_with_before_action_test.rb index 9a9ab17fee..656fd0431e 100644 --- a/actionpack/test/controller/default_url_options_with_filter_test.rb +++ b/actionpack/test/controller/default_url_options_with_before_action_test.rb @@ -1,10 +1,10 @@ require 'abstract_unit' -class ControllerWithBeforeFilterAndDefaultUrlOptions < ActionController::Base +class ControllerWithBeforeActionAndDefaultUrlOptions < ActionController::Base - before_filter { I18n.locale = params[:locale] } - after_filter { I18n.locale = "en" } + before_action { I18n.locale = params[:locale] } + after_action { I18n.locale = "en" } def target render :text => "final response" @@ -19,11 +19,11 @@ class ControllerWithBeforeFilterAndDefaultUrlOptions < ActionController::Base end end -class ControllerWithBeforeFilterAndDefaultUrlOptionsTest < ActionController::TestCase +class ControllerWithBeforeActionAndDefaultUrlOptionsTest < ActionController::TestCase # This test has its roots in issue #1872 test "should redirect with correct locale :de" do get :redirect, :locale => "de" - assert_redirected_to "/controller_with_before_filter_and_default_url_options/target?locale=de" + assert_redirected_to "/controller_with_before_action_and_default_url_options/target?locale=de" end end |