Merge remote-tracking branch 'upstream/master'

1 files changed, 29 insertions, 0 deletions

diff --git a/actionpack/test/controller/default_url_options_with_filter_test.rb b/actionpack/test/controller/default_url_options_with_filter_test.rb
new file mode 100644
index 0000000000..3bbb981040
--- /dev/null
+++ b/actionpack/test/controller/default_url_options_with_filter_test.rb
@@ -0,0 +1,29 @@
+require 'abstract_unit'
+
+
+class ControllerWithBeforeFilterAndDefaultUrlOptions < ActionController::Base
+
+  before_filter { I18n.locale = params[:locale] }
+  after_filter { I18n.locale = "en" }
+
+  def target
+    render :text => "final response"
+  end
+
+  def redirect
+    redirect_to :action => "target"
+  end
+
+  def default_url_options
+    {:locale => "de"}
+  end 
+end
+
+class ControllerWithBeforeFilterAndDefaultUrlOptionsTest < ActionController::TestCase
+
+  # This test has it´s 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"
+  end
+end