Merge branch 'main' of github.com:/element-hq/element-web-modules into t3chguy/wat/382

# Conflicts:
#	modules/restricted-guests/element-web/e2e/snapshots/restricted-guests.spec.ts/login-legacy-linux.png
#	modules/restricted-guests/element-web/e2e/snapshots/restricted-guests.spec.ts/login-mas-linux.png
#	playwright.config.ts
This commit is contained in:
Michael Telatynski 2026-03-20 16:41:53 +00:00
commit d42c816558
2 changed files with 2 additions and 2 deletions

View File

@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details.
import { test, expect as baseExpect, type ExpectMatcherState, type MatcherReturnType } from "@playwright/test";
import type AxeBuilder from "@axe-core/playwright";
import type { AxeBuilder } from "@axe-core/playwright";
export type Expectations = {
/**

View File

@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details.
*/
import { test as base } from "@playwright/test";
import AxeBuilder from "@axe-core/playwright";
import { AxeBuilder } from "@axe-core/playwright";
// This fixture is useful for simple component library tests that won't want any extra services like a homeserver, so we
// explicitly avoid pulling anything more than playwright's base fixtures in.