factorio-test-cli 3.0.1 → 3.0.2

package/output-formatter.js

@@ -63,6 +63,8 @@ export class OutputPrinter {
     printTestResult(test) {
         if (this.options.quiet || this.options.useProgressBar)
             return;
+        if ((test.result === "skipped" || test.result === "todo") && !this.options.verbose)
+            return;
         this.formatter.formatTestResult(test);
     }
     printFailures(tests) {

package/output-formatter.test.js

@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
-import { OutputFormatter } from "./output-formatter.js";
+import { OutputFormatter, OutputPrinter } from "./output-formatter.js";
 describe("OutputFormatter", () => {
     let consoleSpy;
     let output;
@@ -91,3 +91,47 @@ describe("OutputFormatter", () => {
         expect(output[0]).toContain("todo test");
     });
 });
+describe("OutputPrinter", () => {
+    let consoleSpy;
+    let output;
+    beforeEach(() => {
+        output = [];
+        consoleSpy = vi.spyOn(console, "log").mockImplementation((...args) => {
+            output.push(args.join(" "));
+        });
+    });
+    afterEach(() => {
+        consoleSpy.mockRestore();
+    });
+    const skippedTest = { path: "skipped", result: "skipped", errors: [], logs: [] };
+    const todoTest = { path: "todo", result: "todo", errors: [], logs: [] };
+    const passedTest = { path: "passed", result: "passed", errors: [], logs: [] };
+    const failedTest = { path: "failed", result: "failed", errors: ["err"], logs: [] };
+    it("hides skipped tests without verbose", () => {
+        const printer = new OutputPrinter({});
+        printer.printTestResult(skippedTest);
+        expect(output).toHaveLength(0);
+    });
+    it("hides todo tests without verbose", () => {
+        const printer = new OutputPrinter({});
+        printer.printTestResult(todoTest);
+        expect(output).toHaveLength(0);
+    });
+    it("shows skipped tests with verbose", () => {
+        const printer = new OutputPrinter({ verbose: true });
+        printer.printTestResult(skippedTest);
+        expect(output.some((line) => line.includes("SKIP"))).toBe(true);
+    });
+    it("shows todo tests with verbose", () => {
+        const printer = new OutputPrinter({ verbose: true });
+        printer.printTestResult(todoTest);
+        expect(output.some((line) => line.includes("TODO"))).toBe(true);
+    });
+    it("shows passed and failed tests without verbose", () => {
+        const printer = new OutputPrinter({});
+        printer.printTestResult(passedTest);
+        printer.printTestResult(failedTest);
+        expect(output.some((line) => line.includes("PASS"))).toBe(true);
+        expect(output.some((line) => line.includes("FAIL"))).toBe(true);
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "factorio-test-cli",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "A CLI to run FactorioTest.",
   "license": "MIT",
   "repository": {

package/progress-renderer.js

@@ -24,15 +24,20 @@ export class ProgressRenderer {
     }
     handleTestFinished(test) {
         this.currentTest = undefined;
-        this.ran++;
-        if (test.result === "passed")
+        if (test.result === "passed") {
+            this.ran++;
             this.passed++;
-        else if (test.result === "failed")
+        }
+        else if (test.result === "failed") {
+            this.ran++;
             this.failed++;
-        else if (test.result === "skipped")
+        }
+        else if (test.result === "skipped") {
             this.skipped++;
-        else if (test.result === "todo")
+        }
+        else if (test.result === "todo") {
             this.todo++;
+        }
     }
     withPermanentOutput(callback) {
         if (!this.isTTY || !this.active) {
@@ -53,7 +58,7 @@ export class ProgressRenderer {
         this.active = true;
         const percent = this.total > 0 ? Math.floor((this.ran / this.total) * 100) : 0;
         const barWidth = 20;
-        const filled = Math.floor((percent / 100) * barWidth);
+        const filled = Math.min(barWidth, Math.floor((percent / 100) * barWidth));
         const bar = "█".repeat(filled) + "░".repeat(barWidth - filled);
         const counts = [
             chalk.green(`✓${this.passed}`),

package/progress-renderer.test.js

@@ -70,6 +70,29 @@ describe("ProgressRenderer", () => {
             const output = vi.mocked(logUpdate).mock.calls[0][0];
             expect(output).toContain("Running: describe > my test");
         });
+        it("handles ran exceeding total without error", () => {
+            const renderer = new ProgressRenderer(true);
+            renderer.handleEvent({ type: "testRunStarted", total: 2 });
+            for (let i = 0; i < 5; i++) {
+                renderer.handleTestFinished({ path: `test${i}`, result: "passed", errors: [], logs: [] });
+            }
+            expect(() => {
+                renderer.handleEvent({ type: "testStarted", test: { path: "extra test" } });
+            }).not.toThrow();
+        });
+        it("does not count skipped or todo tests in ran", () => {
+            const renderer = new ProgressRenderer(true);
+            renderer.handleEvent({ type: "testRunStarted", total: 2 });
+            renderer.handleTestFinished({ path: "test1", result: "passed", errors: [], logs: [] });
+            renderer.handleTestFinished({ path: "skipped", result: "skipped", errors: [], logs: [] });
+            renderer.handleTestFinished({ path: "todo", result: "todo", errors: [], logs: [] });
+            renderer.handleTestFinished({ path: "test2", result: "failed", errors: [], logs: [] });
+            vi.mocked(logUpdate).mockClear();
+            renderer.handleEvent({ type: "testStarted", test: { path: "next" } });
+            const output = vi.mocked(logUpdate).mock.calls[0][0];
+            expect(output).toContain("2/2");
+            expect(output).toContain("100%");
+        });
     });
     describe("finish", () => {
         it("clears on finish when active", () => {