aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/test/fixtures/digestor/api
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2016-06-17 01:40:40 +0930
committerGitHub <noreply@github.com>2016-06-17 01:40:40 +0930
commit2ff5a1755f12e417371d1b3c0e0f9b690fa57ab5 (patch)
tree7858b8f91828378429d9e9c0458821b45b822bb6 /actionview/test/fixtures/digestor/api
parent0d00ef96fb4d394d5c32b14671d24a7eb70c57cc (diff)
parent57f87ae4806c5514df8c12e90501c0df1dbaff82 (diff)
downloadrails-2ff5a1755f12e417371d1b3c0e0f9b690fa57ab5.tar.gz
rails-2ff5a1755f12e417371d1b3c0e0f9b690fa57ab5.tar.bz2
rails-2ff5a1755f12e417371d1b3c0e0f9b690fa57ab5.zip
Merge pull request #25411 from javan/fix-digesting-different-formats
Fix digesting non-HTML templates with non-unique logical names
Diffstat (limited to 'actionview/test/fixtures/digestor/api')
-rw-r--r--actionview/test/fixtures/digestor/api/comments/_comment.json.erb1
-rw-r--r--actionview/test/fixtures/digestor/api/comments/_comments.json.erb1
2 files changed, 2 insertions, 0 deletions
diff --git a/actionview/test/fixtures/digestor/api/comments/_comment.json.erb b/actionview/test/fixtures/digestor/api/comments/_comment.json.erb
new file mode 100644
index 0000000000..696eb13917
--- /dev/null
+++ b/actionview/test/fixtures/digestor/api/comments/_comment.json.erb
@@ -0,0 +1 @@
+{"content": "Great story!"}
diff --git a/actionview/test/fixtures/digestor/api/comments/_comments.json.erb b/actionview/test/fixtures/digestor/api/comments/_comments.json.erb
new file mode 100644
index 0000000000..c28646a283
--- /dev/null
+++ b/actionview/test/fixtures/digestor/api/comments/_comments.json.erb
@@ -0,0 +1 @@
+<%= render partial: "comments/comment", collection: commentable.comments %>