Add MatrixClientPeg::safeGet and use it in tests (#10985)

This commit is contained in:
Michael Telatynski 2023-06-05 18:12:23 +01:00 committed by GitHub
parent c47b587225
commit 6b46d6e4f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
88 changed files with 290 additions and 226 deletions

View file

@ -93,7 +93,7 @@ DMRoomMap.sharedInstance = { getUserIdForRoomId, getDMRoomsForUserId };
describe("SpaceStore", () => {
stubClient();
const store = SpaceStore.instance;
const client = MatrixClientPeg.get();
const client = MatrixClientPeg.safeGet();
const spyDispatcher = jest.spyOn(defaultDispatcher, "dispatch");

View file

@ -36,7 +36,7 @@ describe("RightPanelStore", () => {
let cli: MockedObject<MatrixClient>;
beforeEach(() => {
stubClient();
cli = mocked(MatrixClientPeg.get());
cli = mocked(MatrixClientPeg.safeGet());
DMRoomMap.makeShared(cli);
// Make sure we start with a clean store

View file

@ -49,7 +49,7 @@ const space2 = "!space2:server";
describe("SpaceWatcher", () => {
stubClient();
const store = SpaceStore.instance;
const client = mocked(MatrixClientPeg.get());
const client = mocked(MatrixClientPeg.safeGet());
let rooms: Room[] = [];
const mkSpaceForRooms = (spaceId: string, children: string[] = []) => mkSpace(client, spaceId, rooms, children);

View file

@ -40,7 +40,7 @@ describe("Algorithm", () => {
beforeEach(() => {
stubClient();
client = mocked(MatrixClientPeg.get());
client = mocked(MatrixClientPeg.safeGet());
DMRoomMap.makeShared(client);
algorithm = new Algorithm();

View file

@ -31,7 +31,7 @@ describe("RecentAlgorithm", () => {
beforeEach(() => {
stubClient();
cli = MatrixClientPeg.get();
cli = MatrixClientPeg.safeGet();
algorithm = new RecentAlgorithm();
});

View file

@ -60,7 +60,7 @@ describe("ReactionEventPreview", () => {
});
it("should use 'You' for your own reactions", () => {
const cli = MatrixClientPeg.get();
const cli = MatrixClientPeg.safeGet();
const room = new Room(roomId, cli, userId);
mocked(cli.getRoom).mockReturnValue(room);
@ -97,7 +97,7 @@ describe("ReactionEventPreview", () => {
});
it("should use display name for your others' reactions", () => {
const cli = MatrixClientPeg.get();
const cli = MatrixClientPeg.safeGet();
const room = new Room(roomId, cli, userId);
mocked(cli.getRoom).mockReturnValue(room);

View file

@ -36,7 +36,7 @@ describe("StopGapWidget", () => {
beforeEach(() => {
stubClient();
client = mocked(MatrixClientPeg.get());
client = mocked(MatrixClientPeg.safeGet());
widget = new StopGapWidget({
app: {

View file

@ -61,7 +61,7 @@ describe("StopGapWidgetDriver", () => {
beforeEach(() => {
stubClient();
client = mocked(MatrixClientPeg.get());
client = mocked(MatrixClientPeg.safeGet());
client.getUserId.mockReturnValue("@alice:example.org");
});