Fix <title> contents

madskonradsen · mathiasbynens · commit f9f05fbccd17 · 2016-07-11T15:37:15.000+02:00
Fixes jsperf#123. Closes jsperf#125.
diff --git a/manifest.js b/manifest.js
@@ -8,7 +8,6 @@ var criteria = {
 
 var visionaryContextDefault = {
   cssFile: 'main.css',
-  headTitle: 'jsPerf: JavaScript performance playground',
   scheme: config.get('/scheme'),
   domain: config.get('/domain')
 };
@@ -50,8 +49,7 @@ var manifest = {
         $filter: 'env',
         development: _.assign(visionaryContextDefault, {
           debug: true,
-          cssFile: 'main.src.css?' + Date.now(),
-          headTitle: 'jsPerf-dev'
+          cssFile: 'main.src.css?' + Date.now()
         }),
         $default: visionaryContextDefault
       }
diff --git a/templates/partials/header.hbs b/templates/partials/header.hbs
@@ -1,6 +1,12 @@
 <head>
   <meta charset="utf-8">
-  <title>{{headTitle}}</title>
+
+  {{#if headTitle}}
+    <title>{{headTitle}} · jsPerf</title>
+  {{else}}
+    <title>jsPerf: JavaScript performance playground</title>
+  {{/if}}
+
   <link rel="apple-touch-icon" href="/public/apple-touch-icon.png">
   <link rel="shortcut icon" href="/public/favicon.ico">
 
diff --git a/test/server/web/faq/index.js b/test/server/web/faq/index.js
@@ -22,6 +22,7 @@ lab.beforeEach(function (done) {
       hbs: require('handlebars')
     },
     path: './server/web',
+    layout: true,
     relativeTo: path.join(__dirname, '..', '..', '..', '..')
   });
   server.register(plugins, done);
@@ -69,4 +70,12 @@ lab.experiment('faq', function () {
       done();
     });
   });
+
+  lab.test('it shows the title specified in the route', function (done) {
+    server.inject(request, function (response) {
+      Code.expect(response.payload).to.include('<title>Frequently asked questions · jsPerf</title>');
+
+      done();
+    });
+  });
 });
diff --git a/test/server/web/home/index.js b/test/server/web/home/index.js
@@ -79,6 +79,14 @@ lab.experiment('home', function () {
       });
     });
 
+    lab.test('it serves a generic title on pages that does not specify one', function (done) {
+      server.inject(request, function (response) {
+        Code.expect(response.payload).to.include('<title>jsPerf: JavaScript performance playground</title>');
+
+        done();
+      });
+    });
+
     lab.test('it presents a login option to a user if they have not auth’d with GitHub', function (done) {
       server.inject(request, function (response) {
         Code.expect(response.result).to.include('Login with GitHub to Create Test Cases');
