Merge and extract for PlainDateTime/prototype until

Author: Brage Hogstad

test/built-ins/Temporal/PlainDateTime/prototype/until/argument-propertybag-calendar-invalid-iso-string.js

@@ -0,0 +1,23 @@
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.prototype.until
+description: Invalid ISO string as calendar should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.PlainDateTime(2000, 5, 2, 12, 34, 56, 987, 654, 321);
+
+const invalidStrings = [
+  ["", "empty string"],
+];
+
+for (const [calendar, description] of invalidStrings) {
+  const arg = { year: 1976, monthCode: "M11", day: 18, calendar };
+  assert.throws(
+    RangeError,
+    () => instance.until(arg),
+    `${description} is not a valid calendar ID`
+  );
+}

test/built-ins/Temporal/PlainDateTime/prototype/until/argument-propertybag-calendar-number.js

@@ -9,23 +9,24 @@ description: >
 features: [BigInt, Symbol, Temporal]
 ---*/
 
-const timeZone = "UTC";
 const instance = new Temporal.PlainDateTime(2000, 5, 2, 12, 34, 56, 987, 654, 321);
 
 const primitiveTests = [
   [null, "null"],
   [true, "boolean"],
-  ["", "empty string"],
-  [1, "number that doesn't convert to a valid ISO string"],
+  [1, "number"],
   [1n, "bigint"],
+  [19970327, "large number"],
+  [-19970327, "negative number"],
+  [1234567890, "very large integer"],
 ];
 
 for (const [calendar, description] of primitiveTests) {
-  const arg = { year: 2019, monthCode: "M11", day: 1, calendar };
+  const arg = { year: 1976, monthCode: "M11", day: 18, calendar };
   assert.throws(
-    typeof calendar === 'string' ? RangeError : TypeError,
+    TypeError,
     () => instance.until(arg),
-    `${description} does not convert to a valid ISO string`
+    `${description} is not a valid calendar`
   );
 }
 
@@ -37,5 +38,9 @@ const typeErrorTests = [
 
 for (const [calendar, description] of typeErrorTests) {
   const arg = { year: 2019, monthCode: "M11", day: 1, calendar };
-  assert.throws(TypeError, () => instance.until(arg), `${description} is not a valid property bag and does not convert to a string`);
+  assert.throws(
+    TypeError,
+    () => instance.until(arg),
+    `${description} is not a valid property bag and does not convert to a string`
+  );
 }