improved test running

fullcalendar · Jan 29, 2024 · 33777fa · 33777fa
1 parent 0f74cbf
commit 33777fa
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/...ig/expected-failures-intl-format-norm.txt → ...t-config/expected-failures-node-gte18.txt b/...ig/expected-failures-intl-format-norm.txt → ...t-config/expected-failures-node-gte18.txt
@@ -1,4 +1,3 @@
-
 # Really picky about whitespace between characters
 # Nothing we can do about this since it relies on Intl.DateTimeFormat
 staging/Intl402/Temporal/old/date-time-format.js

diff --git a/...onfig/expected-failures-before-node16.txt → ...st-config/expected-failures-node-lt16.txt b/...onfig/expected-failures-before-node16.txt → ...st-config/expected-failures-node-lt16.txt
diff --git a/...onfig/expected-failures-before-node18.txt → ...st-config/expected-failures-node-lt18.txt b/...onfig/expected-failures-before-node18.txt → ...st-config/expected-failures-node-lt18.txt
@@ -5,6 +5,8 @@ intl402/DateTimeFormat/constructor-options-timeZoneName-valid.js
 intl402/Temporal/TimeZone/supported-values-of.js
 intl402/Temporal/TimeZone/prototype/equals/canonical-not-equal.js
 intl402/Temporal/TimeZone/prototype/equals/timezone-case-insensitive.js
+intl402/Temporal/TimeZone/from/timezone-case-insensitive.js
+intl402/Temporal/ZonedDateTime/from/timezone-case-insensitive.js
 
 intl402/Temporal/TimeZone/prototype/getNextTransition/transition-at-instant-boundaries.js
 intl402/Temporal/TimeZone/prototype/getPreviousTransition/transition-at-instant-boundaries.js

diff --git a/packages/temporal-polyfill/scripts/test.js b/packages/temporal-polyfill/scripts/test.js
@@ -55,6 +55,7 @@ yargs(hideBin(process.argv))
       const currentNodeVersion = process.versions.node
       const currentNodeMajorVersion = parseInt(currentNodeVersion.split('.')[0])
 
+      // If different version of Node requested, spawn a new process
       if (
         options.nodeVersion &&
         options.nodeVersion !== currentNodeVersion &&
@@ -66,8 +67,7 @@ yargs(hideBin(process.argv))
           cwd: process.cwd(),
           env: {
             ...filterEnv(process.env),
-            // will force PNPM to use a specific version (see .npmrc)
-            NODE_VERSION: options.nodeVersion,
+            NODE_VERSION: options.nodeVersion, // forces PNPM to use specific version (see .npmrc)
           }
         })
       }
@@ -78,17 +78,18 @@ yargs(hideBin(process.argv))
       ]
 
       if (currentNodeMajorVersion >= 18) {
-        expectedFailureFiles.push('expected-failures-intl-format-norm.txt')
+        expectedFailureFiles.push('expected-failures-node-gte18.txt')
       }
       if (currentNodeMajorVersion < 18) {
-        expectedFailureFiles.push('expected-failures-before-node18.txt')
+        expectedFailureFiles.push('expected-failures-node-lt18.txt')
       }
       if (currentNodeMajorVersion < 16) {
-        expectedFailureFiles.push('expected-failures-before-node16.txt')
+        expectedFailureFiles.push('expected-failures-node-lt16.txt')
       }
 
       let { esm, min } = options
 
+      // Let CI decide. Try all permutations based on Node LTS version
       if (process.env.CI) {
         esm = esm || Boolean(Math.floor(currentNodeMajorVersion / 4) % 2)
         min = min || Boolean(Math.floor(currentNodeMajorVersion / 2) % 2)
@@ -142,6 +143,8 @@ function liveExec(cmdParts, options = {}) {
   })
 }
 
+// Filter away Node-related environment variables because prevents
+// PNPM's use-node-version from being reset
 function filterEnv(oldEnv) {
   const newEnv = {}