diff --git a/test/built-ins/Temporal/Instant/prototype/since/order-of-operations.js b/test/built-ins/Temporal/Instant/prototype/since/order-of-operations.js index 0d01f39932..2e03737500 100644 --- a/test/built-ins/Temporal/Instant/prototype/since/order-of-operations.js +++ b/test/built-ins/Temporal/Instant/prototype/since/order-of-operations.js @@ -11,16 +11,23 @@ features: [Temporal] const expected = [ "get other.toString", "call other.toString", + "ownKeys options", + "getOwnPropertyDescriptor options.roundingIncrement", + "get options.roundingIncrement", + "getOwnPropertyDescriptor options.roundingMode", + "get options.roundingMode", + "getOwnPropertyDescriptor options.largestUnit", "get options.largestUnit", + "getOwnPropertyDescriptor options.smallestUnit", + "get options.smallestUnit", + "getOwnPropertyDescriptor options.additional", + "get options.additional", "get options.largestUnit.toString", "call options.largestUnit.toString", - "get options.roundingIncrement", "get options.roundingIncrement.valueOf", "call options.roundingIncrement.valueOf", - "get options.roundingMode", "get options.roundingMode.toString", "call options.roundingMode.toString", - "get options.smallestUnit", "get options.smallestUnit.toString", "call options.smallestUnit.toString", ]; @@ -30,10 +37,11 @@ const instance = new Temporal.Instant(1_000_000_000_000_000_000n); instance.since( TemporalHelpers.toPrimitiveObserver(actual, "1970-01-01T00:00Z", "other"), TemporalHelpers.propertyBagObserver(actual, { - largestUnit: "hours", roundingIncrement: 1, roundingMode: "halfExpand", + largestUnit: "hours", smallestUnit: "minutes", + additional: true, }, "options"), ); assert.compareArray(actual, expected, "order of operations"); diff --git a/test/built-ins/Temporal/Instant/prototype/until/order-of-operations.js b/test/built-ins/Temporal/Instant/prototype/until/order-of-operations.js index 5e6ff190cc..f6c8ab06e9 100644 --- a/test/built-ins/Temporal/Instant/prototype/until/order-of-operations.js +++ b/test/built-ins/Temporal/Instant/prototype/until/order-of-operations.js @@ -11,16 +11,23 @@ features: [Temporal] const expected = [ "get other.toString", "call other.toString", + "ownKeys options", + "getOwnPropertyDescriptor options.roundingIncrement", + "get options.roundingIncrement", + "getOwnPropertyDescriptor options.roundingMode", + "get options.roundingMode", + "getOwnPropertyDescriptor options.largestUnit", "get options.largestUnit", + "getOwnPropertyDescriptor options.smallestUnit", + "get options.smallestUnit", + "getOwnPropertyDescriptor options.additional", + "get options.additional", "get options.largestUnit.toString", "call options.largestUnit.toString", - "get options.roundingIncrement", "get options.roundingIncrement.valueOf", "call options.roundingIncrement.valueOf", - "get options.roundingMode", "get options.roundingMode.toString", "call options.roundingMode.toString", - "get options.smallestUnit", "get options.smallestUnit.toString", "call options.smallestUnit.toString", ]; @@ -30,10 +37,11 @@ const instance = new Temporal.Instant(0n); instance.until( TemporalHelpers.toPrimitiveObserver(actual, "2001-09-09T01:46:40Z", "other"), TemporalHelpers.propertyBagObserver(actual, { - largestUnit: "hours", roundingIncrement: 1, roundingMode: "halfExpand", + largestUnit: "hours", smallestUnit: "minutes", + additional: true, }, "options"), ); assert.compareArray(actual, expected, "order of operations"); diff --git a/test/built-ins/Temporal/PlainDate/prototype/since/order-of-operations.js b/test/built-ins/Temporal/PlainDate/prototype/since/order-of-operations.js index 3acabec650..f8731590cd 100644 --- a/test/built-ins/Temporal/PlainDate/prototype/since/order-of-operations.js +++ b/test/built-ins/Temporal/PlainDate/prototype/since/order-of-operations.js @@ -35,19 +35,6 @@ const expected = [ "get other.calendar[Symbol.toPrimitive]", "get other.calendar.toString", "call other.calendar.toString", - // GetDifferenceSettings - "get options.largestUnit", - "get options.largestUnit.toString", - "call options.largestUnit.toString", - "get options.roundingIncrement", - "get options.roundingIncrement.valueOf", - "call options.roundingIncrement.valueOf", - "get options.roundingMode", - "get options.roundingMode.toString", - "call options.roundingMode.toString", - "get options.smallestUnit", - "get options.smallestUnit.toString", - "call options.smallestUnit.toString", // CopyDataProperties "ownKeys options", "getOwnPropertyDescriptor options.roundingIncrement", @@ -60,6 +47,15 @@ const expected = [ "get options.smallestUnit", "getOwnPropertyDescriptor options.additional", "get options.additional", + // GetDifferenceSettings + "get options.largestUnit.toString", + "call options.largestUnit.toString", + "get options.roundingIncrement.valueOf", + "call options.roundingIncrement.valueOf", + "get options.roundingMode.toString", + "call options.roundingMode.toString", + "get options.smallestUnit.toString", + "call options.smallestUnit.toString", // CalendarDateUntil "get this.calendar.dateUntil", "call this.calendar.dateUntil", diff --git a/test/built-ins/Temporal/PlainDate/prototype/until/order-of-operations.js b/test/built-ins/Temporal/PlainDate/prototype/until/order-of-operations.js index ee0215edd0..382a9ed13c 100644 --- a/test/built-ins/Temporal/PlainDate/prototype/until/order-of-operations.js +++ b/test/built-ins/Temporal/PlainDate/prototype/until/order-of-operations.js @@ -35,19 +35,6 @@ const expected = [ "get other.calendar[Symbol.toPrimitive]", "get other.calendar.toString", "call other.calendar.toString", - // GetDifferenceSettings - "get options.largestUnit", - "get options.largestUnit.toString", - "call options.largestUnit.toString", - "get options.roundingIncrement", - "get options.roundingIncrement.valueOf", - "call options.roundingIncrement.valueOf", - "get options.roundingMode", - "get options.roundingMode.toString", - "call options.roundingMode.toString", - "get options.smallestUnit", - "get options.smallestUnit.toString", - "call options.smallestUnit.toString", // CopyDataProperties "ownKeys options", "getOwnPropertyDescriptor options.roundingIncrement", @@ -60,6 +47,15 @@ const expected = [ "get options.smallestUnit", "getOwnPropertyDescriptor options.additional", "get options.additional", + // GetDifferenceSettings + "get options.largestUnit.toString", + "call options.largestUnit.toString", + "get options.roundingIncrement.valueOf", + "call options.roundingIncrement.valueOf", + "get options.roundingMode.toString", + "call options.roundingMode.toString", + "get options.smallestUnit.toString", + "call options.smallestUnit.toString", // CalendarDateUntil "get this.calendar.dateUntil", "call this.calendar.dateUntil", diff --git a/test/built-ins/Temporal/PlainDateTime/prototype/since/order-of-operations.js b/test/built-ins/Temporal/PlainDateTime/prototype/since/order-of-operations.js index 16eca7a316..ff3b818c4b 100644 --- a/test/built-ins/Temporal/PlainDateTime/prototype/since/order-of-operations.js +++ b/test/built-ins/Temporal/PlainDateTime/prototype/since/order-of-operations.js @@ -53,19 +53,6 @@ const expected = [ "get other.calendar[Symbol.toPrimitive]", "get other.calendar.toString", "call other.calendar.toString", - // GetDifferenceSettings - "get options.largestUnit", - "get options.largestUnit.toString", - "call options.largestUnit.toString", - "get options.roundingIncrement", - "get options.roundingIncrement.valueOf", - "call options.roundingIncrement.valueOf", - "get options.roundingMode", - "get options.roundingMode.toString", - "call options.roundingMode.toString", - "get options.smallestUnit", - "get options.smallestUnit.toString", - "call options.smallestUnit.toString", // CopyDataProperties "ownKeys options", "getOwnPropertyDescriptor options.roundingIncrement", @@ -78,6 +65,15 @@ const expected = [ "get options.smallestUnit", "getOwnPropertyDescriptor options.additional", "get options.additional", + // GetDifferenceSettings + "get options.largestUnit.toString", + "call options.largestUnit.toString", + "get options.roundingIncrement.valueOf", + "call options.roundingIncrement.valueOf", + "get options.roundingMode.toString", + "call options.roundingMode.toString", + "get options.smallestUnit.toString", + "call options.smallestUnit.toString", // CalendarDateUntil "get this.calendar.dateUntil", "call this.calendar.dateUntil", diff --git a/test/built-ins/Temporal/PlainDateTime/prototype/until/order-of-operations.js b/test/built-ins/Temporal/PlainDateTime/prototype/until/order-of-operations.js index 2d437c434f..df5143b24a 100644 --- a/test/built-ins/Temporal/PlainDateTime/prototype/until/order-of-operations.js +++ b/test/built-ins/Temporal/PlainDateTime/prototype/until/order-of-operations.js @@ -53,19 +53,6 @@ const expected = [ "get other.calendar[Symbol.toPrimitive]", "get other.calendar.toString", "call other.calendar.toString", - // GetDifferenceSettings - "get options.largestUnit", - "get options.largestUnit.toString", - "call options.largestUnit.toString", - "get options.roundingIncrement", - "get options.roundingIncrement.valueOf", - "call options.roundingIncrement.valueOf", - "get options.roundingMode", - "get options.roundingMode.toString", - "call options.roundingMode.toString", - "get options.smallestUnit", - "get options.smallestUnit.toString", - "call options.smallestUnit.toString", // CopyDataProperties "ownKeys options", "getOwnPropertyDescriptor options.roundingIncrement", @@ -78,6 +65,15 @@ const expected = [ "get options.smallestUnit", "getOwnPropertyDescriptor options.additional", "get options.additional", + // GetDifferenceSettings + "get options.largestUnit.toString", + "call options.largestUnit.toString", + "get options.roundingIncrement.valueOf", + "call options.roundingIncrement.valueOf", + "get options.roundingMode.toString", + "call options.roundingMode.toString", + "get options.smallestUnit.toString", + "call options.smallestUnit.toString", // CalendarDateUntil "get this.calendar.dateUntil", "call this.calendar.dateUntil", diff --git a/test/built-ins/Temporal/PlainTime/prototype/since/order-of-operations.js b/test/built-ins/Temporal/PlainTime/prototype/since/order-of-operations.js index ae337f47e0..3505a41660 100644 --- a/test/built-ins/Temporal/PlainTime/prototype/since/order-of-operations.js +++ b/test/built-ins/Temporal/PlainTime/prototype/since/order-of-operations.js @@ -31,17 +31,25 @@ const expected = [ "get other.second", "get other.second.valueOf", "call other.second.valueOf", - // GetDifferenceSettings + // CopyDataProperties + "ownKeys options", + "getOwnPropertyDescriptor options.roundingIncrement", + "get options.roundingIncrement", + "getOwnPropertyDescriptor options.roundingMode", + "get options.roundingMode", + "getOwnPropertyDescriptor options.largestUnit", "get options.largestUnit", + "getOwnPropertyDescriptor options.smallestUnit", + "get options.smallestUnit", + "getOwnPropertyDescriptor options.additional", + "get options.additional", + // GetDifferenceSettings "get options.largestUnit.toString", "call options.largestUnit.toString", - "get options.roundingIncrement", "get options.roundingIncrement.valueOf", "call options.roundingIncrement.valueOf", - "get options.roundingMode", "get options.roundingMode.toString", "call options.roundingMode.toString", - "get options.smallestUnit", "get options.smallestUnit.toString", "call options.smallestUnit.toString", ]; @@ -60,10 +68,11 @@ const other = TemporalHelpers.propertyBagObserver(actual, { }, "other"); const options = TemporalHelpers.propertyBagObserver(actual, { - smallestUnit: "nanoseconds", - largestUnit: "hours", - roundingMode: "trunc", roundingIncrement: 1, + roundingMode: "trunc", + largestUnit: "hours", + smallestUnit: "nanoseconds", + additional: true, }, "options"); const result = instance.since(other, options); diff --git a/test/built-ins/Temporal/PlainTime/prototype/until/order-of-operations.js b/test/built-ins/Temporal/PlainTime/prototype/until/order-of-operations.js index 9a8f60a492..41263769a4 100644 --- a/test/built-ins/Temporal/PlainTime/prototype/until/order-of-operations.js +++ b/test/built-ins/Temporal/PlainTime/prototype/until/order-of-operations.js @@ -31,17 +31,25 @@ const expected = [ "get other.second", "get other.second.valueOf", "call other.second.valueOf", - // GetDifferenceSettings + // CopyDataProperties + "ownKeys options", + "getOwnPropertyDescriptor options.roundingIncrement", + "get options.roundingIncrement", + "getOwnPropertyDescriptor options.roundingMode", + "get options.roundingMode", + "getOwnPropertyDescriptor options.largestUnit", "get options.largestUnit", + "getOwnPropertyDescriptor options.smallestUnit", + "get options.smallestUnit", + "getOwnPropertyDescriptor options.additional", + "get options.additional", + // GetDifferenceSettings "get options.largestUnit.toString", "call options.largestUnit.toString", - "get options.roundingIncrement", "get options.roundingIncrement.valueOf", "call options.roundingIncrement.valueOf", - "get options.roundingMode", "get options.roundingMode.toString", "call options.roundingMode.toString", - "get options.smallestUnit", "get options.smallestUnit.toString", "call options.smallestUnit.toString", ]; @@ -60,10 +68,11 @@ const other = TemporalHelpers.propertyBagObserver(actual, { }, "other"); const options = TemporalHelpers.propertyBagObserver(actual, { - smallestUnit: "nanoseconds", - largestUnit: "hours", - roundingMode: "trunc", roundingIncrement: 1, + roundingMode: "trunc", + largestUnit: "hours", + smallestUnit: "nanoseconds", + additional: true, }, "options"); const result = instance.until(other, options); diff --git a/test/built-ins/Temporal/PlainYearMonth/prototype/since/order-of-operations.js b/test/built-ins/Temporal/PlainYearMonth/prototype/since/order-of-operations.js index 9c01bdce1a..44e5c304a3 100644 --- a/test/built-ins/Temporal/PlainYearMonth/prototype/since/order-of-operations.js +++ b/test/built-ins/Temporal/PlainYearMonth/prototype/since/order-of-operations.js @@ -32,17 +32,25 @@ const expected = [ "get other.calendar[Symbol.toPrimitive]", "get other.calendar.toString", "call other.calendar.toString", - // GetDifferenceSettings + // CopyDataProperties + "ownKeys options", + "getOwnPropertyDescriptor options.roundingIncrement", + "get options.roundingIncrement", + "getOwnPropertyDescriptor options.roundingMode", + "get options.roundingMode", + "getOwnPropertyDescriptor options.largestUnit", "get options.largestUnit", + "getOwnPropertyDescriptor options.smallestUnit", + "get options.smallestUnit", + "getOwnPropertyDescriptor options.additional", + "get options.additional", + // GetDifferenceSettings "get options.largestUnit.toString", "call options.largestUnit.toString", - "get options.roundingIncrement", "get options.roundingIncrement.valueOf", "call options.roundingIncrement.valueOf", - "get options.roundingMode", "get options.roundingMode.toString", "call options.roundingMode.toString", - "get options.smallestUnit", "get options.smallestUnit.toString", "call options.smallestUnit.toString", // CalendarFields @@ -62,18 +70,6 @@ const expected = [ "call other.calendar.year", "get this.calendar.dateFromFields", "call this.calendar.dateFromFields", - // CopyDataProperties - "ownKeys options", - "getOwnPropertyDescriptor options.roundingIncrement", - "get options.roundingIncrement", - "getOwnPropertyDescriptor options.roundingMode", - "get options.roundingMode", - "getOwnPropertyDescriptor options.largestUnit", - "get options.largestUnit", - "getOwnPropertyDescriptor options.smallestUnit", - "get options.smallestUnit", - "getOwnPropertyDescriptor options.additional", - "get options.additional", // CalendarDateUntil "get this.calendar.dateUntil", "call this.calendar.dateUntil", diff --git a/test/built-ins/Temporal/PlainYearMonth/prototype/until/order-of-operations.js b/test/built-ins/Temporal/PlainYearMonth/prototype/until/order-of-operations.js index c423f47410..e9c93ad41d 100644 --- a/test/built-ins/Temporal/PlainYearMonth/prototype/until/order-of-operations.js +++ b/test/built-ins/Temporal/PlainYearMonth/prototype/until/order-of-operations.js @@ -32,17 +32,25 @@ const expected = [ "get other.calendar[Symbol.toPrimitive]", "get other.calendar.toString", "call other.calendar.toString", - // GetDifferenceSettings + // CopyDataProperties + "ownKeys options", + "getOwnPropertyDescriptor options.roundingIncrement", + "get options.roundingIncrement", + "getOwnPropertyDescriptor options.roundingMode", + "get options.roundingMode", + "getOwnPropertyDescriptor options.largestUnit", "get options.largestUnit", + "getOwnPropertyDescriptor options.smallestUnit", + "get options.smallestUnit", + "getOwnPropertyDescriptor options.additional", + "get options.additional", + // GetDifferenceSettings "get options.largestUnit.toString", "call options.largestUnit.toString", - "get options.roundingIncrement", "get options.roundingIncrement.valueOf", "call options.roundingIncrement.valueOf", - "get options.roundingMode", "get options.roundingMode.toString", "call options.roundingMode.toString", - "get options.smallestUnit", "get options.smallestUnit.toString", "call options.smallestUnit.toString", // CalendarFields @@ -62,18 +70,6 @@ const expected = [ "call other.calendar.year", "get this.calendar.dateFromFields", "call this.calendar.dateFromFields", - // CopyDataProperties - "ownKeys options", - "getOwnPropertyDescriptor options.roundingIncrement", - "get options.roundingIncrement", - "getOwnPropertyDescriptor options.roundingMode", - "get options.roundingMode", - "getOwnPropertyDescriptor options.largestUnit", - "get options.largestUnit", - "getOwnPropertyDescriptor options.smallestUnit", - "get options.smallestUnit", - "getOwnPropertyDescriptor options.additional", - "get options.additional", // CalendarDateUntil "get this.calendar.dateUntil", "call this.calendar.dateUntil", diff --git a/test/built-ins/Temporal/ZonedDateTime/prototype/since/order-of-operations.js b/test/built-ins/Temporal/ZonedDateTime/prototype/since/order-of-operations.js index 08f759a5b6..a0e64466f5 100644 --- a/test/built-ins/Temporal/ZonedDateTime/prototype/since/order-of-operations.js +++ b/test/built-ins/Temporal/ZonedDateTime/prototype/since/order-of-operations.js @@ -62,17 +62,25 @@ const expected = [ "get other.calendar[Symbol.toPrimitive]", "get other.calendar.toString", "call other.calendar.toString", - // GetDifferenceSettings + // CopyDataProperties + "ownKeys options", + "getOwnPropertyDescriptor options.roundingIncrement", + "get options.roundingIncrement", + "getOwnPropertyDescriptor options.roundingMode", + "get options.roundingMode", + "getOwnPropertyDescriptor options.largestUnit", "get options.largestUnit", + "getOwnPropertyDescriptor options.smallestUnit", + "get options.smallestUnit", + "getOwnPropertyDescriptor options.additional", + "get options.additional", + // GetDifferenceSettings "get options.largestUnit.toString", "call options.largestUnit.toString", - "get options.roundingIncrement", "get options.roundingIncrement.valueOf", "call options.roundingIncrement.valueOf", - "get options.roundingMode", "get options.roundingMode.toString", "call options.roundingMode.toString", - "get options.smallestUnit", "get options.smallestUnit.toString", "call options.smallestUnit.toString", ]; @@ -127,18 +135,6 @@ const expectedOpsForCalendarDifference = [ "get other.timeZone[Symbol.toPrimitive]", "get other.timeZone.toString", "call other.timeZone.toString", - // CopyDataProperties - "ownKeys options", - "getOwnPropertyDescriptor options.roundingIncrement", - "get options.roundingIncrement", - "getOwnPropertyDescriptor options.roundingMode", - "get options.roundingMode", - "getOwnPropertyDescriptor options.largestUnit", - "get options.largestUnit", - "getOwnPropertyDescriptor options.smallestUnit", - "get options.smallestUnit", - "getOwnPropertyDescriptor options.additional", - "get options.additional", // DifferenceZonedDateTime "get this.timeZone.getOffsetNanosecondsFor", "call this.timeZone.getOffsetNanosecondsFor", diff --git a/test/built-ins/Temporal/ZonedDateTime/prototype/until/order-of-operations.js b/test/built-ins/Temporal/ZonedDateTime/prototype/until/order-of-operations.js index 081d5e66f3..e325000ea1 100644 --- a/test/built-ins/Temporal/ZonedDateTime/prototype/until/order-of-operations.js +++ b/test/built-ins/Temporal/ZonedDateTime/prototype/until/order-of-operations.js @@ -62,17 +62,25 @@ const expected = [ "get other.calendar[Symbol.toPrimitive]", "get other.calendar.toString", "call other.calendar.toString", - // GetDifferenceSettings + // CopyDataProperties + "ownKeys options", + "getOwnPropertyDescriptor options.roundingIncrement", + "get options.roundingIncrement", + "getOwnPropertyDescriptor options.roundingMode", + "get options.roundingMode", + "getOwnPropertyDescriptor options.largestUnit", "get options.largestUnit", + "getOwnPropertyDescriptor options.smallestUnit", + "get options.smallestUnit", + "getOwnPropertyDescriptor options.additional", + "get options.additional", + // GetDifferenceSettings "get options.largestUnit.toString", "call options.largestUnit.toString", - "get options.roundingIncrement", "get options.roundingIncrement.valueOf", "call options.roundingIncrement.valueOf", - "get options.roundingMode", "get options.roundingMode.toString", "call options.roundingMode.toString", - "get options.smallestUnit", "get options.smallestUnit.toString", "call options.smallestUnit.toString", ]; @@ -127,18 +135,6 @@ const expectedOpsForCalendarDifference = [ "get other.timeZone[Symbol.toPrimitive]", "get other.timeZone.toString", "call other.timeZone.toString", - // CopyDataProperties - "ownKeys options", - "getOwnPropertyDescriptor options.roundingIncrement", - "get options.roundingIncrement", - "getOwnPropertyDescriptor options.roundingMode", - "get options.roundingMode", - "getOwnPropertyDescriptor options.largestUnit", - "get options.largestUnit", - "getOwnPropertyDescriptor options.smallestUnit", - "get options.smallestUnit", - "getOwnPropertyDescriptor options.additional", - "get options.additional", // DifferenceZonedDateTime "get this.timeZone.getOffsetNanosecondsFor", "call this.timeZone.getOffsetNanosecondsFor",