Skip to content

Commit 87e0b9a

Browse files
authored
Merge pull request #5652 from Tyriar/lint_test
Enable linting on test/ folder
2 parents db131e0 + 5e532c1 commit 87e0b9a

3 files changed

Lines changed: 15 additions & 23 deletions

File tree

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
"esbuild-demo-server-watch": "node bin/esbuild.mjs --demo-server --watch",
4848
"test": "npm run test-unit",
4949
"posttest": "npm run lint",
50-
"lint": "eslint --max-warnings 0 src/ addons/ demo/",
50+
"lint": "eslint --max-warnings 0 src/ addons/ demo/ test/",
5151
"lint-changes": "node ./bin/lint_changes.js",
5252
"lint-changes-fix": "node ./bin/lint_changes.js --fix",
53-
"lint-fix": "eslint --fix src/ addons/ demo/",
53+
"lint-fix": "eslint --fix src/ addons/ demo/ test/",
5454
"lint-api": "eslint --config eslint.config.typings.mjs --max-warnings 0 typings/",
5555
"test-unit": "node ./bin/test_unit.js",
5656
"test-unit-slow-tests": "npm run test-unit | grep \"ms)\"",

test/playwright/SharedRendererTests.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,7 +1012,7 @@ export function injectSharedRendererTests(ctx: ISharedRendererTestContext): void
10121012
await ctx.value.proxy.writeln('\x1b[31;42;7m\u{E0B4} red fg green bg inverse\x1b[0m');
10131013
await ctx.value.proxy.writeln('\x1b[32;41;7m\u{E0B4} green fg red bg inverse\x1b[0m');
10141014
await ctx.value.proxy.selectAll();
1015-
await pollFor(ctx.value.page, () => getCellColor(ctx.value, 1, 1), [255,255,255,255]);
1015+
await pollFor(ctx.value.page, () => getCellColor(ctx.value, 1, 1), [255, 255, 255, 255]);
10161016
await pollFor(ctx.value.page, () => getCellColor(ctx.value, 1, 2), [230, 128, 128, 255]);
10171017
await pollFor(ctx.value.page, () => getCellColor(ctx.value, 1, 3), [128, 230, 128, 255]);
10181018
await pollFor(ctx.value.page, () => getCellColor(ctx.value, 1, 4), [128, 230, 128, 255]);
@@ -1397,9 +1397,7 @@ export function injectSharedRendererTestsStandalone(ctx: ISharedRendererTestCont
13971397
* @param row The 1-based row index to get the color for.
13981398
*/
13991399
async function getCellColor(ctx: ITestContext, col: number, row: number, position: CellColorPosition = CellColorPosition.CENTER): Promise<[red: number, green: number, blue: number, alpha: number]> {
1400-
if (!frameDetails) {
1401-
frameDetails = await getFrameDetails(ctx);
1402-
}
1400+
frameDetails ??= await getFrameDetails(ctx);
14031401
switch (position) {
14041402
case CellColorPosition.CENTER:
14051403
return getCellColorInner(frameDetails, col, row);

test/playwright/TestUtils.ts

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,17 @@ class EventEmitter<T, U = void> {
4646
private _disposed: boolean = false;
4747

4848
public get event(): IEvent<T, U> {
49-
if (!this._event) {
50-
this._event = (listener: (arg1: T, arg2: U) => any) => {
51-
this._listeners.add(listener);
52-
const disposable = {
53-
dispose: () => {
54-
if (!this._disposed) {
55-
this._listeners.delete(listener);
56-
}
49+
this._event ??= (listener: (arg1: T, arg2: U) => any) => {
50+
this._listeners.add(listener);
51+
const disposable = {
52+
dispose: () => {
53+
if (!this._disposed) {
54+
this._listeners.delete(listener);
5755
}
58-
};
59-
return disposable;
56+
}
6057
};
61-
}
58+
return disposable;
59+
};
6260
return this._event;
6361
}
6462

@@ -525,9 +523,7 @@ interface IPollForOptions<T> {
525523
}
526524

527525
export async function pollFor<T>(page: playwright.Page, evalOrFn: string | (() => MaybeAsync<T>), val: T, preFn?: () => Promise<void>, options?: IPollForOptions<T>): Promise<void> {
528-
if (!options) {
529-
options = {};
530-
}
526+
options ??= {};
531527
options.stack ??= new Error().stack;
532528
if (preFn) {
533529
await preFn();
@@ -551,9 +547,7 @@ export async function pollFor<T>(page: playwright.Page, evalOrFn: string | (() =
551547
}
552548

553549
if (!equalityCheck) {
554-
if (options.maxDuration === undefined) {
555-
options.maxDuration = 2000;
556-
}
550+
options.maxDuration ??= 2000;
557551
if (options.maxDuration <= 0) {
558552
deepStrictEqual(result, val, ([
559553
`pollFor max duration exceeded.`,

0 commit comments

Comments
 (0)