[bugfix] Clone/wrapper of invalid duration should be invalid (#4323)

diff --git a/src/lib/duration/create.js b/src/lib/duration/create.js
index 3f00f3aad4c350e979304d8c14ebd07ef6ce9904..568f1c19c496c5cb69a53f7acb071f92ba84999d 100644 (file)
--- a/src/lib/duration/create.js
+++ b/src/lib/duration/create.js
@@ -74,6 +74,10 @@ export function createDuration (input, key) {
         ret._locale = input._locale;
     }
 
+    if (isDuration(input) && hasOwnProp(input, '_isValid')) {
+        ret._isValid = input._isValid;
+    }
+
     return ret;
 }
 

diff --git a/src/test/moment/duration_invalid.js b/src/test/moment/duration_invalid.js
index 3945d5a6c5c0643876fbefb9f90c47c787242f05..f8488e05f17eab294b11242ecf510f71e1c2ab96 100644 (file)
--- a/src/test/moment/duration_invalid.js
+++ b/src/test/moment/duration_invalid.js
@@ -15,6 +15,30 @@ test('valid duration', function (assert) {
     assert.equal(m.valueOf(), 0);
 });
 
+test('invalid duration - clone of invalid duration', function (assert) {
+    var m = moment.duration.invalid().clone(); // should be invalid
+    assert.equal(m.isValid(), false);
+    assert.ok(isNaN(m.valueOf()));
+});
+
+test('valid duration - clone of valid duration', function (assert) {
+    var m = moment.duration({d: null}).clone(); // should be valid, for now
+    assert.equal(m.isValid(), true);
+    assert.equal(m.valueOf(), 0);
+});
+
+test('invalid duration - wrapper of invalid duration', function (assert) {
+    var m = moment.duration(moment.duration.invalid()); // should be invalid
+    assert.equal(m.isValid(), false);
+    assert.ok(isNaN(m.valueOf()));
+});
+
+test('valid duration - wrapper of valid duration', function (assert) {
+    var m = moment.duration(moment.duration({d: null})); // should be valid, for now
+    assert.equal(m.isValid(), true);
+    assert.equal(m.valueOf(), 0);
+});
+
 test('invalid duration - only smallest unit can have decimal', function (assert) {
     var m = moment.duration({'days': 3.5, 'hours': 1.1}); // should be invalid
     assert.equal(m.isValid(), false);