From: Joshua Ohlman Date: Fri, 26 Jun 2015 23:36:52 +0000 (-0500) Subject: Ensure moment.isAfter and moment.isBefore match js math operations X-Git-Tag: 2.10.5~23^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40e7a0c99c6cee1f2c64702fafe1b6b8ae41e136;p=thirdparty%2Fmoment.git Ensure moment.isAfter and moment.isBefore match js math operations Add tests to isBefore and isAfter preparatory to fixing #2362, since moment.min and moment.max rely on isBefore and isAfter to calculate moment value --- diff --git a/src/test/moment/is_after.js b/src/test/moment/is_after.js index fdd2dc239..1050acb33 100644 --- a/src/test/moment/is_after.js +++ b/src/test/moment/is_after.js @@ -162,3 +162,16 @@ test('is after millisecond', function (assert) { assert.equal(m.isAfter(m, 'millisecond'), false, 'same moments are not after the same millisecond'); assert.equal(+m, +mCopy, 'isAfter millisecond should not change moment'); }); + +test('is after invalid', function (assert) { + var m = moment(), invalid = moment.invalid(); + assert.equal(m.isAfter(invalid), false, 'valid moment is not after invalid moment'); + assert.equal(invalid.isAfter(m), false, 'invalid moment is not after valid moment'); + assert.equal(m.isAfter(invalid, 'year'), false, 'invalid moment year'); + assert.equal(m.isAfter(invalid, 'month'), false, 'invalid moment month'); + assert.equal(m.isAfter(invalid, 'day'), false, 'invalid moment day'); + assert.equal(m.isAfter(invalid, 'hour'), false, 'invalid moment hour'); + assert.equal(m.isAfter(invalid, 'minute'), false, 'invalid moment minute'); + assert.equal(m.isAfter(invalid, 'second'), false, 'invalid moment second'); + assert.equal(m.isAfter(invalid, 'milliseconds'), false, 'invalid moment milliseconds'); +}); diff --git a/src/test/moment/is_before.js b/src/test/moment/is_before.js index b9e2beba5..90d415f46 100644 --- a/src/test/moment/is_before.js +++ b/src/test/moment/is_before.js @@ -162,3 +162,16 @@ test('is before millisecond', function (assert) { assert.equal(m.isBefore(m, 'millisecond'), false, 'same moments are not before the same millisecond'); assert.equal(+m, +mCopy, 'isBefore millisecond should not change moment'); }); + +test('is before invalid', function (assert) { + var m = moment(), invalid = moment.invalid(); + assert.equal(m.isBefore(invalid), false, 'valid moment is not before invalid moment'); + assert.equal(invalid.isBefore(m), false, 'invalid moment is not before valid moment'); + assert.equal(m.isBefore(invalid, 'year'), false, 'invalid moment year'); + assert.equal(m.isBefore(invalid, 'month'), false, 'invalid moment month'); + assert.equal(m.isBefore(invalid, 'day'), false, 'invalid moment day'); + assert.equal(m.isBefore(invalid, 'hour'), false, 'invalid moment hour'); + assert.equal(m.isBefore(invalid, 'minute'), false, 'invalid moment minute'); + assert.equal(m.isBefore(invalid, 'second'), false, 'invalid moment second'); + assert.equal(m.isBefore(invalid, 'milliseconds'), false, 'invalid moment milliseconds'); +});