pass tests

Financial-Times · Apr 21, 2017 · e775c54 · e775c54
1 parent dc383cf
commit e775c54
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/server/lib/assets.js b/server/lib/assets.js
@@ -70,8 +70,8 @@ function init (options, directory, locals) {
 
 				res.locals.polyfillCallbackName = polyfillIo.callbackName;
 				res.locals.polyfillUrls = {
-					enhanced: polyfillRoot + polyfillIo.getQueryString({enhanced: true}),
-					core: polyfillRoot + polyfillIo.getQueryString({enhanced: false})
+					enhanced: polyfillRoot + polyfillIo.getQueryString('enhanced'),
+					core: polyfillRoot + polyfillIo.getQueryString('core')
 				}
 
 				res.locals.javascriptBundles.push(

diff --git a/server/lib/polyfill-io.js b/server/lib/polyfill-io.js
@@ -1,4 +1,3 @@
-
 const sharedQueryConfig = {
 	enhanced: {
 		features: [
@@ -10,8 +9,7 @@ const sharedQueryConfig = {
 			'fetch',
 			'Array.prototype.find',
 			'Array.prototype.findIndex',
-			// alwyas pending https://github.com/Financial-Times/polyfill-service/pull/1041
-			'Array.prototype.includes|always|gated',
+			'Array.prototype.includes',
 			'IntersectionObserver',
 			'Map',
 			'Array.from',
@@ -29,12 +27,6 @@ const sharedQueryConfig = {
 
 const callbackName = 'ftNextPolyfillServiceCallback';
 
-const queryStrings = ['enhanced', 'core']
-	.reduce((configsMap, configName) => {
-		configsMap[configName] = buildQueryString(configName)
-		return configsMap;
-	}, {})
-
 function buildQueryString (configName) {
 	const qs = [];
 
@@ -54,9 +46,13 @@ function buildQueryString (configName) {
 	return `?${qs.join('&')}`;
 }
 
+const queryStrings = Object.keys(sharedQueryConfig)
+	.reduce((configsMap, configName) => {
+		configsMap[configName] = buildQueryString(configName)
+		return configsMap;
+	}, {})
 
 module.exports = {
 	callbackName,
-	getQueryString: opts => queryStrings[optsToString(opts)],
-	getAllQueryStrings: () => queryStrings
+	getQueryString: setting => queryStrings[setting]
 }
diff --git a/server/test/app.test.js b/server/test/app.test.js
@@ -191,7 +191,7 @@ describe('simple app', function () {
 		it('should have preload link headers for css and js resources', done => {
 			request(app)
 				.get('/templated')
-				.expect('Link', /<https:\/\/next-geebee\.ft\.com\/.*polyfill.min\.js.*>; as="script"; rel="preload"; nopush/)
+				.expect('Link', /<https:\/\/www\.ft\.com\/.*polyfill.min\.js.*>; as="script"; rel="preload"; nopush/)
 				.expect('Link', /<\/\/www\.ft\.com\/__assets\/n-ui\/cached\/v1\.1\.1\/es5\.min\.js>; as="script"; rel="preload"; nopush/)
 				// .expect('Link', /<\/\/www\.ft\.com\/__assets\/n-ui\/cached\/v1\.1\.1\/n-ui-core\.css>; as="style"; rel="preload"; nopush/)
 				.expect('Link', /<\/demo-app\/main\.css>; as="style"; rel="preload"; nopush/)