Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[bugfix] Make Duration#as work with quarters #4887

Merged
merged 1 commit into from Jan 18, 2019
Merged

[bugfix] Make Duration#as work with quarters #4887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/lib/duration/as.js
View file
Open in desktop
Expand Up @@ -12,10 +12,14 @@ export function as (units) {

units = normalizeUnits(units);

if (units === 'month' || units === 'year') {
days = this._days + milliseconds / 864e5;
if (units === 'month' || units === 'quarter' || units === 'year') {
days = this._days + milliseconds / 864e5;
months = this._months + daysToMonths(days);
return units === 'month' ? months : months / 12;
switch (units) {
case 'month': return months;
case 'quarter': return months / 3;
case 'year': return months / 12;
}
} else {
// handle milliseconds separately because of floating point math errors (issue #1867)
days = this._days + Math.round(monthsToDays(this._months));
Expand Down Expand Up @@ -58,4 +62,5 @@ export var asHours = makeAs('h');
export var asDays = makeAs('d');
export var asWeeks = makeAs('w');
export var asMonths = makeAs('M');
export var asQuarters = makeAs('Q');
export var asYears = makeAs('y');
3 changes: 2 additions & 1 deletion src/lib/duration/prototype.js
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ var proto = Duration.prototype;

import { abs } from './abs';
import { add, subtract } from './add-subtract';
import { as, asMilliseconds, asSeconds, asMinutes, asHours, asDays, asWeeks, asMonths, asYears, valueOf } from './as';
import { as, asMilliseconds, asSeconds, asMinutes, asHours, asDays, asWeeks, asMonths, asQuarters, asYears, valueOf } from './as';
import { bubble } from './bubble';
import { clone } from './clone';
import { get, milliseconds, seconds, minutes, hours, days, months, years, weeks } from './get';
Expand All @@ -25,6 +25,7 @@ proto.asHours = asHours;
proto.asDays = asDays;
proto.asWeeks = asWeeks;
proto.asMonths = asMonths;
proto.asQuarters = asQuarters;
proto.asYears = asYears;
proto.valueOf = valueOf;
proto._bubble = bubble;
Expand Down
119 changes: 71 additions & 48 deletions src/test/moment/duration.js
View file
Open in desktop
Expand Up @@ -530,6 +530,7 @@ test('asGetters', function (assert) {

// years
assert.equal(moment.duration(1, 'year').asYears(), 1, '1 year as years');
assert.equal(moment.duration(1, 'year').asQuarters(), 4, '1 year as quarters');
assert.equal(moment.duration(1, 'year').asMonths(), 12, '1 year as months');
assert.equal(moment.duration(400, 'year').asMonths(), 4800, '400 years as months');
assert.equal(moment.duration(1, 'year').asWeeks().toFixed(3), 52.143, '1 year as weeks');
Expand All @@ -543,8 +544,24 @@ test('asGetters', function (assert) {
assert.equal(moment.duration(1, 'year').asSeconds(), 31536000, '1 year as seconds');
assert.equal(moment.duration(1, 'year').asMilliseconds(), 31536000000, '1 year as milliseconds');

// quarters
assert.equal(moment.duration(1, 'quarter').asYears(), 0.25, '1 quarter as years');
assert.equal(moment.duration(1, 'quarter').asQuarters(), 1, '1 quarter as quarters');
assert.equal(moment.duration(1, 'quarter').asMonths(), 3, '1 quarter as months');
assert.equal(moment.duration(2, 'quarter').asWeeks().toFixed(3), 26.143, '2 month as quarters');
assert.equal(moment.duration(1, 'quarter').asDays(), 91, '1 quarter as days');
assert.equal(moment.duration(2, 'quarter').asDays(), 183, '2 quarter as days');
assert.equal(moment.duration(3, 'quarter').asDays(), 274, '4 quarter as days');
assert.equal(moment.duration(4, 'quarter').asDays(), 365, '4 quarter as days');
assert.equal(moment.duration(1, 'quarter').asHours(), 2184, '1 quarter as hours');
assert.equal(moment.duration(3, 'quarter').asHours(), 6576, '3 quarter as hours');
assert.equal(moment.duration(2, 'quarter').asMinutes(), 263520, '2 quarter as minutes');
assert.equal(moment.duration(3, 'quarter').asSeconds(), 23673600, '3 quarter as seconds');
assert.equal(moment.duration(1, 'quarter').asMilliseconds(), 7862400000, '1 quarter as milliseconds');

// months
assert.equal(moment.duration(1, 'month').asYears().toFixed(4), 0.0833, '1 month as years');
assert.equal(moment.duration(6, 'month').asQuarters(), 2, '6 month as quarters');
assert.equal(moment.duration(1, 'month').asMonths(), 1, '1 month as months');
assert.equal(moment.duration(1, 'month').asWeeks().toFixed(3), 4.286, '1 month as weeks');
assert.equal(moment.duration(1, 'month').asDays(), 30, '1 month as days');
Expand All @@ -569,64 +586,70 @@ test('asGetters', function (assert) {
assert.equal(moment.duration(1, 'month').asMilliseconds(), 2592000000, '1 month as milliseconds');

// weeks
assert.equal(moment.duration(1, 'week').asYears().toFixed(4), 0.0192, '1 week as years');
assert.equal(moment.duration(1, 'week').asMonths().toFixed(3), 0.230, '1 week as months');
assert.equal(moment.duration(1, 'week').asWeeks(), 1, '1 week as weeks');
assert.equal(moment.duration(1, 'week').asDays(), 7, '1 week as days');
assert.equal(moment.duration(1, 'week').asHours(), 168, '1 week as hours');
assert.equal(moment.duration(1, 'week').asMinutes(), 10080, '1 week as minutes');
assert.equal(moment.duration(1, 'week').asSeconds(), 604800, '1 week as seconds');
assert.equal(moment.duration(1, 'week').asMilliseconds(), 604800000, '1 week as milliseconds');
assert.equal(moment.duration(1, 'week').asYears().toFixed(4), 0.0192, '1 week as years');
assert.equal(moment.duration(1, 'week').asQuarters().toFixed(4), 0.0767, '1 week as quarters');
assert.equal(moment.duration(1, 'week').asMonths().toFixed(3), 0.230, '1 week as months');
assert.equal(moment.duration(1, 'week').asWeeks(), 1, '1 week as weeks');
assert.equal(moment.duration(1, 'week').asDays(), 7, '1 week as days');
assert.equal(moment.duration(1, 'week').asHours(), 168, '1 week as hours');
assert.equal(moment.duration(1, 'week').asMinutes(), 10080, '1 week as minutes');
assert.equal(moment.duration(1, 'week').asSeconds(), 604800, '1 week as seconds');
assert.equal(moment.duration(1, 'week').asMilliseconds(), 604800000, '1 week as milliseconds');

// days
assert.equal(moment.duration(1, 'day').asYears().toFixed(4), 0.0027, '1 day as years');
assert.equal(moment.duration(1, 'day').asMonths().toFixed(3), 0.033, '1 day as months');
assert.equal(moment.duration(1, 'day').asWeeks().toFixed(3), 0.143, '1 day as weeks');
assert.equal(moment.duration(1, 'day').asDays(), 1, '1 day as days');
assert.equal(moment.duration(1, 'day').asHours(), 24, '1 day as hours');
assert.equal(moment.duration(1, 'day').asMinutes(), 1440, '1 day as minutes');
assert.equal(moment.duration(1, 'day').asSeconds(), 86400, '1 day as seconds');
assert.equal(moment.duration(1, 'day').asMilliseconds(), 86400000, '1 day as milliseconds');
assert.equal(moment.duration(1, 'day').asYears().toFixed(4), 0.0027, '1 day as years');
assert.equal(moment.duration(1, 'day').asQuarters().toFixed(4), 0.0110, '1 day as quarters');
assert.equal(moment.duration(1, 'day').asMonths().toFixed(3), 0.033, '1 day as months');
assert.equal(moment.duration(1, 'day').asWeeks().toFixed(3), 0.143, '1 day as weeks');
assert.equal(moment.duration(1, 'day').asDays(), 1, '1 day as days');
assert.equal(moment.duration(1, 'day').asHours(), 24, '1 day as hours');
assert.equal(moment.duration(1, 'day').asMinutes(), 1440, '1 day as minutes');
assert.equal(moment.duration(1, 'day').asSeconds(), 86400, '1 day as seconds');
assert.equal(moment.duration(1, 'day').asMilliseconds(), 86400000, '1 day as milliseconds');

// hours
assert.equal(moment.duration(1, 'hour').asYears().toFixed(6), 0.000114, '1 hour as years');
assert.equal(moment.duration(1, 'hour').asMonths().toFixed(5), 0.00137, '1 hour as months');
assert.equal(moment.duration(1, 'hour').asWeeks().toFixed(5), 0.00595, '1 hour as weeks');
assert.equal(moment.duration(1, 'hour').asDays().toFixed(4), 0.0417, '1 hour as days');
assert.equal(moment.duration(1, 'hour').asHours(), 1, '1 hour as hours');
assert.equal(moment.duration(1, 'hour').asMinutes(), 60, '1 hour as minutes');
assert.equal(moment.duration(1, 'hour').asSeconds(), 3600, '1 hour as seconds');
assert.equal(moment.duration(1, 'hour').asMilliseconds(), 3600000, '1 hour as milliseconds');
assert.equal(moment.duration(1, 'hour').asYears().toFixed(6), 0.000114, '1 hour as years');
assert.equal(moment.duration(1, 'hour').asQuarters().toFixed(6), 0.000456, '1 hour as quarters');
assert.equal(moment.duration(1, 'hour').asMonths().toFixed(5), 0.00137, '1 hour as months');
assert.equal(moment.duration(1, 'hour').asWeeks().toFixed(5), 0.00595, '1 hour as weeks');
assert.equal(moment.duration(1, 'hour').asDays().toFixed(4), 0.0417, '1 hour as days');
assert.equal(moment.duration(1, 'hour').asHours(), 1, '1 hour as hours');
assert.equal(moment.duration(1, 'hour').asMinutes(), 60, '1 hour as minutes');
assert.equal(moment.duration(1, 'hour').asSeconds(), 3600, '1 hour as seconds');
assert.equal(moment.duration(1, 'hour').asMilliseconds(), 3600000, '1 hour as milliseconds');

// minutes
assert.equal(moment.duration(1, 'minute').asYears().toFixed(8), 0.00000190, '1 minute as years');
assert.equal(moment.duration(1, 'minute').asMonths().toFixed(7), 0.0000228, '1 minute as months');
assert.equal(moment.duration(1, 'minute').asWeeks().toFixed(7), 0.0000992, '1 minute as weeks');
assert.equal(moment.duration(1, 'minute').asDays().toFixed(6), 0.000694, '1 minute as days');
assert.equal(moment.duration(1, 'minute').asHours().toFixed(4), 0.0167, '1 minute as hours');
assert.equal(moment.duration(1, 'minute').asMinutes(), 1, '1 minute as minutes');
assert.equal(moment.duration(1, 'minute').asSeconds(), 60, '1 minute as seconds');
assert.equal(moment.duration(1, 'minute').asMilliseconds(), 60000, '1 minute as milliseconds');
assert.equal(moment.duration(1, 'minute').asYears().toFixed(8), 0.00000190, '1 minute as years');
assert.equal(moment.duration(1, 'minute').asQuarters().toFixed(8), 0.00000761, '1 minute as quarters');
assert.equal(moment.duration(1, 'minute').asMonths().toFixed(7), 0.0000228, '1 minute as months');
assert.equal(moment.duration(1, 'minute').asWeeks().toFixed(7), 0.0000992, '1 minute as weeks');
assert.equal(moment.duration(1, 'minute').asDays().toFixed(6), 0.000694, '1 minute as days');
assert.equal(moment.duration(1, 'minute').asHours().toFixed(4), 0.0167, '1 minute as hours');
assert.equal(moment.duration(1, 'minute').asMinutes(), 1, '1 minute as minutes');
assert.equal(moment.duration(1, 'minute').asSeconds(), 60, '1 minute as seconds');
assert.equal(moment.duration(1, 'minute').asMilliseconds(), 60000, '1 minute as milliseconds');

// seconds
assert.equal(moment.duration(1, 'second').asYears().toFixed(10), 0.0000000317, '1 second as years');
assert.equal(moment.duration(1, 'second').asMonths().toFixed(9), 0.000000380, '1 second as months');
assert.equal(moment.duration(1, 'second').asWeeks().toFixed(8), 0.00000165, '1 second as weeks');
assert.equal(moment.duration(1, 'second').asDays().toFixed(7), 0.0000116, '1 second as days');
assert.equal(moment.duration(1, 'second').asHours().toFixed(6), 0.000278, '1 second as hours');
assert.equal(moment.duration(1, 'second').asMinutes().toFixed(4), 0.0167, '1 second as minutes');
assert.equal(moment.duration(1, 'second').asSeconds(), 1, '1 second as seconds');
assert.equal(moment.duration(1, 'second').asMilliseconds(), 1000, '1 second as milliseconds');
assert.equal(moment.duration(1, 'second').asYears().toFixed(10), 0.0000000317, '1 second as years');
assert.equal(moment.duration(1, 'second').asQuarters().toFixed(10), 0.0000001268, '1 second as quarters');
assert.equal(moment.duration(1, 'second').asMonths().toFixed(9), 0.000000380, '1 second as months');
assert.equal(moment.duration(1, 'second').asWeeks().toFixed(8), 0.00000165, '1 second as weeks');
assert.equal(moment.duration(1, 'second').asDays().toFixed(7), 0.0000116, '1 second as days');
assert.equal(moment.duration(1, 'second').asHours().toFixed(6), 0.000278, '1 second as hours');
assert.equal(moment.duration(1, 'second').asMinutes().toFixed(4), 0.0167, '1 second as minutes');
assert.equal(moment.duration(1, 'second').asSeconds(), 1, '1 second as seconds');
assert.equal(moment.duration(1, 'second').asMilliseconds(), 1000, '1 second as milliseconds');

// milliseconds
assert.equal(moment.duration(1, 'millisecond').asYears().toFixed(13), 0.0000000000317, '1 millisecond as years');
assert.equal(moment.duration(1, 'millisecond').asMonths().toFixed(12), 0.000000000380, '1 millisecond as months');
assert.equal(moment.duration(1, 'millisecond').asWeeks().toFixed(11), 0.00000000165, '1 millisecond as weeks');
assert.equal(moment.duration(1, 'millisecond').asDays().toFixed(10), 0.0000000116, '1 millisecond as days');
assert.equal(moment.duration(1, 'millisecond').asHours().toFixed(9), 0.000000278, '1 millisecond as hours');
assert.equal(moment.duration(1, 'millisecond').asMinutes().toFixed(7), 0.0000167, '1 millisecond as minutes');
assert.equal(moment.duration(1, 'millisecond').asSeconds(), 0.001, '1 millisecond as seconds');
assert.equal(moment.duration(1, 'millisecond').asMilliseconds(), 1, '1 millisecond as milliseconds');
assert.equal(moment.duration(1, 'millisecond').asYears().toFixed(13), 0.0000000000317, '1 millisecond as years');
assert.equal(moment.duration(1, 'millisecond').asQuarters().toFixed(13), 0.0000000001268, '1 millisecond as quarters');
assert.equal(moment.duration(1, 'millisecond').asMonths().toFixed(12), 0.000000000380, '1 millisecond as months');
assert.equal(moment.duration(1, 'millisecond').asWeeks().toFixed(11), 0.00000000165, '1 millisecond as weeks');
assert.equal(moment.duration(1, 'millisecond').asDays().toFixed(10), 0.0000000116, '1 millisecond as days');
assert.equal(moment.duration(1, 'millisecond').asHours().toFixed(9), 0.000000278, '1 millisecond as hours');
assert.equal(moment.duration(1, 'millisecond').asMinutes().toFixed(7), 0.0000167, '1 millisecond as minutes');
assert.equal(moment.duration(1, 'millisecond').asSeconds(), 0.001, '1 millisecond as seconds');
assert.equal(moment.duration(1, 'millisecond').asMilliseconds(), 1, '1 millisecond as milliseconds');
});

test('as getters for small units', function (assert) {
Expand Down
1 change: 1 addition & 0 deletions src/test/moment/duration_invalid.js
View file
Open in desktop
Expand Up @@ -57,6 +57,7 @@ test('invalid duration operations', function (assert) {
assert.ok(isNaN(invalid.asDays()), 'invalid.asDays is NaN; i=' + i);
assert.ok(isNaN(invalid.asWeeks()), 'invalid.asWeeks is NaN; i=' + i);
assert.ok(isNaN(invalid.asMonths()), 'invalid.asMonths is NaN; i=' + i);
assert.ok(isNaN(invalid.asQuarters()), 'invalid.asQuarters is NaN; i=' + i);
assert.ok(isNaN(invalid.asYears()), 'invalid.asYears is NaN; i=' + i);
assert.ok(isNaN(invalid.valueOf()), 'invalid.valueOf is NaN; i=' + i);
assert.ok(isNaN(invalid.get('hours')), 'invalid.get is NaN; i=' + i);
Expand Down