Merge pull request #52 from Financial-Times/CPREL-708

Revert "CPREL-708: Remove Product from structured data type to prevent errors in Semrush"
Financial-Times · Sep 13, 2023 · d1476b3 · d1476b3
2 parents 11968cf + f8bd54f
commit d1476b3
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ Included in the JSON-LD (but not the snippet below) is a whole load of other met
 	[...]
 	'isAccessibleForFree': 'False',
 	'isPartOf': {
-		'@type': [ 'CreativeWork' ],
+		'@type': [ 'CreativeWork', 'Product' ],
 		'name' : 'Financial Times',
 		'productID': 'ft.com:subscribed' // or 'ft.com:premium' or 'ft.com:registered' depending on the requested content accessLevel
 	}
@@ -66,7 +66,7 @@ SwG would automatically fetch all our SKUs on a free page (which is what you wou
 	[...]
 	'isAccessibleForFree': 'True',
 	'isPartOf': {
-		'@type': [ 'CreativeWork' ],
+		'@type': [ 'CreativeWork', 'Product' ],
 		'name' : 'Financial Times',
 		'productID': 'ft.com:free'
 	}
@@ -81,7 +81,7 @@ Content barriers populate the `isPartOf` markup with data pertaining to the requ
 	'@context': 'http://schema.org',
 	'isAccessibleForFree': 'False',
 	'isPartOf': {
-		'@type': [ 'CreativeWork' ],
+		'@type': [ 'CreativeWork', 'Product' ],
 		'name' : 'Financial Times',
 		'productID': 'ft.com:subscribed' // or 'ft.com:premium' or 'ft.com:registered' depending on the requested content accessLevel
 	}

diff --git a/test/types/article.spec.js b/test/types/article.spec.js
@@ -28,7 +28,7 @@ describe('Type: Article', function () {
 			expect(result.isAccessibleForFree).to.equal('False');
 			expect(result['@type']).to.equal('NewsArticle');
 			expect(result.isPartOf).to.deep.equal({
-				'@type': ['CreativeWork'],
+				'@type': ['CreativeWork', 'Product'],
 				name: 'Financial Times'
 			});
 			expect(result.publisher).to.contain({

diff --git a/test/types/barrier.spec.js b/test/types/barrier.spec.js
@@ -12,7 +12,7 @@ describe('Type: Barrier', function () {
 			expect(result.isAccessibleForFree).to.be.undefined;
 			expect(result['@type']).to.equal('CreativeWork');
 			expect(result.isPartOf).to.deep.equal({
-				'@type': ['CreativeWork'],
+				'@type': ['CreativeWork', 'Product'],
 				name: 'Financial Times'
 			});
 			expect(result.publisher).to.contain({
@@ -29,7 +29,7 @@ describe('Type: Barrier', function () {
 			expect(result.isAccessibleForFree).to.be.undefined;
 			expect(result['@type']).to.equal('CreativeWork');
 			expect(result.isPartOf).to.deep.equal({
-				'@type': ['CreativeWork'],
+				'@type': ['CreativeWork', 'Product'],
 				name: 'Financial Times'
 			});
 			expect(result.publisher).to.contain({
@@ -43,7 +43,7 @@ describe('Type: Barrier', function () {
 			const result = barrier(mergeWithArticle({ accessLevel: 'free' }));
 			expect(result['@type']).to.equal('NewsArticle');
 			expect(result.isAccessibleForFree).to.equal('True');
-			expect(result.isPartOf['@type']).to.eql(['CreativeWork']);
+			expect(result.isPartOf['@type']).to.eql(['CreativeWork', 'Product']);
 			expect(result.isPartOf).to.contain({
 				name: 'Financial Times',
 				productID: 'ft.com:free'
@@ -60,7 +60,7 @@ describe('Type: Barrier', function () {
 			expect(result['@type']).to.equal('NewsArticle');
 			expect(result.isAccessibleForFree).to.equal('False');
 			expect(result.isPartOf).to.deep.equal({
-				'@type': ['CreativeWork'],
+				'@type': ['CreativeWork', 'Product'],
 				name: 'Financial Times'
 			});
 		});

diff --git a/test/types/liveblog.spec.js b/test/types/liveblog.spec.js
@@ -23,7 +23,7 @@ describe('Type: liveBlogPosting', function () {
 				'coverageEndTime'
 			]);
 			expect(result.isPartOf).to.deep.equal({
-				'@type': ['CreativeWork'],
+				'@type': ['CreativeWork', 'Product'],
 				name: 'Financial Times'
 			});
 			expect(result.publisher).to.contain({
@@ -96,7 +96,7 @@ describe('Type: liveBlogPosting', function () {
 			expect(result.isAccessibleForFree).to.equal('False');
 			expect(result['@type']).to.equal('LiveBlogPosting');
 			expect(result.isPartOf).to.deep.equal({
-				'@type': ['CreativeWork'],
+				'@type': ['CreativeWork', 'Product'],
 				name: 'Financial Times'
 			});
 			expect(result.publisher).to.contain({

diff --git a/test/types/product.spec.js b/test/types/product.spec.js
@@ -12,15 +12,15 @@ describe('Type: Product', function () {
 	it('has correct base format', function () {
 		const result = product(mockCompany, {});
 		expect(result).to.deep.equal({
-			'@type': ['CreativeWork'],
+			'@type': ['CreativeWork', 'Product'],
 			name: 'ft'
 		});
 	});
 
 	it('wont add productID entitlements label if no matching content.accessLevel', function () {
 		const result = product(mockCompany, { accessLevel: 'foo' });
 		expect(result).to.deep.equal({
-			'@type': ['CreativeWork'],
+			'@type': ['CreativeWork', 'Product'],
 			name: 'ft'
 		});
 	});

diff --git a/types/product.js b/types/product.js
@@ -1,6 +1,6 @@
 module.exports = (company = {}, content = {}) => {
 	const baseSchema = {
-		'@type': ['CreativeWork'],
+		'@type': ['CreativeWork', 'Product'],
 		name: company.prefLabel
 	};