This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 832
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into alunturner/format-message-output-correctly
- Loading branch information
Showing
10 changed files
with
267 additions
and
386 deletions.
There are no files selected for viewing
369 changes: 14 additions & 355 deletions
369
src/async-components/views/dialogs/security/CreateKeyBackupDialog.tsx
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
test/components/views/dialogs/security/CreateKeyBackupDialog-test.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| * Copyright 2023 The Matrix.org Foundation C.I.C. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| import { render, screen, waitFor } from "@testing-library/react"; | ||
| import React from "react"; | ||
| import { mocked } from "jest-mock"; | ||
|
|
||
| import CreateKeyBackupDialog from "../../../../../src/async-components/views/dialogs/security/CreateKeyBackupDialog"; | ||
| import { createTestClient } from "../../../../test-utils"; | ||
| import { MatrixClientPeg } from "../../../../../src/MatrixClientPeg"; | ||
|
|
||
| jest.mock("../../../../../src/SecurityManager", () => ({ | ||
| accessSecretStorage: jest.fn().mockResolvedValue(undefined), | ||
| })); | ||
|
|
||
| describe("CreateKeyBackupDialog", () => { | ||
| beforeEach(() => { | ||
| MatrixClientPeg.get = () => createTestClient(); | ||
| }); | ||
|
|
||
| it("should display the spinner when creating backup", () => { | ||
| const { asFragment } = render(<CreateKeyBackupDialog onFinished={jest.fn()} />); | ||
|
|
||
| // Check if the spinner is displayed | ||
| expect(screen.getByTestId("spinner")).toBeDefined(); | ||
| expect(asFragment()).toMatchSnapshot(); | ||
| }); | ||
|
|
||
| it("should display the error message when backup creation failed", async () => { | ||
| const matrixClient = createTestClient(); | ||
| mocked(matrixClient.scheduleAllGroupSessionsForBackup).mockRejectedValue("my error"); | ||
| MatrixClientPeg.get = () => matrixClient; | ||
|
|
||
| const { asFragment } = render(<CreateKeyBackupDialog onFinished={jest.fn()} />); | ||
|
|
||
| // Check if the error message is displayed | ||
| await waitFor(() => expect(screen.getByText("Unable to create key backup")).toBeDefined()); | ||
| expect(asFragment()).toMatchSnapshot(); | ||
| }); | ||
|
|
||
| it("should display the success dialog when the key backup is finished", async () => { | ||
| const onFinished = jest.fn(); | ||
| const { asFragment } = render(<CreateKeyBackupDialog onFinished={onFinished} />); | ||
|
|
||
| await waitFor(() => | ||
| expect( | ||
| screen.getByText("Your keys are being backed up (the first backup could take a few minutes)."), | ||
| ).toBeDefined(), | ||
| ); | ||
| expect(asFragment()).toMatchSnapshot(); | ||
|
|
||
| // Click on the OK button | ||
| screen.getByRole("button", { name: "OK" }).click(); | ||
| expect(onFinished).toHaveBeenCalledWith(true); | ||
| }); | ||
| }); |
168 changes: 168 additions & 0 deletions
168
test/components/views/dialogs/security/__snapshots__/CreateKeyBackupDialog-test.tsx.snap
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,168 @@ | ||
| // Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
|
||
| exports[`CreateKeyBackupDialog should display the error message when backup creation failed 1`] = ` | ||
| <DocumentFragment> | ||
| <div | ||
| data-focus-guard="true" | ||
| style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;" | ||
| tabindex="0" | ||
| /> | ||
| <div | ||
| aria-labelledby="mx_BaseDialog_title" | ||
| class="mx_CreateKeyBackupDialog mx_Dialog_fixedWidth" | ||
| data-focus-lock-disabled="false" | ||
| role="dialog" | ||
| > | ||
| <div | ||
| class="mx_Dialog_header" | ||
| > | ||
| <h2 | ||
| class="mx_Heading_h2 mx_Dialog_title" | ||
| id="mx_BaseDialog_title" | ||
| > | ||
| Starting backup… | ||
| </h2> | ||
| </div> | ||
| <div> | ||
| <div> | ||
| <p> | ||
| Unable to create key backup | ||
| </p> | ||
| <div | ||
| class="mx_Dialog_buttons" | ||
| > | ||
| <span | ||
| class="mx_Dialog_buttons_row" | ||
| > | ||
| <button | ||
| data-testid="dialog-cancel-button" | ||
| type="button" | ||
| > | ||
| Cancel | ||
| </button> | ||
| <button | ||
| class="mx_Dialog_primary" | ||
| data-testid="dialog-primary-button" | ||
| type="button" | ||
| > | ||
| Retry | ||
| </button> | ||
| </span> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div | ||
| data-focus-guard="true" | ||
| style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;" | ||
| tabindex="0" | ||
| /> | ||
| </DocumentFragment> | ||
| `; | ||
|
|
||
| exports[`CreateKeyBackupDialog should display the spinner when creating backup 1`] = ` | ||
| <DocumentFragment> | ||
| <div | ||
| data-focus-guard="true" | ||
| style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;" | ||
| tabindex="0" | ||
| /> | ||
| <div | ||
| aria-labelledby="mx_BaseDialog_title" | ||
| class="mx_CreateKeyBackupDialog mx_Dialog_fixedWidth" | ||
| data-focus-lock-disabled="false" | ||
| role="dialog" | ||
| > | ||
| <div | ||
| class="mx_Dialog_header" | ||
| > | ||
| <h2 | ||
| class="mx_Heading_h2 mx_Dialog_title" | ||
| id="mx_BaseDialog_title" | ||
| > | ||
| Starting backup… | ||
| </h2> | ||
| </div> | ||
| <div> | ||
| <div> | ||
| <div | ||
| class="mx_Spinner" | ||
| > | ||
| <div | ||
| aria-label="Loading…" | ||
| class="mx_Spinner_icon" | ||
| data-testid="spinner" | ||
| role="progressbar" | ||
| style="width: 32px; height: 32px;" | ||
| /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div | ||
| data-focus-guard="true" | ||
| style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;" | ||
| tabindex="0" | ||
| /> | ||
| </DocumentFragment> | ||
| `; | ||
|
|
||
| exports[`CreateKeyBackupDialog should display the success dialog when the key backup is finished 1`] = ` | ||
| <DocumentFragment> | ||
| <div | ||
| data-focus-guard="true" | ||
| style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;" | ||
| tabindex="0" | ||
| /> | ||
| <div | ||
| aria-labelledby="mx_BaseDialog_title" | ||
| class="mx_CreateKeyBackupDialog mx_Dialog_fixedWidth" | ||
| data-focus-lock-disabled="false" | ||
| role="dialog" | ||
| > | ||
| <div | ||
| class="mx_Dialog_header mx_Dialog_headerWithCancel" | ||
| > | ||
| <h2 | ||
| class="mx_Heading_h2 mx_Dialog_title" | ||
| id="mx_BaseDialog_title" | ||
| > | ||
| Success! | ||
| </h2> | ||
| <div | ||
| aria-label="Close dialog" | ||
| class="mx_AccessibleButton mx_Dialog_cancelButton" | ||
| role="button" | ||
| tabindex="0" | ||
| /> | ||
| </div> | ||
| <div> | ||
| <div> | ||
| <p> | ||
| Your keys are being backed up (the first backup could take a few minutes). | ||
| </p> | ||
| <div | ||
| class="mx_Dialog_buttons" | ||
| > | ||
| <span | ||
| class="mx_Dialog_buttons_row" | ||
| > | ||
| <button | ||
| class="mx_Dialog_primary" | ||
| data-testid="dialog-primary-button" | ||
| type="button" | ||
| > | ||
| OK | ||
| </button> | ||
| </span> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div | ||
| data-focus-guard="true" | ||
| style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;" | ||
| tabindex="0" | ||
| /> | ||
| </DocumentFragment> | ||
| `; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters