imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix more type issues in unit tests (#8053)

Browse source 
* fix ts issues in test/components/structures

Signed-off-by: Kerry Archibald <kerrya@element.io>

* fix ts issues in test/components/views/context_menus

Signed-off-by: Kerry Archibald <kerrya@element.io>
This commit is contained in:
Kerry 2022-03-15 10:30:48 +01:00 • committed by GitHub
parent 813a60a7f3
commit bc8fdac491
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

14
test/components/structures/CallEventGrouper-test.ts
View file

@ -15,7 +15,7 @@ limitations under the License.
*/
import "../../skinned-sdk";
import { MatrixClient } from 'matrix-js-sdk/src/matrix';
import { MatrixClient, MatrixEvent } from 'matrix-js-sdk/src/matrix';
import { EventType } from "matrix-js-sdk/src/@types/event";
import { CallState } from "matrix-js-sdk/src/webrtc/call";
@ -52,7 +52,7 @@ describe('CallEventGrouper', () => {
sender: {
userId: THEIR_USER_ID,
},
});
} as unknown as MatrixEvent);
expect(grouper.state).toBe(CustomCallState.Missed);
});
@ -73,7 +73,7 @@ describe('CallEventGrouper', () => {
sender: {
userId: MY_USER_ID,
},
});
} as unknown as MatrixEvent);
grouperHangup.add({
getContent: () => {
return {
@ -86,7 +86,7 @@ describe('CallEventGrouper', () => {
sender: {
userId: THEIR_USER_ID,
},
});
} as unknown as MatrixEvent);
grouperReject.add({
getContent: () => {
@ -100,7 +100,7 @@ describe('CallEventGrouper', () => {
sender: {
userId: MY_USER_ID,
},
});
} as unknown as MatrixEvent);
grouperReject.add({
getContent: () => {
return {
@ -113,7 +113,7 @@ describe('CallEventGrouper', () => {
sender: {
userId: THEIR_USER_ID,
},
});
} as unknown as MatrixEvent);
expect(grouperHangup.state).toBe(CallState.Ended);
expect(grouperReject.state).toBe(CallState.Ended);
@ -134,7 +134,7 @@ describe('CallEventGrouper', () => {
getType: () => {
return EventType.CallInvite;
},
});
} as unknown as MatrixEvent);
expect(grouper.isVoice).toBe(false);
});

15
test/components/structures/auth/Login-test.tsx
View file

@ -17,7 +17,8 @@ limitations under the License.
import React, { Component } from 'react';
import ReactDOM from 'react-dom';
import ReactTestUtils from 'react-dom/test-utils';
import { createClient } from "matrix-js-sdk/src/matrix";
import { mocked } from 'jest-mock';
import { createClient, MatrixClient } from "matrix-js-sdk/src/matrix";
import sdk from '../../../skinned-sdk';
import SdkConfig from '../../../../src/SdkConfig';
@ -35,10 +36,10 @@ const Login = sdk.getComponent(
describe('Login', function() {
let parentDiv;
const mockClient = {
const mockClient = mocked({
login: jest.fn().mockResolvedValue({}),
loginFlows: jest.fn(),
};
} as unknown as MatrixClient);
beforeEach(function() {
jest.spyOn(SdkConfig, "get").mockReturnValue({
@ -47,7 +48,7 @@ describe('Login', function() {
});
mockClient.login.mockClear().mockResolvedValue({});
mockClient.loginFlows.mockClear().mockResolvedValue({ flows: [{ type: "m.login.password" }] });
createClient.mockReturnValue(mockClient);
mocked(createClient).mockReturnValue(mockClient);
parentDiv = document.createElement('div');
document.body.appendChild(parentDiv);
@ -101,7 +102,7 @@ describe('Login', function() {
});
it("should show SSO button if that flow is available", async () => {
mockClient.loginFlows.mockReturnValue({ flows: [{ type: "m.login.sso" }] });
mockClient.loginFlows.mockResolvedValue({ flows: [{ type: "m.login.sso" }] });
const root = render();
await flushPromises();
@ -111,7 +112,7 @@ describe('Login', function() {
});
it("should show both SSO button and username+password if both are available", async () => {
mockClient.loginFlows.mockReturnValue({ flows: [{ type: "m.login.password" }, { type: "m.login.sso" }] });
mockClient.loginFlows.mockResolvedValue({ flows: [{ type: "m.login.password" }, { type: "m.login.sso" }] });
const root = render();
await flushPromises();
@ -124,7 +125,7 @@ describe('Login', function() {
});
it("should show multiple SSO buttons if multiple identity_providers are available", async () => {
mockClient.loginFlows.mockReturnValue({
mockClient.loginFlows.mockResolvedValue({
flows: [{
"type": "m.login.sso",
"identity_providers": [{