diff --git a/test/built-ins/Temporal/Now/timeZone/new-object.js b/test/built-ins/Temporal/Now/timeZone/new-object.js deleted file mode 100644 index 01ff926a608..00000000000 --- a/test/built-ins/Temporal/Now/timeZone/new-object.js +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (C) 2020 Igalia, S.L. All rights reserved. -// This code is governed by the BSD license found in the LICENSE file. - -/*--- -esid: sec-temporal.now.timezone -description: Each invocation of the function produces a distinct object value -features: [Temporal] ----*/ - -const tz = Temporal.Now.timeZone; -const tz1 = tz(); -const tz2 = tz(); -assert.notSameValue(tz1, tz2, 'The value of tz1 is expected to not equal the value of `tz2`'); diff --git a/test/built-ins/Temporal/Now/timeZone/return-value.js b/test/built-ins/Temporal/Now/timeZone/return-value.js deleted file mode 100644 index 098717a1ced..00000000000 --- a/test/built-ins/Temporal/Now/timeZone/return-value.js +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (C) 2021 the V8 project authors. All rights reserved. -// This code is governed by the BSD license found in the LICENSE file. - -/*--- -esid: sec-temporal.now.timezone -description: Temporal.Now.timeZone returns an instance of the TimeZone constructor -info: | - 1. Return ? SystemTimeZone(). -features: [Temporal] ----*/ - -assert.sameValue( - Object.getPrototypeOf(Temporal.Now.timeZone()), - Temporal.TimeZone.prototype, - 'Object.getPrototypeOf(Temporal.Now.timeZone()) returns Temporal.TimeZone.prototype' -); diff --git a/test/built-ins/Temporal/Now/timeZone/extensible.js b/test/built-ins/Temporal/Now/timeZoneId/extensible.js similarity index 63% rename from test/built-ins/Temporal/Now/timeZone/extensible.js rename to test/built-ins/Temporal/Now/timeZoneId/extensible.js index 929a0708476..05a87d588be 100644 --- a/test/built-ins/Temporal/Now/timeZone/extensible.js +++ b/test/built-ins/Temporal/Now/timeZoneId/extensible.js @@ -2,8 +2,8 @@ // This code is governed by the BSD license found in the LICENSE file. /*--- -esid: sec-temporal.now.timezone -description: Temporal.Now.timeZone is extensible. +esid: sec-temporal.now.timezoneid +description: Temporal.Now.timeZoneId is extensible. info: | ## 17 ECMAScript Standard Built-in Objects @@ -13,6 +13,6 @@ features: [Temporal] ---*/ assert( - Object.isExtensible(Temporal.Now.timeZone), - 'Object.isExtensible(Temporal.Now.timeZone) must return true' + Object.isExtensible(Temporal.Now.timeZoneId), + 'Object.isExtensible(Temporal.Now.timeZoneId) must return true' ); diff --git a/test/built-ins/Temporal/Now/timeZone/length.js b/test/built-ins/Temporal/Now/timeZoneId/length.js similarity index 87% rename from test/built-ins/Temporal/Now/timeZone/length.js rename to test/built-ins/Temporal/Now/timeZoneId/length.js index fdf33918f16..0a268a2e530 100644 --- a/test/built-ins/Temporal/Now/timeZone/length.js +++ b/test/built-ins/Temporal/Now/timeZoneId/length.js @@ -2,8 +2,8 @@ // This code is governed by the BSD license found in the LICENSE file. /*--- -esid: sec-temporal.now.timezone -description: Temporal.Now.timeZone.length is 0 +esid: sec-temporal.now.timezoneid +description: Temporal.Now.timeZoneId.length is 0 info: | Every built-in function object, including constructors, has a "length" property whose value is an integer. Unless otherwise specified, this value is equal to the largest number of named @@ -17,7 +17,7 @@ includes: [propertyHelper.js] features: [Temporal] ---*/ -verifyProperty(Temporal.Now.timeZone, "length", { +verifyProperty(Temporal.Now.timeZoneId, "length", { value: 0, writable: false, enumerable: false, diff --git a/test/built-ins/Temporal/Now/timeZone/name.js b/test/built-ins/Temporal/Now/timeZoneId/name.js similarity index 71% rename from test/built-ins/Temporal/Now/timeZone/name.js rename to test/built-ins/Temporal/Now/timeZoneId/name.js index 2e70d8b02db..67c9858604a 100644 --- a/test/built-ins/Temporal/Now/timeZone/name.js +++ b/test/built-ins/Temporal/Now/timeZoneId/name.js @@ -2,8 +2,8 @@ // This code is governed by the BSD license found in the LICENSE file. /*--- -esid: sec-temporal.now.timezone -description: Temporal.Now.timeZone.name is "timeZone". +esid: sec-temporal.now.timezoneid +description: Temporal.Now.timeZoneId.name is "timeZoneId". info: | ## 17 ECMAScript Standard Built-in Objects: Every built-in Function object, including constructors, that is not @@ -18,12 +18,12 @@ features: [Temporal] ---*/ assert.sameValue( - Temporal.Now.timeZone.name, - 'timeZone', - 'The value of Temporal.Now.timeZone.name is expected to be "timeZone"' + Temporal.Now.timeZoneId.name, + 'timeZoneId', + 'The value of Temporal.Now.timeZoneId.name is expected to be "timeZoneId"' ); -verifyProperty(Temporal.Now.timeZone, 'name', { +verifyProperty(Temporal.Now.timeZoneId, 'name', { enumerable: false, writable: false, configurable: true diff --git a/test/built-ins/Temporal/Now/timeZone/not-a-constructor.js b/test/built-ins/Temporal/Now/timeZoneId/not-a-constructor.js similarity index 60% rename from test/built-ins/Temporal/Now/timeZone/not-a-constructor.js rename to test/built-ins/Temporal/Now/timeZoneId/not-a-constructor.js index 7239f3b43ee..4056fd39ec1 100644 --- a/test/built-ins/Temporal/Now/timeZone/not-a-constructor.js +++ b/test/built-ins/Temporal/Now/timeZoneId/not-a-constructor.js @@ -2,8 +2,8 @@ // This code is governed by the BSD license found in the LICENSE file. /*--- -esid: sec-temporal.now.timezone -description: Temporal.Now.timeZone does not implement [[Construct]] +esid: sec-temporal.now.timezoneid +description: Temporal.Now.timeZoneId does not implement [[Construct]] info: | ECMAScript Function Objects @@ -14,8 +14,8 @@ includes: [isConstructor.js] features: [Reflect.construct, Temporal, arrow-function] ---*/ -assert.sameValue(isConstructor(Temporal.Now.timeZone), false, 'isConstructor(Temporal.Now.timeZone) must return false'); +assert.sameValue(isConstructor(Temporal.Now.timeZoneId), false, 'isConstructor(Temporal.Now.timeZoneId) must return false'); assert.throws(TypeError, () => { - new Temporal.Now.timeZone(); -}, 'new Temporal.Now.timeZone() throws a TypeError exception'); + new Temporal.Now.timeZoneId(); +}, 'new Temporal.Now.timeZoneId() throws a TypeError exception'); diff --git a/test/built-ins/Temporal/Now/timeZone/prop-desc.js b/test/built-ins/Temporal/Now/timeZoneId/prop-desc.js similarity index 69% rename from test/built-ins/Temporal/Now/timeZone/prop-desc.js rename to test/built-ins/Temporal/Now/timeZoneId/prop-desc.js index 15829fb2eb1..15cafacf0c5 100644 --- a/test/built-ins/Temporal/Now/timeZone/prop-desc.js +++ b/test/built-ins/Temporal/Now/timeZoneId/prop-desc.js @@ -2,8 +2,8 @@ // This code is governed by the BSD license found in the LICENSE file. /*--- -esid: sec-temporal.now.timezone -description: The "timeZone" property of Temporal.Now +esid: sec-temporal.now.timezoneid +description: The "timeZoneId" property of Temporal.Now info: | Section 17: Every other data property described in clauses 18 through 26 and in Annex B.2 has the attributes { [[Writable]]: true, @@ -12,9 +12,9 @@ includes: [propertyHelper.js] features: [Temporal] ---*/ -assert.sameValue(typeof Temporal.Now.timeZone, "function", "typeof is function"); +assert.sameValue(typeof Temporal.Now.timeZoneId, "function", "typeof is function"); -verifyProperty(Temporal.Now, 'timeZone', { +verifyProperty(Temporal.Now, 'timeZoneId', { enumerable: false, writable: true, configurable: true diff --git a/test/built-ins/Temporal/Now/timeZoneId/return-value.js b/test/built-ins/Temporal/Now/timeZoneId/return-value.js new file mode 100644 index 00000000000..efb52a123de --- /dev/null +++ b/test/built-ins/Temporal/Now/timeZoneId/return-value.js @@ -0,0 +1,16 @@ +// Copyright (C) 2021 the V8 project authors. All rights reserved. +// This code is governed by the BSD license found in the LICENSE file. + +/*--- +esid: sec-temporal.now.timezoneid +description: Temporal.Now.timeZoneId returns a string +info: | + 1. Return DefaultTimeZone(). +features: [Temporal] +---*/ + +assert.sameValue( + typeof Temporal.Now.timeZoneId(), + "string", + "Temporal.Now.timeZoneId() returns a string" +); diff --git a/test/built-ins/Temporal/Now/zonedDateTime/time-zone-undefined.js b/test/built-ins/Temporal/Now/zonedDateTime/time-zone-undefined.js index 71bc5816a27..731c9c3ba1f 100644 --- a/test/built-ins/Temporal/Now/zonedDateTime/time-zone-undefined.js +++ b/test/built-ins/Temporal/Now/zonedDateTime/time-zone-undefined.js @@ -18,14 +18,14 @@ Object.defineProperty(Temporal.TimeZone, "from", { }, }); -const systemTimeZone = Temporal.Now.timeZone(); +const systemTimeZone = Temporal.Now.timeZoneId(); const resultExplicit = Temporal.Now.zonedDateTime('iso8601', undefined); -assert.sameValue(resultExplicit.timeZone.id, systemTimeZone.id); +assert.sameValue(resultExplicit.timeZone.id, systemTimeZone); assert.compareArray(actual, expected, "Temporal.TimeZone.from should not be called"); const resultImplicit = Temporal.Now.zonedDateTime('iso8601'); -assert.sameValue(resultImplicit.timeZone.id, systemTimeZone.id); +assert.sameValue(resultImplicit.timeZone.id, systemTimeZone); assert.compareArray(actual, expected, "Temporal.TimeZone.from should not be called"); diff --git a/test/built-ins/Temporal/Now/zonedDateTimeISO/return-value.js b/test/built-ins/Temporal/Now/zonedDateTimeISO/return-value.js index fe5db1af9ac..26ce97d976f 100644 --- a/test/built-ins/Temporal/Now/zonedDateTimeISO/return-value.js +++ b/test/built-ins/Temporal/Now/zonedDateTimeISO/return-value.js @@ -8,9 +8,9 @@ features: [Temporal] ---*/ const zdt = Temporal.Now.zonedDateTimeISO(); -const tz = Temporal.Now.timeZone(); +const tz = Temporal.Now.timeZoneId(); assert(zdt instanceof Temporal.ZonedDateTime); assert(zdt.calendar instanceof Temporal.Calendar); assert.sameValue(zdt.calendar.id, "iso8601"); assert(zdt.timeZone instanceof Temporal.TimeZone); -assert.sameValue(zdt.timeZone.id, tz.id); +assert.sameValue(zdt.timeZone.id, tz); diff --git a/test/built-ins/Temporal/Now/zonedDateTimeISO/time-zone-undefined.js b/test/built-ins/Temporal/Now/zonedDateTimeISO/time-zone-undefined.js index 7ed6e7b47cd..1c34551414d 100644 --- a/test/built-ins/Temporal/Now/zonedDateTimeISO/time-zone-undefined.js +++ b/test/built-ins/Temporal/Now/zonedDateTimeISO/time-zone-undefined.js @@ -18,14 +18,14 @@ Object.defineProperty(Temporal.TimeZone, "from", { }, }); -const systemTimeZone = Temporal.Now.timeZone(); +const systemTimeZone = Temporal.Now.timeZoneId(); const resultExplicit = Temporal.Now.zonedDateTimeISO(undefined); -assert.sameValue(resultExplicit.timeZone.id, systemTimeZone.id); +assert.sameValue(resultExplicit.timeZone.id, systemTimeZone); assert.compareArray(actual, expected, "Temporal.TimeZone.from should not be called"); const resultImplicit = Temporal.Now.zonedDateTimeISO(); -assert.sameValue(resultImplicit.timeZone.id, systemTimeZone.id); +assert.sameValue(resultImplicit.timeZone.id, systemTimeZone); assert.compareArray(actual, expected, "Temporal.TimeZone.from should not be called"); diff --git a/test/intl402/Temporal/Now/zonedDateTime/calendar-string.js b/test/intl402/Temporal/Now/zonedDateTime/calendar-string.js index 2b75ab8dfc0..d729bddff8e 100644 --- a/test/intl402/Temporal/Now/zonedDateTime/calendar-string.js +++ b/test/intl402/Temporal/Now/zonedDateTime/calendar-string.js @@ -8,10 +8,10 @@ features: [Temporal] ---*/ const zdt = Temporal.Now.zonedDateTime("gregory"); -const tz = Temporal.Now.timeZone(); +const tz = Temporal.Now.timeZoneId(); assert(zdt instanceof Temporal.ZonedDateTime); assert(zdt.calendar instanceof Temporal.Calendar); assert.sameValue(zdt.calendar.id, "gregory"); assert(zdt.timeZone instanceof Temporal.TimeZone); -assert.sameValue(zdt.timeZone.id, tz.id); +assert.sameValue(zdt.timeZone.id, tz);