From 3ee1464f0361b12c225222372e62bdde6d9b66a2 Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Fri, 16 Aug 2024 01:32:41 +0300 Subject: [PATCH] fix: restore passive browsers html-reporter compatibility --- .../controllers/also-controller.ts | 10 +++++++- .../controllers/also-controller.ts | 24 +++++++++++++++---- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/test-reader/controllers/also-controller.ts b/src/test-reader/controllers/also-controller.ts index af6ae7a1d..41b6daf5f 100644 --- a/src/test-reader/controllers/also-controller.ts +++ b/src/test-reader/controllers/also-controller.ts @@ -1,6 +1,6 @@ import { EventEmitter } from "events"; import { TestReaderEvents as ReadEvents } from "../../events"; -import type { Test } from "../../types"; +import type { Test, Suite } from "../../types"; interface TreeBuilder { addTrap: (trap: (test: Test) => void) => void; @@ -28,6 +28,14 @@ export class AlsoController { treeBuilder.addTrap(obj => { if (match(obj.browserId)) { obj.enable(); + + let objParent: Suite | null = obj.parent; + + while (objParent) { + objParent.enable(); + + objParent = objParent.parent; + } } }); }); diff --git a/test/src/test-reader/controllers/also-controller.ts b/test/src/test-reader/controllers/also-controller.ts index 3e14ec8c0..36269ca90 100644 --- a/test/src/test-reader/controllers/also-controller.ts +++ b/test/src/test-reader/controllers/also-controller.ts @@ -4,6 +4,7 @@ import { AlsoController } from "../../../../src/test-reader/controllers/also-con import { TreeBuilder } from "../../../../src/test-reader/tree-builder"; import { ConfigurableTestObject } from "../../../../src/test-reader/test-object/configurable-test-object"; import { TestReaderEvents as ReadEvents } from "../../../../src/events"; +import type { Suite } from "../../../../src/types"; describe("test-reader/controllers/also-controller", () => { const sandbox = sinon.createSandbox(); @@ -16,21 +17,25 @@ describe("test-reader/controllers/also-controller", () => { return AlsoController.create(eventBus); }; - const mkTestObject_ = ( - { browserId }: { browserId: string } = { browserId: "default-browser-id" }, - ): ConfigurableTestObject => { + const mkTestObject_ = ({ + browserId = "default-browser-id", + parent = null, + }: { browserId?: string; parent?: Suite | null } = {}): ConfigurableTestObject => { const testObject = new ConfigurableTestObject({ title: "default-title", file: "/default-file", id: "default-id", }); + testObject.browserId = browserId; + testObject.parent = parent; + testObject.enable = sinon.spy(testObject.enable.bind(testObject)); return testObject; }; - const applyTraps_ = ({ browserId }: { browserId: string }): void => { - const testObject = mkTestObject_({ browserId }); + const applyTraps_ = ({ browserId, parent }: { browserId: string; parent?: Suite }): void => { + const testObject = mkTestObject_({ browserId, parent }); for (let i = 0; i < (TreeBuilder.prototype.addTrap as SinonStub).callCount; ++i) { (TreeBuilder.prototype.addTrap as SinonStub).getCall(i).args[0](testObject); @@ -100,6 +105,15 @@ describe("test-reader/controllers/also-controller", () => { assert.calledOnce(ConfigurableTestObject.prototype.enable as SinonStub); }); + + it("should enable parent suites", () => { + const parent = mkTestObject_({ browserId: "broya" }) as Suite; + mkController_().in([mkMatcher("yabro"), mkMatcher("broya")]); + + applyTraps_({ browserId: "broya", parent }); + + assert.calledOnceWith(parent.enable as SinonStub); + }); }); }); });