Skip to content

Commit ad01e84

Browse files
authored
Merge pull request #430 from chrisyuska/deprecated_fragment_cache_key
Replace deprecated fragment_cache_key for Rails 5.2 support
2 parents 46f9e50 + ef2e600 commit ad01e84

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

lib/jbuilder/jbuilder_template.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ def _cache_key(key, options)
151151
name_options = options.slice(:skip_digest, :virtual_path)
152152
key = _fragment_name_with_digest(key, name_options)
153153

154-
if @context.respond_to?(:fragment_cache_key)
155-
key = @context.fragment_cache_key(key)
154+
if @context.respond_to?(:combined_fragment_cache_key)
155+
key = @context.combined_fragment_cache_key(key)
156156
else
157157
key = url_for(key).split('://', 2).last if ::Hash === key
158158
end

test/jbuilder_template_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,10 +320,10 @@ def assert_collection_rendered(result, context = nil)
320320
JBUILDER
321321
end
322322

323-
test "fragment caching uses fragment_cache_key" do
323+
test "fragment caching uses combined_fragment_cache_key" do
324324
undef_context_methods :fragment_name_with_digest, :cache_fragment_name
325325

326-
@context.expects(:fragment_cache_key).with("cachekey")
326+
@context.expects(:combined_fragment_cache_key).with("cachekey")
327327

328328
jbuild <<-JBUILDER
329329
json.cache! "cachekey" do

0 commit comments

Comments
 (0)