Implemented fromMillis() to verify args (#301)

Made fromMillis() verify its arg is a number
moment · Jul 19, 2018 · b937d0c · b937d0c
1 parent 5a067d7
commit b937d0c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/datetime.js b/src/datetime.js
@@ -501,11 +501,15 @@ export default class DateTime {
    * @return {DateTime}
    */
   static fromMillis(milliseconds, options = {}) {
-    return new DateTime({
-      ts: milliseconds,
-      zone: normalizeZone(options.zone, Settings.defaultZone),
-      loc: Locale.fromObject(options)
-    });
+    if (!isNumber(milliseconds)) {
+      throw new InvalidArgumentError('fromMillis requires a numerical input');
+    } else {
+      return new DateTime({
+        ts: milliseconds,
+        zone: normalizeZone(options.zone, Settings.defaultZone),
+        loc: Locale.fromObject(options)
+      });
+    }
   }
 
   /**

diff --git a/test/datetime/create.test.js b/test/datetime/create.test.js
@@ -256,6 +256,10 @@ test('DateTime.fromMillis accepts the default locale', () => {
   withDefaultLocale('fr', () => expect(DateTime.fromMillis(391147200000).locale).toBe('fr'));
 });
 
+test('DateTime.fromMillis(ms) throws InvalidArgumentError for non-numeric input', () => {
+  expect(() => DateTime.fromMillis('slurp')).toThrow();
+});
+
 //------
 // .fromObject()
 //-------