Disable playwright tests for legacy crypto (#12662)

* Disable "legacy crypto" playwright project

* playwight: Remove crypto stack conditions

We only ever run under the rust stack now, so these conditions are
redundant.

* playwright: remove `cryptoBackend` test option

* playwright: remove redundant `projects`

We don't need this any more

* playwright: remove redundant `TestOptions`
This commit is contained in:
Richard van der Hoff 2024-06-24 11:30:59 +01:00 committed by GitHub
parent 9c862907f9
commit efd309f5f9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 62 additions and 116 deletions

View file

@ -16,11 +16,9 @@ limitations under the License.
import { defineConfig } from "@playwright/test";
import { TestOptions } from "./playwright/element-web-test";
const baseURL = process.env["BASE_URL"] ?? "http://localhost:8080";
export default defineConfig<TestOptions>({
export default defineConfig({
use: {
viewport: { width: 1280, height: 720 },
ignoreHTTPSErrors: true,
@ -42,16 +40,6 @@ export default defineConfig<TestOptions>({
workers: 1,
retries: process.env.CI ? 2 : 0,
reporter: process.env.CI ? [["blob"], ["github"]] : [["html", { outputFolder: "playwright/html-report" }]],
projects: [
{
name: "Legacy Crypto",
use: { cryptoBackend: "legacy" },
},
{
name: "Rust Crypto",
use: { cryptoBackend: "rust" },
},
],
snapshotDir: "playwright/snapshots",
snapshotPathTemplate: "{snapshotDir}/{testFilePath}/{arg}-{platform}{ext}",
});

View file

@ -322,13 +322,7 @@ test.describe("Cryptography", function () {
});
});
test("should show the correct shield on e2e events", async ({
page,
app,
bot: bob,
homeserver,
cryptoBackend,
}) => {
test("should show the correct shield on e2e events", async ({ page, app, bot: bob, homeserver }) => {
// Bob has a second, not cross-signed, device
const bobSecondDevice = new Bot(page, homeserver, {
bootstrapSecretStorage: false,
@ -432,16 +426,8 @@ test.describe("Cryptography", function () {
await app.viewRoomByName("Bob");
await app.viewRoomByName("TestRoom");
// some debate over whether this should have a red or a grey shield. Legacy crypto shows a grey shield,
// Rust crypto a red one.
await expect(last).toContainText("test encrypted from unverified");
if (cryptoBackend === "rust") {
await expect(lastE2eIcon).toHaveClass(/mx_EventTile_e2eIcon_warning/);
} else {
// skip this for now: the legacy option no longer actually gives us a legacy stack.
// We'll sort this out properly in https://github.com/matrix-org/matrix-react-sdk/pull/12662
// await expect(lastE2eIcon).toHaveClass(/mx_EventTile_e2eIcon_normal/);
}
await lastE2eIcon.focus();
await expect(page.getByRole("tooltip")).toContainText("Encrypted by an unknown or deleted device.");
});
@ -561,9 +547,7 @@ test.describe("Cryptography", function () {
app,
credentials,
user,
cryptoBackend,
}) => {
test.skip(cryptoBackend === "legacy", "Not implemented for legacy crypto");
test.setTimeout(60000);
// Start with a logged-in session, without key backup, and send a message.
@ -627,11 +611,8 @@ test.describe("Cryptography", function () {
app,
credentials: aliceCredentials,
user: alice,
cryptoBackend,
bot: bob,
}) => {
test.skip(cryptoBackend === "legacy", "Not implemented for legacy crypto");
// Bob creates an encrypted room and sends a message to it. He then invites Alice
const roomId = await bob.evaluate(
async (client, { alice }) => {
@ -735,15 +716,8 @@ test.describe("Cryptography", function () {
app,
credentials: aliceCredentials,
user: alice,
cryptoBackend,
bot: bob,
}) => {
// The old pre-join UTD hiding code would hide events sent
// before our latest join event, even if the event that we're
// jumping to was decryptable. We test that this no longer happens.
test.skip(cryptoBackend === "legacy", "Not implemented for legacy crypto");
// Bob:
// - creates an encrypted room,
// - invites Alice,

View file

@ -305,10 +305,7 @@ test.describe("User verification", () => {
user: aliceCredentials,
toasts,
room: { roomId: dmRoomId },
cryptoBackend,
}) => {
test.skip(cryptoBackend === "legacy", "Not implemented for legacy crypto");
// once Alice has joined, Bob starts the verification
const bobVerificationRequest = await bob.evaluateHandle(
async (client, { dmRoomId, aliceCredentials }) => {

View file

@ -249,7 +249,6 @@ test.describe("Read receipts", () => {
});
test("Paging up to find old threads that were never read keeps the room unread", async ({
cryptoBackend,
roomAlpha: room1,
roomBeta: room2,
util,
@ -338,7 +337,6 @@ test.describe("Read receipts", () => {
});
test("After marking room as read, paging up to find old threads that were never read leaves the room read", async ({
cryptoBackend,
roomAlpha: room1,
roomBeta: room2,
util,

View file

@ -568,9 +568,9 @@ test.describe("Timeline", () => {
);
});
test("should set inline start padding to a hidden event line", async ({ page, app, room, cryptoBackend }) => {
test("should set inline start padding to a hidden event line", async ({ page, app, room }) => {
test.skip(
cryptoBackend === "rust",
true,
"Disabled due to screenshot test being flaky - https://github.com/element-hq/element-web/issues/26890",
);
await sendEvent(app.client, room.roomId);

View file

@ -63,16 +63,11 @@ const CONFIG_JSON: Partial<IConfigOptions> = {
},
};
export type TestOptions = {
cryptoBackend: "legacy" | "rust";
};
interface CredentialsWithDisplayName extends Credentials {
displayName: string;
}
export const test = base.extend<
TestOptions & {
export const test = base.extend<{
axe: AxeBuilder;
checkA11y: () => Promise<void>;
@ -136,11 +131,9 @@ export const test = base.extend<
slidingSyncProxy: ProxyInstance;
labsFlags: string[];
webserver: Webserver;
}
>({
cryptoBackend: ["legacy", { option: true }],
}>({
config: CONFIG_JSON,
page: async ({ context, page, config, cryptoBackend, labsFlags }, use) => {
page: async ({ context, page, config, labsFlags }, use) => {
await context.route(`http://localhost:8080/config.json*`, async (route) => {
const json = { ...CONFIG_JSON, ...config };
json["features"] = {
@ -151,10 +144,6 @@ export const test = base.extend<
return obj;
}, {}),
};
// the default is to use rust now, so set to `false` if on legacy backend
if (cryptoBackend === "legacy") {
json.features.feature_rust_crypto = false;
}
await route.fulfill({ json });
});
await use(page);