Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Durations are considered equal with extra zero units. Fixes #809 #811

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

Merged
merged 1 commit into from
Oct 21, 2020
Merged

Durations are considered equal with extra zero units. Fixes #809 #811

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/duration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,8 +762,14 @@ export default class Duration {
return false;
}

function eq(v1, v2) {
// Consider 0 and undefined as equal
if (v1 === undefined || v1 === 0) return v2 === undefined || v2 === 0;
return v1 === v2;
}

for (const u of orderedUnits) {
if (this.values[u] !== other.values[u]) {
if (!eq(this.values[u], other.values[u])) {
return false;
}
}
Expand Down
8 changes: 8 additions & 0 deletions test/duration/equality.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@ test("equals identically constructed but one has sting type values", () => {
expect(l1.equals(l2)).toBe(true);
});

// #809
test("equals with extra zero units", () => {
const l1 = Duration.fromObject({ years: 5, days: 6 }),
l2 = Duration.fromObject({ years: 5, days: 6, minutes: 0, seconds: -0 });
expect(l1.equals(l2)).toBe(true);
expect(l2.equals(l1)).toBe(true);
});

test("does not equal an invalid duration", () => {
const l1 = Duration.fromObject({ years: 5, days: 6 }),
l2 = Duration.invalid("because");
Expand Down