From 860202e8b2e3579402d48d7e56fa738a9529a340 Mon Sep 17 00:00:00 2001
From: thoefer <mail@tomhoefer.de>
Date: Mon, 1 Aug 2011 11:28:31 +0200
Subject: Fix the issue where default_url_options is being cached on test
 cases. Closes #1872. Closes #2031.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 actionpack/lib/action_controller/metal/testing.rb  |  5 ++++
 actionpack/lib/action_controller/test_case.rb      |  1 +
 .../default_url_options_with_filter_test.rb        | 29 ++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 actionpack/test/controller/default_url_options_with_filter_test.rb

diff --git a/actionpack/lib/action_controller/metal/testing.rb b/actionpack/lib/action_controller/metal/testing.rb
index f4efeb33ba..d1813ee745 100644
--- a/actionpack/lib/action_controller/metal/testing.rb
+++ b/actionpack/lib/action_controller/metal/testing.rb
@@ -4,6 +4,11 @@ module ActionController
 
     include RackDelegation
 
+    def recycle!
+      @_url_options = nil
+    end
+
+
     # TODO: Clean this up
     def process_with_new_base_test(request, response)
       @_request = request
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 45bb641aee..c8cf04bb69 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -450,6 +450,7 @@ module ActionController
         @controller.params.merge!(parameters)
         build_request_uri(action, parameters)
         @controller.class.class_eval { include Testing }
+        @controller.recycle! 
         @controller.process_with_new_base_test(@request, @response)
         @assigns = @controller.respond_to?(:view_assigns) ? @controller.view_assigns : {}
         @request.session.delete('flash') if @request.session['flash'].blank?
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
-- 
cgit v1.2.3