Merge pull request #301 from rykov/fix-separator

Fixed multiple custom separators

Author: NullVoxPopuli

addon/src/services/page-title.ts

@@ -203,11 +203,6 @@ export default class PageTitleService extends Service {
           group = [];
           groups.push(group);
         }
-        const lastToken = group[0];
-        if (lastToken) {
-          token = { ...token };
-          token.separator = lastToken.separator;
-        }
         group.unshift(token);
       } else {
         if (!appending) {

test-app/app/router.js

@@ -8,6 +8,7 @@ export default class Router extends EmberRouter {
 
 Router.map(function () {
   this.route('about', function () {
+    this.route('policies');
     this.route('authors', function () {
       this.route('profile');
     });

test-app/app/templates/about/policies.hbs

@@ -0,0 +1,2 @@
+{{page-title 'Policy' separator=" * "}}
+{{page-title 'Terms' separator=" + "}}

test-app/tests/acceptance/posts-test.js

@@ -31,6 +31,12 @@ module('Acceptance: title', function (hooks) {
     assert.strictEqual(getPageTitle(), 'Profile > Authors > About My App');
   });
 
+  test('multiple custom separators work', async function (assert) {
+    await visit('/about/policies');
+
+    assert.strictEqual(getPageTitle(), 'Terms + Policy * About My App');
+  });
+
   test('multiple components in a row work', async function (assert) {
     await visit('/posts/rails-is-omakase');
 

test-app/tests/unit/services/page-title-test.js

@@ -69,8 +69,9 @@ module('service:page-title', function (hooks) {
     list.push(first);
     list.push(second);
 
-    assert.strictEqual(first.separator, 'a');
-    assert.strictEqual(second.separator, 'a');
+    let tokens = list.get('sortedTokens');
+    assert.strictEqual(tokens[0].separator, 'a');
+    assert.strictEqual(tokens[1].separator, 'a');
   });
 
   test('the separator property is not inherited if explicitly set', function (assert) {
@@ -81,8 +82,9 @@ module('service:page-title', function (hooks) {
     list.push(first);
     list.push(second);
 
-    assert.strictEqual(first.separator, 'a');
-    assert.strictEqual(second.separator, 'b');
+    let tokens = list.get('sortedTokens');
+    assert.strictEqual(tokens[0].separator, 'b');
+    assert.strictEqual(tokens[1].separator, 'a');
   });
 
   test('the prepend property is inherited by the previous token', function (assert) {