From 6d3b57fe423e18d61ae457a718c0f9901a173ace Mon Sep 17 00:00:00 2001
From: mfo <fourcade.m@gmail.com>
Date: Sat, 25 Nov 2017 19:37:33 +0100
Subject: fix(streaming_template_renderer): I18n.locale broken in layout. I18n
 gem stores the current locale in Thread.current[:local] (see:
 https://github.com/svenfuchs/i18n/blob/master/lib/i18n.rb#L23).
 StreamingTemplateRenderer is implemented with Fiber which have its own stack
 of locals and can not access Thread.current.locals(keys, see:
 https://ruby-doc.org/core-2.2.0/Thread.html#class-Thread-label-Fiber-local+vs.+Thread-local).

---
 .../test/fixtures/layouts/streaming_with_locale.erb |  2 ++
 .../test/fixtures/test/streaming_with_locale.erb    |  1 +
 actionview/test/template/streaming_render_test.rb   | 21 ++++++++++++++++++++-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 actionview/test/fixtures/layouts/streaming_with_locale.erb
 create mode 100644 actionview/test/fixtures/test/streaming_with_locale.erb

(limited to 'actionview/test')

diff --git a/actionview/test/fixtures/layouts/streaming_with_locale.erb b/actionview/test/fixtures/layouts/streaming_with_locale.erb
new file mode 100644
index 0000000000..e1fdad2073
--- /dev/null
+++ b/actionview/test/fixtures/layouts/streaming_with_locale.erb
@@ -0,0 +1,2 @@
+layout.locale: <%= I18n.locale %>
+<%= yield %>
diff --git a/actionview/test/fixtures/test/streaming_with_locale.erb b/actionview/test/fixtures/test/streaming_with_locale.erb
new file mode 100644
index 0000000000..b0f2b2f7e9
--- /dev/null
+++ b/actionview/test/fixtures/test/streaming_with_locale.erb
@@ -0,0 +1 @@
+view.locale: <%= I18n.locale %>
diff --git a/actionview/test/template/streaming_render_test.rb b/actionview/test/template/streaming_render_test.rb
index 23edf7b538..ef000300cc 100644
--- a/actionview/test/template/streaming_render_test.rb
+++ b/actionview/test/template/streaming_render_test.rb
@@ -5,7 +5,7 @@ require "abstract_unit"
 class TestController < ActionController::Base
 end
 
-class FiberedTest < ActiveSupport::TestCase
+class SetupFiberedBase < ActiveSupport::TestCase
   def setup
     view_paths = ActionController::Base.view_paths
     @assigns = { secret: "in the sauce", name: nil }
@@ -25,7 +25,9 @@ class FiberedTest < ActiveSupport::TestCase
     end
     string
   end
+end
 
+class FiberedTest < SetupFiberedBase
   def test_streaming_works
     content = []
     body = render_body(template: "test/hello_world", layout: "layouts/yield")
@@ -111,3 +113,20 @@ class FiberedTest < ActiveSupport::TestCase
       buffered_render(template: "test/streaming", layout: "layouts/streaming_with_capture")
   end
 end
+
+class FiberedWithLocaleTest < SetupFiberedBase
+  def setup
+    @old_locale = I18n.locale
+    I18n.locale = "da"
+    super
+  end
+
+  def teardown
+    I18n.locale = @old_locale
+  end
+
+  def test_render_with_streaming_and_locale
+    assert_equal "layout.locale: da\nview.locale: da\n\n",
+      buffered_render(template: "test/streaming_with_locale", layout: "layouts/streaming_with_locale")
+  end
+end
-- 
cgit v1.2.3