@ohos-ports/floss 5.0.1-beta.2 → 5.0.1-beta.4

package/lib/browser-runner.js

@@ -460,7 +460,12 @@ function runInBrowser(opts) {
             await closeBrowser();
 
             // ── 16. Return result ──
-            if (result.failures > 0) {
+            if (result.total === 0) {
+                reject(new Error(
+                    "No tests executed in browser. Test files likely use require() " +
+                    "which is not available in browser context."
+                ));
+            } else if (result.failures > 0) {
                 reject(new Error(
                     "Mocha tests failed: " + result.failures +
                     " failure(s) out of " + (result.total || "unknown") + " test(s)."

package/lib/index.js

@@ -54,25 +54,19 @@ function floss(options) {
         //   Level 3: Error — no runner available
 
         // Level 1: Try browser-runner (海泰浏览器 + CDP)
+        // Level 2: Fall back to node-runner (jsdom) on any failure
         try {
             const browserRunner = require('./browser-runner');
-            return browserRunner.runInBrowser(opts);
-        }
-        catch (browserErr) {
-            // Level 2: Try node-runner (jsdom)
-            try {
+            return browserRunner.runInBrowser(opts).catch((browserErr) => {
+                // Browser runner failed (launch error, 0 tests, or timeout)
                 const nodeRunner = require('./node-runner');
                 return nodeRunner.runInNode(opts);
-            }
-            catch (nodeErr) {
-                // Level 3: No runner available
-                throw new Error(
-                    'Unable to find Electron. No test runner available.\n' +
-                    '  Browser runner (CDP) failed: ' + browserErr.message + '\n' +
-                    '  Node runner (jsdom) failed: ' + nodeErr.message + '\n' +
-                    'Install \'electron\' alongside Floss, or ensure hdc + browser or jsdom is available.'
-                );
-            }
+            });
+        }
+        catch (browserErr) {
+            // require('./browser-runner') failed synchronously
+            const nodeRunner = require('./node-runner');
+            return nodeRunner.runInNode(opts);
         }
     }
     const app = path.join(__dirname, 'main');

package/lib/node-runner.js

@@ -89,6 +89,8 @@ function runInNode(opts) {
             }
             // Add resolved files to Mocha
             resolvedFiles.forEach((file) => mochaInst.addFile(file));
+            // Set global.options for test files that depend on it (same as renderer.js)
+            global.options = opts;
             // Run tests
             mochaInst.run((errorCount) => {
                 if (errorCount > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohos-ports/floss",
-  "version": "5.0.1-beta.2",
+  "version": "5.0.1-beta.4",
   "description": "Unit-testing for those hard to reach places",
   "bin": "./lib/floss.js",
   "main": "./lib/index.js",