diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-30 18:24:38 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-30 18:24:38 -0600 |
| commit | d817c0a958efda990af654f72d15d6f42b43dd49 (patch) | |
| tree | 0cff3632163fadeba3585f56ecdd8d1d919e12c7 /spec | |
| parent | 65c87ca0ae20eb5dc62751047bda3e8b11e37ce0 (diff) | |
| parent | 4cca1d1e7efce51eecb64489f412a7b8631f0aed (diff) | |
Merge pull request #291 from glitch-soc/merge-upstream
Merge with upstream @ f4b80e6511f21b60f71ed182bb66ca6ef0ba9f66
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/fixtures/requests/oembed_json_xml.html | 8 | ||||
| -rw-r--r-- | spec/fixtures/requests/oembed_xml.html | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/spec/fixtures/requests/oembed_json_xml.html b/spec/fixtures/requests/oembed_json_xml.html index b5fc9bed0..8afd8e997 100644 --- a/spec/fixtures/requests/oembed_json_xml.html +++ b/spec/fixtures/requests/oembed_json_xml.html @@ -1,8 +1,14 @@ <!DOCTYPE html> <html> <head> + <!-- + oEmbed + https://oembed.com/ + > The type attribute must contain either application/json+oembed for JSON + > responses, or text/xml+oembed for XML. + --> <link href='https://host/provider.json' rel='alternate' type='application/json+oembed'> - <link href='https://host/provider.xml' rel='alternate' type='application/xml+oembed'> + <link href='https://host/provider.xml' rel='alternate' type='text/xml+oembed'> </head> <body></body> </html> diff --git a/spec/fixtures/requests/oembed_xml.html b/spec/fixtures/requests/oembed_xml.html index 5d7633e71..bdfcca170 100644 --- a/spec/fixtures/requests/oembed_xml.html +++ b/spec/fixtures/requests/oembed_xml.html @@ -1,7 +1,13 @@ <!DOCTYPE html> <html> <head> - <link href='https://host/provider.xml' rel='alternate' type='application/xml+oembed'> + <!-- + oEmbed + https://oembed.com/ + > The type attribute must contain either application/json+oembed for JSON + > responses, or text/xml+oembed for XML. + --> + <link href='https://host/provider.xml' rel='alternate' type='text/xml+oembed'> </head> <body></body> </html> |