Skip to content

Commit ffedaaa

Browse files
committed
Merge branch 'develop' of https://github.com/vector-im/element-web into renovate/playwright
# Conflicts: # playwright/e2e/forgot-password/forgot-password.spec.ts
2 parents 615aa04 + 4a381c2 commit ffedaaa

1,404 files changed

Lines changed: 4125 additions & 3713 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

module_system/installer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import * as fs from "fs";
99
import * as childProcess from "child_process";
1010
import * as semver from "semver";
1111

12-
import { BuildConfig } from "./BuildConfig";
12+
import { type BuildConfig } from "./BuildConfig";
1313

1414
// This expects to be run from ./scripts/install.ts
1515

playwright/e2e/audio-player/audio-player.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import type { Locator, Page } from "@playwright/test";
1111
import { test, expect } from "../../element-web-test";
1212
import { SettingLevel } from "../../../src/settings/SettingLevel";
1313
import { Layout } from "../../../src/settings/enums/Layout";
14-
import { ElementAppPage } from "../../pages/ElementAppPage";
14+
import { type ElementAppPage } from "../../pages/ElementAppPage";
1515

1616
// Find and click "Reply" button
1717
const clickButtonReply = async (tile: Locator) => {

playwright/e2e/crypto/crypto.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import {
1616
enableKeyBackup,
1717
verify,
1818
} from "./utils";
19-
import { Bot } from "../../pages/bot";
20-
import { ElementAppPage } from "../../pages/ElementAppPage";
19+
import { type Bot } from "../../pages/bot";
20+
import { type ElementAppPage } from "../../pages/ElementAppPage";
2121
import { isDendrite } from "../../plugins/homeserver/dendrite";
2222

2323
const checkDMRoom = async (page: Page) => {

playwright/e2e/crypto/dehydration.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
66
Please see LICENSE files in the repository root for full details.
77
*/
88

9-
import { Locator, type Page } from "@playwright/test";
9+
import { type Locator, type Page } from "@playwright/test";
1010

1111
import { test, expect } from "../../element-web-test";
1212
import { viewRoomSummaryByName } from "../right-panel/utils";
1313
import { isDendrite } from "../../plugins/homeserver/dendrite";
1414
import { completeCreateSecretStorageDialog, createBot, logIntoElement } from "./utils.ts";
15-
import { Client } from "../../pages/client.ts";
15+
import { type Client } from "../../pages/client.ts";
1616

1717
const ROOM_NAME = "Test room";
1818
const NAME = "Alice";

playwright/e2e/crypto/device-verification.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
logIntoElement,
2121
waitForVerificationRequest,
2222
} from "./utils";
23-
import { Bot } from "../../pages/bot";
23+
import { type Bot } from "../../pages/bot";
2424

2525
test.describe("Device verification", { tag: "@no-webkit" }, () => {
2626
let aliceBotClient: Bot;

playwright/e2e/crypto/event-shields.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
66
Please see LICENSE files in the repository root for full details.
77
*/
88

9-
import { Locator } from "@playwright/test";
9+
import { type Locator } from "@playwright/test";
1010

1111
import { expect, test } from "../../element-web-test";
1212
import {
@@ -19,7 +19,7 @@ import {
1919
verify,
2020
} from "./utils";
2121
import { bootstrapCrossSigningForClient } from "../../pages/client.ts";
22-
import { ElementAppPage } from "../../pages/ElementAppPage.ts";
22+
import { type ElementAppPage } from "../../pages/ElementAppPage.ts";
2323

2424
test.describe("Cryptography", function () {
2525
test.use({

playwright/e2e/crypto/toasts.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Please see LICENSE files in the repository root for full details.
66
*/
77

8-
import { GeneratedSecretStorageKey } from "matrix-js-sdk/src/crypto-api";
8+
import { type GeneratedSecretStorageKey } from "matrix-js-sdk/src/crypto-api";
99

1010
import { test, expect } from "../../element-web-test";
1111
import { createBot, deleteCachedSecrets, logIntoElement } from "./utils";

playwright/e2e/crypto/user-verification.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { type Preset, type Visibility } from "matrix-js-sdk/src/matrix";
1111
import type { Page } from "@playwright/test";
1212
import { test, expect } from "../../element-web-test";
1313
import { doTwoWaySasVerification, awaitVerifier } from "./utils";
14-
import { Client } from "../../pages/client";
14+
import { type Client } from "../../pages/client";
1515

1616
test.describe("User verification", () => {
1717
// note that there are other tests that check user verification works in `crypto.spec.ts`.

playwright/e2e/crypto/utils.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
66
Please see LICENSE files in the repository root for full details.
77
*/
88

9-
import { expect, JSHandle, type Page } from "@playwright/test";
9+
import { expect, type JSHandle, type Page } from "@playwright/test";
1010

1111
import type { ICreateRoomOpts, MatrixClient } from "matrix-js-sdk/src/matrix";
1212
import type {
@@ -18,9 +18,9 @@ import type {
1818
Verifier,
1919
VerifierEvent,
2020
} from "matrix-js-sdk/src/crypto-api";
21-
import { Credentials, HomeserverInstance } from "../../plugins/homeserver";
22-
import { Client } from "../../pages/client";
23-
import { ElementAppPage } from "../../pages/ElementAppPage";
21+
import { type Credentials, type HomeserverInstance } from "../../plugins/homeserver";
22+
import { type Client } from "../../pages/client";
23+
import { type ElementAppPage } from "../../pages/ElementAppPage";
2424
import { Bot } from "../../pages/bot";
2525

2626
/**

playwright/e2e/csAPI.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
55
Please see LICENSE files in the repository root for full details.
66
*/
77

8-
import { APIRequestContext } from "playwright-core";
9-
import { KeyBackupInfo } from "matrix-js-sdk/src/crypto-api";
8+
import { type APIRequestContext } from "playwright-core";
9+
import { type KeyBackupInfo } from "matrix-js-sdk/src/crypto-api";
1010

11-
import { HomeserverInstance } from "../plugins/homeserver";
11+
import { type HomeserverInstance } from "../plugins/homeserver";
1212
import { ClientServerApi } from "../plugins/utils/api.ts";
1313

1414
/**

0 commit comments

Comments
 (0)