Integrate component tests into the main test script

Author: kateinoigakukun

packages/npm-packages/ruby-head-wasm-wasi/package.json

@@ -29,7 +29,7 @@
     "README.md"
   ],
   "scripts": {
-    "test": "RUBY_NPM_PACKAGE_ROOT=../ruby-head-wasm-wasi npm -C ../ruby-wasm-wasi run test:run",
+    "test": "RUBY_NPM_PACKAGE_ROOT=../ruby-head-wasm-wasi npm -C ../ruby-wasm-wasi run test:run:all",
     "build:deps": "cd ../ruby-wasm-wasi && npm run build",
     "build:static:files": "../ruby-wasm-wasi/tools/pack-static-files.sh ./dist",
     "build:static:compat": "../ruby-wasm-wasi/tools/pack-compat-shim.mjs --dist=./dist --pkg=ruby-head-wasm-wasi",

packages/npm-packages/ruby-wasm-wasi/package.json

@@ -39,6 +39,7 @@
   ],
   "license": "MIT",
   "scripts": {
+    "test:run:all": "npm run test:run && ENABLE_COMPONENT_TESTS=1 npm run test:run",
     "test:run": "npm run test:unit && npm run test:vitest -- --run && npm run test:e2e",
     "test:vitest": "vitest ./test/",
     "test:unit": "./tools/run-test-unit.mjs",

packages/npm-packages/ruby-wasm-wasi/tools/run-test-unit.mjs

@@ -212,11 +212,12 @@ const test = async (instantiate) => {
 };
 
 const main = async () => {
-  await test(instantiateNodeWasi);
-  if (!process.env.RUBY_ROOT) {
-    await test(instantiateBrowserWasi);
-    if (process.env.ENABLE_COMPONENT_TESTS && process.env.ENABLE_COMPONENT_TESTS !== 'false') {
-      await test(instantiateComponent);
+  if (process.env.ENABLE_COMPONENT_TESTS && process.env.ENABLE_COMPONENT_TESTS !== 'false') {
+    await test(instantiateComponent);
+  } else {
+    await test(instantiateNodeWasi);
+    if (!process.env.RUBY_ROOT) {
+      await test(instantiateBrowserWasi);
     }
   }
 };