Merge a2827fc into 723a15d

ciena-frost · Mar 29, 2018 · 7402021 · 7402021
2 parents 723a15d + a2827fc
commit 7402021
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/addon/services/frost-page-title.js b/addon/services/frost-page-title.js
@@ -44,7 +44,12 @@ export default Service.extend({
       .filter(section => !/[^A-Za-z-]/.test(section))
       .map(section => {
         return section.split('-')
-          .map(word => EmberString.capitalize(word))
+          .map((word, idx) => {
+            if (idx === 0) {
+              return EmberString.capitalize(word)
+            }
+            return word
+          })
           .join(' ')
       })
   },
@@ -69,6 +74,7 @@ export default Service.extend({
     const sections = handlers.reduce((acc, handler) => {
       return handler(acc, defaultTitle)
     }, this.defaultHandler(url))
+      .filter(section => !!section)
 
     if (sections.length) {
       document.title = sections.join(` ${delimiter} `)

diff --git a/tests/acceptance/application-test.js b/tests/acceptance/application-test.js
@@ -31,8 +31,8 @@ describe('Acceptance: Application', function () {
   ;[
     ['custom-title', 'Hello | Custom | Title'],
     ['custom-title/nested', 'Hello | Custom | (Nested) Title'],
-    ['default-title', 'Default Title'],
-    ['default-title/nested', 'Default Title | Nested']
+    ['default-title', 'Default title'],
+    ['default-title/nested', 'Default title | Nested']
   ]
     .forEach(([path, title]) => {
       describe(`visit /${path}`, function () {

diff --git a/tests/unit/services/frost-page-title-test.js b/tests/unit/services/frost-page-title-test.js
@@ -45,7 +45,7 @@ describe(test.label, function () {
   describe('defaultHandler', function () {
     it('should return capitalized version of words from window.location.hash', function () {
       window.location.hash = '/foo-bar'
-      expect(service.defaultHandler()).to.eql(['Foo Bar'])
+      expect(service.defaultHandler()).to.eql(['Foo bar'])
     })
 
     it('should ignore non-wordy things', function () {