fix zone defaulting for fromObject

moment · Jan 6, 2018 · afad8fa · afad8fa · ericmorand · Jan 6, 2018
1 parent ec6fd14
commit afad8fa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/impl/util.js b/src/impl/util.js
@@ -181,7 +181,7 @@ export class Util {
 
   static normalizeZone(input) {
     if (Util.isUndefined(input) || input === null) {
-      return LocalZone.instance;
+      return Settings.defaultZone;
     } else if (input instanceof Zone) {
       return input;
     } else if (Util.isString(input)) {

diff --git a/test/datetime/zone.test.js b/test/datetime/zone.test.js
@@ -199,6 +199,7 @@ test('The local zone does local stuff', () => {
 test('Setting the default zone results in a different creation zone', () => {
   Helpers.withDefaultZone('Asia/Tokyo', () => {
     expect(DateTime.local().zoneName).toBe('Asia/Tokyo');
+    expect(DateTime.fromObject({}).zoneName).toBe('Asia/Tokyo');
   });
 });