aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/test
diff options
context:
space:
mode:
authorAndrew White <pixeltrix@users.noreply.github.com>2017-05-20 12:58:17 +0100
committerGitHub <noreply@github.com>2017-05-20 12:58:17 +0100
commit1c2dd9cb66ceda3c8febfed4f3f2cb39ae92bd4a (patch)
tree7654d48e1a2367194083a9a7f06e98d23a9cfd97 /actionview/test
parente4ce81c2342e5e907bd0d2adba3071ca43159788 (diff)
parent062e5f2b068fbce74102d7301b58a3cd7c5da883 (diff)
downloadrails-1c2dd9cb66ceda3c8febfed4f3f2cb39ae92bd4a.tar.gz
rails-1c2dd9cb66ceda3c8febfed4f3f2cb39ae92bd4a.tar.bz2
rails-1c2dd9cb66ceda3c8febfed4f3f2cb39ae92bd4a.zip
Merge pull request #29158 from ffmike/add-json-feed
Add :json type to auto_discovery_link_tag
Diffstat (limited to 'actionview/test')
-rw-r--r--actionview/test/template/asset_tag_helper_test.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionview/test/template/asset_tag_helper_test.rb b/actionview/test/template/asset_tag_helper_test.rb
index b7a993c5c9..6093a4e660 100644
--- a/actionview/test/template/asset_tag_helper_test.rb
+++ b/actionview/test/template/asset_tag_helper_test.rb
@@ -53,6 +53,7 @@ class AssetTagHelperTest < ActionView::TestCase
%(auto_discovery_link_tag) => %(<link href="http://www.example.com" rel="alternate" title="RSS" type="application/rss+xml" />),
%(auto_discovery_link_tag(:rss)) => %(<link href="http://www.example.com" rel="alternate" title="RSS" type="application/rss+xml" />),
%(auto_discovery_link_tag(:atom)) => %(<link href="http://www.example.com" rel="alternate" title="ATOM" type="application/atom+xml" />),
+ %(auto_discovery_link_tag(:json)) => %(<link href="http://www.example.com" rel="alternate" title="JSON" type="application/json" />),
%(auto_discovery_link_tag(:rss, :action => "feed")) => %(<link href="http://www.example.com" rel="alternate" title="RSS" type="application/rss+xml" />),
%(auto_discovery_link_tag(:rss, "http://localhost/feed")) => %(<link href="http://localhost/feed" rel="alternate" title="RSS" type="application/rss+xml" />),
%(auto_discovery_link_tag(:rss, "//localhost/feed")) => %(<link href="//localhost/feed" rel="alternate" title="RSS" type="application/rss+xml" />),