Reduce tests run on Windows

SocketDev · Oct 5, 2024 · d5e7073 · d5e7073
1 parent 2130834
commit d5e7073
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 15 deletions.
diff --git a/scripts/utils/manifest.js b/scripts/utils/manifest.js
@@ -0,0 +1,17 @@
+'use strict'
+
+const { PackageURL } = require('packageurl-js')
+
+const registryManifest = require('@socketsecurity/registry')
+
+function getManifestData(eco, regPkgName) {
+  return registryManifest[eco]
+    .find(
+      ({ 0: purlStr }) => PackageURL.fromString(purlStr).name === regPkgName
+    )
+    ?.at(1)
+}
+
+module.exports = {
+  getManifestData
+}
diff --git a/scripts/utils/templates.js b/scripts/utils/templates.js
@@ -22,14 +22,14 @@ const {
   TEMPLATE_ES_SHIM_STATIC_METHOD,
   npmTemplatesPath
 } = constants
+const { getManifestData } = require('@socketregistry/scripts/utils//manifest')
 const { globLicenses } = require('@socketregistry/scripts/utils/globs')
 const { isObjectObject } = require('@socketregistry/scripts/utils/objects')
 const {
   readPackageJson,
   resolveOriginalPackageName
 } = require('@socketregistry/scripts/utils/packages')
 const { prettierFormat } = require('@socketregistry/scripts/utils/strings')
-const registryManifest = require('@socketsecurity/registry')
 
 const eta = new Eta()
 
@@ -73,22 +73,14 @@ async function getLicenseActions(pkgPath) {
   return actions
 }
 
-function getManifestData(regPkgName) {
-  return registryManifest.npm
-    .find(
-      ({ 0: purlStr }) => PackageURL.fromString(purlStr).name === regPkgName
-    )
-    ?.at(1)
-}
-
 async function getNpmReadmeAction(pkgPath) {
   const pkgJsonPath = path.join(pkgPath, PACKAGE_JSON)
   const pkgJson = await readPackageJson(pkgJsonPath)
   const pkgPurlObj = PackageURL.fromString(
     `pkg:npm/${pkgJson.name}@${pkgJson.version}`
   )
   const { name: regPkgName } = pkgPurlObj
-  const manifestData = getManifestData(regPkgName)
+  const manifestData = getManifestData('npm', regPkgName)
   const categories = manifestData?.categories
   return [
     path.join(pkgPath, README_MD),
@@ -116,7 +108,7 @@ async function getNpmReadmeAction(pkgPath) {
 async function getPackageJsonAction(pkgPath, options) {
   const { engines } = { __proto__: null, ...options }
   const regPkgName = path.basename(pkgPath)
-  const manifestData = getManifestData(regPkgName)
+  const manifestData = getManifestData('npm', regPkgName)
   const categories = manifestData?.categories
   return [
     path.join(pkgPath, PACKAGE_JSON),
@@ -175,7 +167,6 @@ async function writeAction(action) {
 
 module.exports = {
   getLicenseActions,
-  getManifestData,
   getNpmReadmeAction,
   getPackageJsonAction,
   getTypeScriptActions,

diff --git a/test/npm.test.ts b/test/npm.test.ts
@@ -14,6 +14,7 @@ const {
   NODE_VERSION,
   PACKAGE_JSON,
   README_GLOB_RECURSIVE,
+  WIN_32,
   parseArgsConfig,
   skipTestsByEcosystem,
   testNpmNodeWorkspacesPath
@@ -26,6 +27,8 @@ import {
   // @ts-ignore
 } from '@socketregistry/scripts/utils/git'
 // @ts-ignore
+import { getManifestData } from '@socketregistry/scripts/utils/manifest'
+// @ts-ignore
 import { runScript } from '@socketregistry/scripts/utils/npm'
 import {
   resolveOriginalPackageName
@@ -61,8 +64,10 @@ describe('npm', async () => {
     const nwPkgJson = fs.readJsonSync(path.join(nwPkgPath, PACKAGE_JSON))
     const nodeRange = nwPkgJson.engines?.node
     const origPkgName = resolveOriginalPackageName(regPkgName)
+    const manifestData = getManifestData('npm', regPkgName)
     const skip =
       !nwPkgJson.scripts?.test ||
+      (WIN_32 && !manifestData.interop.includes('browserify')) ||
       (isNonEmptyString(nodeRange) &&
         !semver.satisfies(NODE_VERSION, nodeRange))
 

diff --git a/test/packages.test.ts b/test/packages.test.ts
@@ -29,6 +29,8 @@ import {
   // @ts-ignore
 } from '@socketregistry/scripts/utils/git'
 // @ts-ignore
+import { getManifestData } from '@socketregistry/scripts/utils/manifest'
+// @ts-ignore
 import { isObjectObject } from '@socketregistry/scripts/utils/objects'
 import {
   findTypesForSubpath,
@@ -44,8 +46,6 @@ import { trimLeadingDotSlash } from '@socketregistry/scripts/utils/path'
 import { localeCompare } from '@socketregistry/scripts/utils/sorts'
 // @ts-ignore
 import { isNonEmptyString } from '@socketregistry/scripts/utils/strings'
-// @ts-ignore
-import { getManifestData } from '@socketregistry/scripts/utils/templates'
 
 // Use by passing as a tap --test-arg:
 // npm run test:unit ./test/packages.test.ts -- --test-arg="--force"
@@ -233,7 +233,7 @@ for (const eco of constants.ecosystems) {
             )
           })
 
-          const manifestData = getManifestData(regPkgName)
+          const manifestData = getManifestData(eco, regPkgName)
           if (manifestData?.license !== 'Public Domain') {
             it(`should have an original license file`, () => {
               assert.ok(files.some(p => p.includes('.original')))