You've already forked element-web
mirror of
https://github.com/element-hq/element-web.git
synced 2025-08-02 07:06:40 +03:00
f25fbdebc7
* Fix up type for `finished` result of Modal The `finished` promise can be called with an empty array, for example if the dialog is closed by a background click. This was not correctly represented in the typing. Fix that, and add some documentation while we're at it. * Type fixes to onFinished callbacks from Modal These can all be called with zero arguments, despite what the type annotations may say, so mark them accordingly. * Remove uses of Modal `onFinished` property ... because it is confusing. Instead, use the `finished` promise returned by `createDialog`. * Modal: remove support for now-unused `onFinished` prop * StopGapWidgetDriver: use `await` instead of promise chaining * Fix up unit tests
51 lines
1.6 KiB
TypeScript
51 lines
1.6 KiB
TypeScript
/*
|
|
Copyright 2024 New Vector Ltd.
|
|
Copyright 2024 The Matrix.org Foundation C.I.C.
|
|
|
|
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
|
|
Please see LICENSE files in the repository root for full details.
|
|
*/
|
|
|
|
import Modal from "../../src/Modal";
|
|
import QuestionDialog from "../../src/components/views/dialogs/QuestionDialog";
|
|
import defaultDispatcher from "../../src/dispatcher/dispatcher";
|
|
import { flushPromises } from "../test-utils";
|
|
|
|
describe("Modal", () => {
|
|
test("forceCloseAllModals should close all open modals", () => {
|
|
Modal.createDialog(QuestionDialog, {
|
|
title: "Test dialog",
|
|
description: "This is a test dialog",
|
|
button: "Word",
|
|
});
|
|
|
|
expect(Modal.hasDialogs()).toBe(true);
|
|
Modal.forceCloseAllModals();
|
|
expect(Modal.hasDialogs()).toBe(false);
|
|
});
|
|
|
|
test("open modals should be closed on logout", async () => {
|
|
const modal1OnFinished = jest.fn();
|
|
const modal2OnFinished = jest.fn();
|
|
|
|
Modal.createDialog(QuestionDialog, {
|
|
title: "Test dialog 1",
|
|
description: "This is a test dialog",
|
|
button: "Word",
|
|
}).finished.then(modal1OnFinished);
|
|
|
|
Modal.createDialog(QuestionDialog, {
|
|
title: "Test dialog 2",
|
|
description: "This is a test dialog",
|
|
button: "Word",
|
|
}).finished.then(modal2OnFinished);
|
|
|
|
defaultDispatcher.dispatch({ action: "logout" }, true);
|
|
|
|
await flushPromises();
|
|
|
|
expect(modal1OnFinished).toHaveBeenCalled();
|
|
expect(modal2OnFinished).toHaveBeenCalled();
|
|
});
|
|
});
|