UI: rearrange logic for adding timezone in date-format helper

changelog/26693.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+ui: Remove possibility of returning an undefined timezone from date-format helper
+```

ui/lib/core/addon/helpers/date-format.js

@@ -66,15 +66,21 @@ export function dateFormat([value, style], { withTimeZone = false }) {
     return value || '';
   }
 
+  const zone = withTimeZone ? formatTimeZone(date) : '';
+  return format(date, style) + zone;
+}
+
+// separate function for testing
+export function formatTimeZone(date) {
   let zone; // local timezone ex: 'PST'
   try {
     // passing undefined means default to the browser's locale
-    zone = ' ' + date.toLocaleTimeString(undefined, { timeZoneName: 'short' }).split(' ')[2];
+    zone = date.toLocaleTimeString(undefined, { timeZoneName: 'short' }).split(' ')[2];
   } catch (e) {
     zone = '';
   }
-  zone = withTimeZone ? zone : '';
-  return format(date, style) + zone;
+
+  return zone ? ` ${zone}` : '';
 }
 
 export default helper(dateFormat);

ui/tests/integration/helpers/date-format-test.js

@@ -7,6 +7,7 @@ import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { find, render, settled } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
+import { formatTimeZone } from 'core/helpers/date-format';
 
 const TEST_DATE = new Date('2018-04-03T14:15:30');
 
@@ -41,6 +42,7 @@ module('Integration | Helper | date-format', function (hooks) {
   });
 
   test('displays time zone if withTimeZone=true', async function (assert) {
+    // this test may fail locally if you're in a non-US timezone
     this.set('withTimezone', true);
     this.set('timestampDate', TEST_DATE);
 
@@ -68,4 +70,14 @@ module('Integration | Helper | date-format', function (hooks) {
     await settled();
     assert.dom(this.element).hasText('', 'renders empty string when falsey');
   });
+
+  test('it formats timezone', async function (assert) {
+    // compute expected because otherwise this fails locally because of differing timezones
+    const expected = ` ${TEST_DATE.toLocaleTimeString(undefined, { timeZoneName: 'short' }).split(' ')[2]}`;
+    const actual = formatTimeZone(TEST_DATE);
+
+    assert.notStrictEqual(actual, undefined, 'formatted timezone is not undefined');
+    assert.strictEqual(formatTimeZone('not a date'), '', 'returns an empty string for a non-date value');
+    assert.strictEqual(actual, expected, `formatted timezone: "${actual}" equals expected: "${expected}"`);
+  });
 });