Merge pull request #74 from Financial-Times/no-mustard

removed next-mustard dependency
Financial-Times · Mar 31, 2015 · 1e904dc · 1e904dc
2 parents 8c674cc + e8bb890
commit 1e904dc
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 13 deletions.
diff --git a/bower.json b/bower.json
@@ -1,8 +1,7 @@
 {
   "name": "next-express",
   "dependencies": {
-    "next-mustard": "^3.0.0",
-    "next-js-setup": "^v1.3.0",
+    "next-js-setup": "^v1.9.0",
     "next-header": "*",
     "next-footer": "^1.0.0",
     "next-welcome": "^1.0.0"

diff --git a/layouts/vanilla.html b/layouts/vanilla.html
@@ -6,12 +6,17 @@
 		<meta name="theme-color" content="#fff1e0"/>
 		<meta name="dfp_site" content="test.next.ft" />
 		<link rel="stylesheet" href="{{#hashedAsset}}main.css{{/hashedAsset}}"/>
-		<title>{{#title}}{{{this}}} &mdash; {{/title}}Financial Times</title>
-		{{>next-mustard/check}}
+		<title>{{#title}}{{{this}}} &mdash; {{/title}}FT.com</title>
+		{{>next-js-setup/templates/ctm}}
 	</head>
 	<body class="o-hoverable-on">
 		{{{body}}}
-		{{>next-mustard/addscripts}}
+		{{#if @root.flags.javascript.isSwitchedOn }}
+		<script>
+		window.nextFeatureFlags = {{{json @root.flags}}};
+		</script>
+		{{/if}}
+		{{>next-js-setup/templates/script-loader}}
 		{{>next-js-setup/templates/tracking}}
 	</body>
 </html>
diff --git a/layouts/wrapper.html b/layouts/wrapper.html
@@ -7,7 +7,7 @@
 		<meta name="dfp_site" content="test.next.ft" />
 		<link rel="stylesheet" href="{{#hashedAsset}}main.css{{/hashedAsset}}"/>
 		<title>{{#title}}{{{this}}} &mdash; {{/title}}FT.com</title>
-		{{>next-mustard/check}}
+		{{>next-js-setup/templates/ctm}}
 	</head>
 	<body class="o-hoverable-on">
 		{{>next-header/templates/main}}
@@ -23,7 +23,16 @@
 		window.nextFeatureFlags = {{{json @root.flags}}};
 		</script>
 		{{/if}}
-		{{>next-mustard/addscripts}}
+		{{>next-js-setup/templates/script-loader}}
 		{{>next-js-setup/templates/tracking}}
 	</body>
 </html>
+
+
+
+	</head>
+	<body class="o-hoverable-on">
+		{{{body}}}
+
+	</body>
+</html>
diff --git a/test/app.test.js b/test/app.test.js
@@ -139,7 +139,7 @@ describe('simple app', function() {
 			request(app)
 				.get('/wrapped')
 				// doctype ... header ... script loader ... end page
-				.expect(200, /^<!DOCTYPE html>(.|[\r\n])*header(.|[\r\n])*addscripts(.|[\r\n])*<\/html>/, done);
+				.expect(200, /^<!DOCTYPE html>(.|[\r\n])*header(.|[\r\n])*script-loader(.|[\r\n])*<\/html>/, done);
 		});
 
 		it('wrapper should expose app name to client side code', function(done) {
@@ -151,14 +151,14 @@ describe('simple app', function() {
 		it('wrapper should expose offy flags to client side code', function(done) {
 			request(app)
 				.get('/wrapped')
-				.expect(200, /<html.*data-next-flags="(([a-z\-]+--off))( [a-z\-]+--off)*"/, done);
+				.expect(200, /<html.*data-next-flags="(([a-z\d\-]+--off))( [a-z\d\-]+--off)*"/, done);
 		});
 
 		it('should be possible to inherit a vanilla (inc html head only) layout', function(done) {
 			request(app)
 				.get('/vanilla')
 				// doctype ... no header ... script loader ... tracking ... end page
-				.expect(200, /^<!DOCTYPE html>(.|[\r\n])*<body class="o-hoverable-on">([^a-z])*<h1>(.|[\r\n])*addscripts([\t]+)tracking*/, done);
+				.expect(200, /^<!DOCTYPE html>(.|[\r\n])*<body class="o-hoverable-on">([^a-z])*<h1>(.|[\r\n])*script-loader([\t]+)tracking*/, done);
 		});
 
 		it('vanilla should expose app name to client side code', function(done) {
@@ -169,7 +169,7 @@ describe('simple app', function() {
 		it('vanilla should expose offy flags to client side code', function(done) {
 			request(app)
 				.get('/wrapped')
-				.expect(200, /<html.*data-next-flags="(([a-z\-]+--off))( [a-z\-]+--off)*"/, done);
+				.expect(200, /<html.*data-next-flags="(([a-z\d\-]+--off))( [a-z\d\-]+--off)*"/, done);
 		});
 		it('should integrate with the image service', function(done) {
 			request(app)

diff --git a/test/fixtures/app/bower_components/next-js-setup/templates/ctm.html b/test/fixtures/app/bower_components/next-js-setup/templates/ctm.html
@@ -0,0 +1 @@
+ctm
diff --git a/test/fixtures/app/bower_components/next-js-setup/templates/script-loader.html b/test/fixtures/app/bower_components/next-js-setup/templates/script-loader.html
@@ -0,0 +1 @@
+script-loader
diff --git a/test/fixtures/app/bower_components/next-mustard/addscripts.html b/test/fixtures/app/bower_components/next-mustard/addscripts.html
diff --git a/test/fixtures/app/bower_components/next-mustard/check.html b/test/fixtures/app/bower_components/next-mustard/check.html