From d4015a7f0609f12a5f7be4c794e5c5eaf2c748d5 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 25 Feb 2019 15:14:53 -0800
Subject: Pass locals in to the template object on construction

This commit ensures that locals are passed in to the template objects
when they are constructed, then removes the `locals=` mutator on the
template object.  This means we don't need to mutate Template objects
with locals in the `decorate` method.
---
 actionview/test/template/template_test.rb | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'actionview/test/template')

diff --git a/actionview/test/template/template_test.rb b/actionview/test/template/template_test.rb
index c74305fb42..5a24aea173 100644
--- a/actionview/test/template/template_test.rb
+++ b/actionview/test/template/template_test.rb
@@ -39,7 +39,8 @@ class TestERBTemplate < ActiveSupport::TestCase
         "partial",
         ERBHandler,
         virtual_path: "partial",
-        format: :html
+        format: :html,
+        locals: []
       )
     end
 
@@ -57,7 +58,7 @@ class TestERBTemplate < ActiveSupport::TestCase
   end
 
   def new_template(body = "<%= hello %>", details = {})
-    details = { format: :html }.merge details
+    details = { format: :html, locals: [] }.merge details
     ActionView::Template.new(body.dup, "hello template", details.fetch(:handler) { ERBHandler }, { virtual_path: "hello" }.merge!(details))
   end
 
@@ -103,8 +104,7 @@ class TestERBTemplate < ActiveSupport::TestCase
   end
 
   def test_locals
-    @template = new_template("<%= my_local %>")
-    @template.locals = [:my_local]
+    @template = new_template("<%= my_local %>", locals: [:my_local])
     assert_equal "I am a local", render(my_local: "I am a local")
   end
 
@@ -122,16 +122,14 @@ class TestERBTemplate < ActiveSupport::TestCase
   end
 
   def test_refresh_with_templates
-    @template = new_template("Hello", virtual_path: "test/foo/bar")
-    @template.locals = [:key]
+    @template = new_template("Hello", virtual_path: "test/foo/bar", locals: [:key])
     assert_called_with(@context.lookup_context, :find_template, ["bar", %w(test/foo), false, [:key]], returns: "template") do
       assert_equal "template", @template.refresh(@context)
     end
   end
 
   def test_refresh_with_partials
-    @template = new_template("Hello", virtual_path: "test/_foo")
-    @template.locals = [:key]
+    @template = new_template("Hello", virtual_path: "test/_foo", locals: [:key])
     assert_called_with(@context.lookup_context, :find_template, ["foo", %w(test), true, [:key]], returns: "partial") do
       assert_equal "partial", @template.refresh(@context)
     end
-- 
cgit v1.2.3