browser-ava 1.3.2 → 1.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browser-ava",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "publishConfig": {
     "access": "public"
   },
@@ -38,7 +38,7 @@
     "ws": "^8.11.0"
   },
   "devDependencies": {
-    "ava": "^5.0.1",
+    "ava": "^5.1.0",
     "c8": "^7.12.0",
     "execa": "^6.1.0",
     "semantic-release": "^19.0.5"

package/src/browser/runtime.mjs

@@ -1,5 +1,11 @@
 import { testModules } from "./ava.mjs";
-import { calculateSummary, summaryMessages, pluralize, stringify } from "./util.mjs";
+import {
+  calculateSummary,
+  summaryMessages,
+  pluralize,
+  stringify,
+  moduleName
+} from "./util.mjs";
 import { isEqual } from "./eql.mjs";
 
 let ws = new WebSocket(`ws://${location.host}`);
@@ -80,10 +86,10 @@ async function displayTests() {
   function renderModule(tm) {
     const passedTestsCount = tm.tests.filter(t => t.passed).length;
     const allTestsCount = tm.tests.length;
-    return `<li id="${tm.file}" class="module${
+    return `<li id="${moduleName(tm.file)}" class="module${
       passedTestsCount === allTestsCount ? " passed" : ""
     }">
-      <span class="moduleName">${tm.file}</span>
+      <span class="moduleName">${moduleName(tm.file)}</span>
       <span class="moduleSummary"> ( ${passedTestsCount} / ${allTestsCount} ${pluralize(
       "test",
       allTestsCount
@@ -171,8 +177,7 @@ async function runTest(parent, tm, test) {
     } catch (e) {
       test.passed = false;
       test.message = e;
-    }
-    finally {
+    } finally {
       ws.send(stringify({ action: "update", data: test }));
     }
   }

package/src/browser/util.mjs

@@ -77,3 +77,7 @@ export function stringify(...args) {
   BigInt.prototype.toJSON = former;
   return string;
 }
+
+export function moduleName(url) {
+  return url.replace(/\.m?js$/,'')
+}

package/src/browser-ava-cli.mjs

@@ -95,18 +95,18 @@ program
     let errors = 0;
 
     wss.on("connection", ws => {
-      ws.on("message", async data => {
-        data = JSON.parse(data);
-        switch (data.action) {
+      ws.on("message", async content => {
+        const { action, data } = JSON.parse(content);
+        switch (action) {
           case "info":
-            console.info(...data.data);
+            console.info(...data);
             break;
           case "log":
-            console.log(...data.data);
+            console.log(...data);
             break;
           case "error":
             errors++;
-            console.error(...data.data);
+            console.error(...data);
             await shutdown(undefined, true);
             break;
 
@@ -115,15 +115,15 @@ program
             break;
 
           case "update":
-            if (data.data.skip) {
-              console.log(" ", chalk.yellow("- [skip] " + data.data.title));
+            if (data.skip) {
+              console.log(" ", chalk.yellow("- [skip] " + data.title));
             } else {
-              if (data.data.todo) {
+              if (data.todo) {
               } else {
-                if (data.data.passed === true) {
-                  console.log(" ", chalk.green("✔"), data.data.title);
+                if (data.passed === true) {
+                  console.log( " ", chalk.green("✔"), data.title);
                 } else {
-                  console.log(" ", chalk.red("✘ [fail]: "), data.data.title);
+                  console.log(" ", chalk.red("✘ [fail]: "), data.title);
                 }
               }
             }
@@ -131,7 +131,7 @@ program
 
           case "result":
             console.log("  ─\n");
-            const summary = calculateSummary(data.data);
+            const summary = calculateSummary(data);
 
             const classToColor = {
               failed: "red",