Fix implicitly rendering a JSON partial with the same name as an HTML partial (#400)

Author: georgeclaghorn

lib/jbuilder/jbuilder_template.rb

@@ -188,7 +188,7 @@ def _set_inline_partial(name, object, options)
       _scope{ _render_partial_with_options options.merge(collection: object) }
     else
       locals = ::Hash[options[:as], object]
-      _scope{ _render_partial options.merge(locals: locals) }
+      _scope{ _render_partial_with_options options.merge(locals: locals) }
     end
 
     set! name, value

test/jbuilder_template_test.rb

@@ -62,9 +62,9 @@ class JbuilderTemplateTest < ActionView::TestCase
     Rails.cache.clear
   end
 
-  def jbuild(source)
+  def jbuild(source, options = {})
     @rendered = []
-    partials = PARTIALS.clone
+    partials = options.fetch(:partials, PARTIALS).clone
     partials["test.json.jbuilder"] = source
     resolver = ActionView::FixtureResolver.new(partials)
     lookup_context.view_paths = [resolver]
@@ -438,4 +438,22 @@ def assert_collection_rendered(result, context = nil)
     assert_equal 123, result["id"]
     assert_equal "Chris Harris", result["name"]
   end
+
+  if Rails::VERSION::MAJOR >= 4
+    test "renders partial via set! with same name as HTML partial" do
+      partials = {
+        "_blog_post.html.erb" => "Hello!",
+        "_blog_post.json.jbuilder" => BLOG_POST_PARTIAL
+      }
+
+      @post = BLOG_POST_COLLECTION.first
+
+      result = jbuild(<<-JBUILDER, partials: partials)
+        json.post @post, partial: "blog_post", as: :blog_post
+      JBUILDER
+
+      assert_not_nil result["post"]
+      assert_equal 1, result["post"]["id"]
+    end
+  end
 end