Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-06 22:40:14 -05:00
Code Issues Activity

Never output null JSON-LD schema

Browse source 
refs #5091, #6612

- fixes meta data so it won't output 'null' as a JSON-LD schema
- added test coverage for this if/else
- this case cannot happen within the existing system, it only happens with custom channels after #6612
This commit is contained in:
Hannah Wolfe 2016-03-20 22:33:46 +00:00
parent ef0945b09f
commit 9a8fbd5286
2 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/server/helpers/ghost_head.js
View file

@ -103,9 +103,11 @@ function ghost_head(options) {
head.push.apply(head, finaliseStructuredData(metaData));
head.push('');
head.push('<script type="application/ld+json">\n' +
JSON.stringify(metaData.schema, null, ' ') +
'\n </script>\n');
if (metaData.schema) {
head.push('<script type="application/ld+json">\n' +
JSON.stringify(metaData.schema, null, ' ') +
'\n </script>\n');
}
}
if (client && client.id && client.secret) {

20
core/test/unit/server_helpers/ghost_head_spec.js
View file

@ -595,6 +595,26 @@ describe('{{ghost_head}} helper', function () {
}).catch(done);
});
it('outputs structured data but not schema for custom channel', function (done) {
helpers.ghost_head.call(
{safeVersion: '0.3', relativeUrl: '/featured/', context: ['featured']},
{data: {root: {context: ['featured']}}}
).then(function (rendered) {
should.exist(rendered);
rendered.string.should.match(/<link rel="canonical" href="http:\/\/testurl.com\/featured\/" \/>/);
rendered.string.should.match(/<meta name="generator" content="Ghost 0.3" \/>/);
rendered.string.should.match(/<link rel="alternate" type="application\/rss\+xml" title="Ghost" href="http:\/\/testurl.com\/rss\/" \/>/);
rendered.string.should.match(/<meta property="og:site_name" content="Ghost" \/>/);
rendered.string.should.match(/<meta property="og:type" content="website" \/>/);
rendered.string.should.match(/<meta property="og:title" content="Ghost" \/>/);
rendered.string.should.match(/<meta property="og:url" content="http:\/\/testurl.com\/featured\/" \/>/);
rendered.string.should.not.match(/<script type=\"application\/ld\+json\">/);
done();
}).catch(done);
});
it('returns twitter and facebook descriptions if no meta description available', function (done) {
var post = {
title: 'Welcome to Ghost',