Skip to content

Commit 428c03a

Browse files
committed
Lint test files
1 parent 0e3b2fc commit 428c03a

File tree

4 files changed

+32
-25
lines changed

4 files changed

+32
-25
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = {
66
"plugin:matrix-org/babel",
77
],
88
parserOptions: {
9-
project: ["./tsconfig.json"],
9+
project: ["./tsconfig-dev.json"],
1010
},
1111
env: {
1212
browser: true,

test/ClientWidgetApi-test.ts

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717

1818
import { waitFor } from '@testing-library/dom';
19+
1920
import { ClientWidgetApi } from "../src/ClientWidgetApi";
2021
import { WidgetDriver } from "../src/driver/WidgetDriver";
2122
import { UnstableApiVersion } from '../src/interfaces/ApiVersion';
@@ -43,11 +44,11 @@ import {
4344
} from '../src';
4445
import { IGetMediaConfigActionFromWidgetActionRequest } from '../src/interfaces/GetMediaConfigAction';
4546

46-
jest.mock('../src/transport/PostmessageTransport')
47+
jest.mock('../src/transport/PostmessageTransport');
4748

4849
afterEach(() => {
4950
jest.resetAllMocks();
50-
})
51+
});
5152

5253
function createRoomEvent(event: Partial<IRoomEvent> = {}): IRoomEvent {
5354
return {
@@ -63,7 +64,7 @@ function createRoomEvent(event: Partial<IRoomEvent> = {}): IRoomEvent {
6364
}
6465

6566
class CustomMatrixError extends Error {
66-
constructor(
67+
public constructor(
6768
message: string,
6869
public readonly httpStatus: number,
6970
public readonly name: string,
@@ -96,7 +97,7 @@ describe('ClientWidgetApi', () => {
9697
let transport: PostmessageTransport;
9798
let emitEvent: Parameters<PostmessageTransport["on"]>["1"];
9899

99-
async function loadIframe(caps: Capability[] = []) {
100+
async function loadIframe(caps: Capability[] = []): Promise<void> {
100101
capabilities = caps;
101102

102103
const ready = new Promise<void>(resolve => {
@@ -517,7 +518,7 @@ describe('ClientWidgetApi', () => {
517518
});
518519
});
519520

520-
expect(driver.sendDelayedEvent).not.toBeCalled()
521+
expect(driver.sendDelayedEvent).not.toBeCalled();
521522
});
522523

523524
it('sends delayed message events', async () => {
@@ -736,7 +737,7 @@ describe('ClientWidgetApi', () => {
736737
});
737738
});
738739

739-
expect(driver.updateDelayedEvent).not.toBeCalled()
740+
expect(driver.updateDelayedEvent).not.toBeCalled();
740741
});
741742

742743
it('fails to update delayed events with unsupported action', async () => {
@@ -761,7 +762,7 @@ describe('ClientWidgetApi', () => {
761762
});
762763
});
763764

764-
expect(driver.updateDelayedEvent).not.toBeCalled()
765+
expect(driver.updateDelayedEvent).not.toBeCalled();
765766
});
766767

767768
it('updates delayed events', async () => {
@@ -1123,7 +1124,7 @@ describe('ClientWidgetApi', () => {
11231124
driver.readStateEvents.mockResolvedValue([
11241125
createRoomEvent({ type: 'net.example.test', state_key: 'A' }),
11251126
createRoomEvent({ type: 'net.example.test', state_key: 'B' }),
1126-
])
1127+
]);
11271128

11281129
const event: IReadEventFromWidgetActionRequest = {
11291130
api: WidgetApiDirection.FromWidget,
@@ -1151,7 +1152,7 @@ describe('ClientWidgetApi', () => {
11511152

11521153
expect(driver.readStateEvents).toBeCalledWith(
11531154
'net.example.test', undefined, 0, null,
1154-
)
1155+
);
11551156
});
11561157

11571158
it('fails to read state events with any state key', async () => {
@@ -1176,13 +1177,13 @@ describe('ClientWidgetApi', () => {
11761177
});
11771178
});
11781179

1179-
expect(driver.readStateEvents).not.toBeCalled()
1180+
expect(driver.readStateEvents).not.toBeCalled();
11801181
});
11811182

11821183
it('reads state events with a specific state key', async () => {
11831184
driver.readStateEvents.mockResolvedValue([
11841185
createRoomEvent({ type: 'net.example.test', state_key: 'B' }),
1185-
])
1186+
]);
11861187

11871188
const event: IReadEventFromWidgetActionRequest = {
11881189
api: WidgetApiDirection.FromWidget,
@@ -1209,7 +1210,7 @@ describe('ClientWidgetApi', () => {
12091210

12101211
expect(driver.readStateEvents).toBeCalledWith(
12111212
'net.example.test', 'B', 0, null,
1212-
)
1213+
);
12131214
});
12141215

12151216
it('fails to read state events with a specific state key', async () => {
@@ -1235,9 +1236,9 @@ describe('ClientWidgetApi', () => {
12351236
});
12361237
});
12371238

1238-
expect(driver.readStateEvents).not.toBeCalled()
1239+
expect(driver.readStateEvents).not.toBeCalled();
12391240
});
1240-
})
1241+
});
12411242

12421243
describe('org.matrix.msc3869.read_relations action', () => {
12431244
it('should present as supported api version', () => {

test/WidgetApi-test.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ import {
3737
} from '../src';
3838

3939
type SendRequestArgs = {
40-
action: WidgetApiFromWidgetAction,
41-
data: IWidgetApiRequestData,
40+
action: WidgetApiFromWidgetAction;
41+
data: IWidgetApiRequestData;
4242
};
4343

4444
class TransportChannels {
@@ -54,7 +54,7 @@ class WidgetTransportHelper {
5454
/** For ignoring the request sent by {@link WidgetApi.start} */
5555
private skippedFirstRequest = false;
5656

57-
constructor(private channels: TransportChannels) {}
57+
public constructor(private channels: TransportChannels) {}
5858

5959
public nextTrackedRequest(): SendRequestArgs | undefined {
6060
if (!this.skippedFirstRequest) {
@@ -70,7 +70,7 @@ class WidgetTransportHelper {
7070
}
7171

7272
class ClientTransportHelper {
73-
constructor(private channels: TransportChannels) {}
73+
public constructor(private channels: TransportChannels) {}
7474

7575
public trackRequest(action: WidgetApiFromWidgetAction, data: IWidgetApiRequestData): void {
7676
this.channels.requestQueue.push({action, data});
@@ -91,7 +91,7 @@ describe('WidgetApi', () => {
9191
widgetTransportHelper = new WidgetTransportHelper(channels);
9292
const clientTrafficHelper = new ClientTransportHelper(channels);
9393

94-
clientListener = (e: MessageEvent) => {
94+
clientListener = (e: MessageEvent): void => {
9595
if (!e.data.action || !e.data.requestId || !e.data.widgetId) return; // invalid request/response
9696
if ("response" in e.data || e.data.api !== WidgetApiDirection.FromWidget) return; // not a request
9797
const request = <IWidgetApiRequest>e.data;
@@ -111,7 +111,7 @@ describe('WidgetApi', () => {
111111
"*",
112112
);
113113
}
114-
}
114+
};
115115
window.addEventListener("message", clientListener);
116116

117117
widgetApi = new WidgetApi("WidgetApi-test", "*");
@@ -171,7 +171,7 @@ describe('WidgetApi', () => {
171171
expect(request).not.toEqual({
172172
action: WidgetApiFromWidgetAction.MSC3869ReadRelations,
173173
data: expect.anything(),
174-
} satisfies SendRequestArgs)
174+
} satisfies SendRequestArgs);
175175
});
176176

177177
it('should handle an error', async () => {
@@ -486,13 +486,13 @@ describe('WidgetApi', () => {
486486
],
487487
} as ISupportedVersionsActionResponseData,
488488
);
489-
})
489+
});
490490

491491
it('should request supported client versions', async () => {
492492
await expect(widgetApi.getClientVersions()).resolves.toEqual([
493493
'org.matrix.msc3869', 'org.matrix.msc2762',
494494
]);
495-
})
495+
});
496496

497497
it('should cache supported client versions on successive calls', async () => {
498498
await expect(widgetApi.getClientVersions()).resolves.toEqual([
@@ -505,7 +505,7 @@ describe('WidgetApi', () => {
505505

506506
expect(widgetTransportHelper.nextTrackedRequest()).not.toBeUndefined();
507507
expect(widgetTransportHelper.nextTrackedRequest()).toBeUndefined();
508-
})
508+
});
509509
});
510510

511511
describe('searchUserDirectory', () => {

tsconfig-dev.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"extends": "./tsconfig.json",
3+
"include": [
4+
"./test/**/*.ts"
5+
]
6+
}

0 commit comments

Comments
 (0)