@element-hq/element-web-playwright-common 2.4.0 → 3.1.0

package/lib/testcontainers/index.js

@@ -5,6 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE files in the repository root for full details.
 */
 export { PostgreSqlContainer, StartedPostgreSqlContainer } from "@testcontainers/postgresql";
+export { makePostgres } from "./postgres.js";
 export { SynapseContainer, StartedSynapseContainer } from "./synapse.js";
-export { MatrixAuthenticationServiceContainer, StartedMatrixAuthenticationServiceContainer, } from "./mas.js";
+export { MatrixAuthenticationServiceContainer, StartedMatrixAuthenticationServiceContainer, makeMas, } from "./mas.js";
 export { MailpitContainer, StartedMailpitContainer } from "./mailpit.js";

package/lib/testcontainers/mas.d.ts

@@ -1,7 +1,8 @@
-import { AbstractStartedContainer, GenericContainer, type StartedTestContainer, type ExecResult } from "testcontainers";
+import { AbstractStartedContainer, GenericContainer, type StartedTestContainer, type ExecResult, type StartedNetwork } from "testcontainers";
 import { type StartedPostgreSqlContainer } from "@testcontainers/postgresql";
 import { type Credentials } from "../utils/api.js";
 import type { RootConfig as MasConfig } from "./mas-config.js";
+import type { Logger } from "../utils/logger.js";
 export { type MasConfig };
 /**
  * A container running the Matrix Authentication Service.
@@ -29,8 +30,9 @@ export declare class MatrixAuthenticationServiceContainer extends GenericContain
 export declare class StartedMatrixAuthenticationServiceContainer extends AbstractStartedContainer {
     readonly baseUrl: string;
     private readonly args;
+    readonly sharedSecret: string;
     private adminTokenPromise?;
-    constructor(container: StartedTestContainer, baseUrl: string, args: string[]);
+    constructor(container: StartedTestContainer, baseUrl: string, args: string[], sharedSecret: string);
     /**
      * Retrieves a valid HS admin token
      */
@@ -55,4 +57,5 @@ export declare class StartedMatrixAuthenticationServiceContainer extends Abstrac
      */
     setThreepid(username: string, medium: string, address: string): Promise<void>;
 }
+export declare function makeMas(postgres: StartedPostgreSqlContainer, network: StartedNetwork, logger: Logger, config: Partial<MasConfig>, name?: string): Promise<StartedMatrixAuthenticationServiceContainer>;
 //# sourceMappingURL=mas.d.ts.map

package/lib/testcontainers/mas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mas.d.ts","sourceRoot":"","sources":["../../src/testcontainers/mas.ts"],"names":[],"mappings":"AAOA,OAAO,EACH,wBAAwB,EACxB,gBAAgB,EAChB,KAAK,oBAAoB,EAEzB,KAAK,UAAU,EAClB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAK7E,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAKnD,OAAO,KAAK,EAAE,UAAU,IAAI,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE/D,OAAO,EAAE,KAAK,SAAS,EAAE,CAAC;AAmH1B;;;;;GAKG;AACH,qBAAa,oCAAqC,SAAQ,gBAAgB;IACtE,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiC;gBAGlD,EAAE,EAAE,0BAA0B,EAC9B,KAAK,GAAE,MAAkE;IAe7E;;;OAGG;IACI,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,IAAI;IAQnD;;OAEG;IACmB,KAAK,IAAI,OAAO,CAAC,2CAA2C,CAAC;CA0BtF;AAED;;GAEG;AACH,qBAAa,2CAA4C,SAAQ,wBAAwB;aAKjE,OAAO,EAAE,MAAM;IAC/B,OAAO,CAAC,QAAQ,CAAC,IAAI;IALzB,OAAO,CAAC,iBAAiB,CAAC,CAAkB;gBAGxC,SAAS,EAAE,oBAAoB,EACf,OAAO,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EAAE;IAKnC;;OAEG;IACU,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAYhC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC;YAQ1D,kBAAkB;YAgClB,6BAA6B;YAmB7B,oBAAoB;IAoBlC;;;;;;OAMG;IACU,YAAY,CACrB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC;IAIlD;;;;;OAKG;IACU,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAO7F"}
+{"version":3,"file":"mas.d.ts","sourceRoot":"","sources":["../../src/testcontainers/mas.ts"],"names":[],"mappings":"AAOA,OAAO,EACH,wBAAwB,EACxB,gBAAgB,EAChB,KAAK,oBAAoB,EAEzB,KAAK,UAAU,EACf,KAAK,cAAc,EACtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAK7E,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAKnD,OAAO,KAAK,EAAE,UAAU,IAAI,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EAAE,KAAK,SAAS,EAAE,CAAC;AAmH1B;;;;;GAKG;AACH,qBAAa,oCAAqC,SAAQ,gBAAgB;IACtE,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiC;gBAGlD,EAAE,EAAE,0BAA0B,EAC9B,KAAK,GAAE,MAAkE;IAgB7E;;;OAGG;IACI,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,IAAI;IAQnD;;OAEG;IACmB,KAAK,IAAI,OAAO,CAAC,2CAA2C,CAAC;CA2BtF;AAED;;GAEG;AACH,qBAAa,2CAA4C,SAAQ,wBAAwB;aAKjE,OAAO,EAAE,MAAM;IAC/B,OAAO,CAAC,QAAQ,CAAC,IAAI;aACL,YAAY,EAAE,MAAM;IANxC,OAAO,CAAC,iBAAiB,CAAC,CAAkB;gBAGxC,SAAS,EAAE,oBAAoB,EACf,OAAO,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EAAE,EACf,YAAY,EAAE,MAAM;IAKxC;;OAEG;IACU,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAYhC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC;YAQ1D,kBAAkB;YAgClB,6BAA6B;YAmB7B,oBAAoB;IAoBlC;;;;;;OAMG;IACU,YAAY,CACrB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC;IAIlD;;;;;OAKG;IACU,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAO7F;AAED,wBAAsB,OAAO,CACzB,QAAQ,EAAE,0BAA0B,EACpC,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,EAC1B,IAAI,SAAQ,GACb,OAAO,CAAC,2CAA2C,CAAC,CAQtD"}

package/lib/testcontainers/mas.js

@@ -132,6 +132,7 @@ export class MatrixAuthenticationServiceContainer extends GenericContainer {
     constructor(db, image = "ghcr.io/element-hq/matrix-authentication-service:latest") {
         super(image);
         const initialConfig = deepCopy(DEFAULT_CONFIG);
+        initialConfig.database.host = db.getHostname();
         initialConfig.database.username = db.getUsername();
         initialConfig.database.password = db.getPassword();
         this.config = initialConfig;
@@ -170,7 +171,7 @@ export class MatrixAuthenticationServiceContainer extends GenericContainer {
                 content: YAML.stringify(this.config),
             },
         ]);
-        return new StartedMatrixAuthenticationServiceContainer(await super.start(), `http://localhost:${port}`, this.args);
+        return new StartedMatrixAuthenticationServiceContainer(await super.start(), `http://localhost:${port}`, this.args, this.config.matrix.secret);
     }
 }
 /**
@@ -179,11 +180,13 @@ export class MatrixAuthenticationServiceContainer extends GenericContainer {
 export class StartedMatrixAuthenticationServiceContainer extends AbstractStartedContainer {
     baseUrl;
     args;
+    sharedSecret;
     adminTokenPromise;
-    constructor(container, baseUrl, args) {
+    constructor(container, baseUrl, args, sharedSecret) {
         super(container);
         this.baseUrl = baseUrl;
         this.args = args;
+        this.sharedSecret = sharedSecret;
     }
     /**
      * Retrieves a valid HS admin token
@@ -265,3 +268,12 @@ export class StartedMatrixAuthenticationServiceContainer extends AbstractStarted
         await this.manage("add-email", username, address);
     }
 }
+export async function makeMas(postgres, network, logger, config, name = "mas") {
+    const container = await new MatrixAuthenticationServiceContainer(postgres)
+        .withNetwork(network)
+        .withNetworkAliases(name)
+        .withLogConsumer(logger.getConsumer(name))
+        .withConfig(config)
+        .start();
+    return container;
+}

package/lib/testcontainers/postgres.d.ts

@@ -0,0 +1,5 @@
+import { type StartedPostgreSqlContainer } from "@testcontainers/postgresql";
+import { type StartedNetwork } from "testcontainers";
+import { type Logger } from "../utils/logger.js";
+export declare function makePostgres(network: StartedNetwork, logger: Logger, name?: string): Promise<StartedPostgreSqlContainer>;
+//# sourceMappingURL=postgres.d.ts.map

package/lib/testcontainers/postgres.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../src/testcontainers/postgres.ts"],"names":[],"mappings":"AAOA,OAAO,EAAuB,KAAK,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAClG,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,wBAAsB,YAAY,CAC9B,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,MAAM,EACd,IAAI,SAAa,GAClB,OAAO,CAAC,0BAA0B,CAAC,CAuBrC"}

package/lib/testcontainers/postgres.js

@@ -0,0 +1,31 @@
+/*
+Copyright 2026 Element Creations Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+import { PostgreSqlContainer } from "@testcontainers/postgresql";
+export async function makePostgres(network, logger, name = "postgres") {
+    const container = await new PostgreSqlContainer("postgres:13.3-alpine")
+        .withNetwork(network)
+        .withNetworkAliases(name)
+        .withLogConsumer(logger.getConsumer(name))
+        .withTmpFs({
+        "/dev/shm/pgdata/data": "",
+    })
+        .withEnvironment({
+        PG_DATA: "/dev/shm/pgdata/data",
+    })
+        .withCommand([
+        "-c",
+        "shared_buffers=128MB",
+        "-c",
+        `fsync=off`,
+        "-c",
+        `synchronous_commit=off`,
+        "-c",
+        "full_page_writes=off",
+    ])
+        .start();
+    return container;
+}

package/lib/testcontainers/synapse.d.ts

@@ -153,6 +153,12 @@ declare const DEFAULT_CONFIG: {
         module: string;
         config?: Record<string, unknown>;
     }>;
+    matrix_authentication_service: undefined | {
+        enabled?: boolean;
+        endpoint?: string;
+        secret?: string | null;
+        secret_path?: string | null;
+    };
 };
 /**
  * Incomplete type describing the configuration for a Synapse homeserver

package/lib/testcontainers/synapse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"synapse.d.ts","sourceRoot":"","sources":["../../src/testcontainers/synapse.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"synapse.d.ts","sourceRoot":"","sources":["../../src/testcontainers/synapse.ts"],"names":[],"mappings":"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"}

package/lib/testcontainers/synapse.js

@@ -136,6 +136,7 @@ const DEFAULT_CONFIG = {
     },
     room_list_publication_rules: [{ action: "allow" }],
     modules: [],
+    matrix_authentication_service: undefined,
 };
 /**
  * A Synapse testcontainer
@@ -217,7 +218,22 @@ export class SynapseContainer extends GenericContainer {
         return this;
     }
     withMatrixAuthenticationService(mas) {
-        this.mas = mas;
+        if (mas) {
+            this.mas = mas;
+            this.withConfig({
+                matrix_authentication_service: {
+                    enabled: true,
+                    endpoint: `http://${mas.getHostname()}:8080/`,
+                    secret: mas.sharedSecret,
+                },
+                // Must be disabled when using MAS.
+                password_config: {
+                    enabled: false,
+                },
+                // Must be disabled when using MAS.
+                enable_registration: false,
+            });
+        }
         return this;
     }
     async start() {

package/package.json

@@ -1,12 +1,12 @@
 {
     "name": "@element-hq/element-web-playwright-common",
     "type": "module",
-    "version": "2.4.0",
+    "version": "3.1.0",
     "license": "SEE LICENSE IN README.md",
     "repository": {
         "type": "git",
-        "url": "git+https://github.com/element-hq/element-modules.git",
-        "directory": "packages/element-web-playwright-common"
+        "url": "git+https://github.com/element-hq/element-web.git",
+        "directory": "packages/playwright-common"
     },
     "author": "element-hq",
     "engines": {
@@ -18,15 +18,14 @@
         "playwright-screenshots": "playwright-screenshots.sh"
     },
     "scripts": {
-        "prepare": "tsc",
-        "lint:types": "tsc --noEmit",
-        "lint:codestyle": "echo 'handled by lint:eslint'",
-        "test": "echo No tests for @element-hq/element-web-playwright-common"
+        "prepack": "nx build:playwright",
+        "lint:types": "nx lint:types"
     },
     "devDependencies": {
-        "@element-hq/element-web-module-api": "*",
+        "@element-hq/element-web-module-api": "workspace:*",
         "@types/lodash-es": "^4.17.12",
-        "typescript": "^5.8.2"
+        "typescript": "^5.8.2",
+        "wait-on": "^9.0.4"
     },
     "dependencies": {
         "@axe-core/playwright": "^4.10.1",
@@ -40,7 +39,7 @@
     },
     "peerDependencies": {
         "@element-hq/element-web-module-api": "*",
-        "@playwright/test": "^1.52.0",
-        "playwright-core": "^1.52.0"
+        "@playwright/test": "catalog:",
+        "playwright-core": "catalog:"
     }
 }

package/playwright-screenshots.sh

@@ -6,137 +6,44 @@ set -e
 SCRIPT_PATH=$(readlink -f "$0")
 SCRIPT_DIR=$(dirname "$SCRIPT_PATH")
 
-IMAGE_NAME="element-web-playwright-common"
+function build_image() {
+    local IMAGE_NAME="$1"
 
-if docker --version | grep -q podman; then docker_is_podman=1; fi
-
-build_image() {
-  echo "Building $IMAGE_NAME image in $SCRIPT_DIR"
-
-  # Check the playwright version
-  PM=$(cat package.json | jq -r '.packageManager')
-  if [[ $PM == "pnpm@"* ]]; then
-    PW_VERSION=$(pnpm list @playwright/test --depth=0 --json | jq -r '.[].devDependencies["@playwright/test"].version')
-  else
-    PW_VERSION=$(yarn list --pattern @playwright/test --depth=0 --json --non-interactive --no-progress | jq -r '.data.trees[].name | split("@") | last')
-  fi
-  echo "with Playwright version $PW_VERSION"
-
-  # Build image
-  docker build -t "$IMAGE_NAME" --build-arg "PLAYWRIGHT_VERSION=$PW_VERSION" "$SCRIPT_DIR"
+    echo "Building $IMAGE_NAME image in $SCRIPT_DIR"
+    docker build -t "$IMAGE_NAME" --build-arg "PLAYWRIGHT_VERSION=${IMAGE_NAME#*:}" "$SCRIPT_DIR"
 }
 
-# Find the docker socket on the host
-case "$DOCKER_HOST" in
-    unix://*)
-        docker_sock="${DOCKER_HOST:7}"
-        ;;
-    "")
-        docker_sock="/var/run/docker.sock"
-        ;;
-    *)
-        echo "$0: unsupported DOCKER_HOST setting '${DOCKER_HOST}'" >&2
-        exit 1;
-        ;;
-esac
-
-RUN_ARGS=(
-  --rm
-  --network host
-  # Pass BASE_URL and CI environment variables to the container
-  -e BASE_URL
-  -e CI
-  # Bind mount the working directory into the container
-  -v $(pwd):/work/
-  # Bind mount the docker socket so we can run docker commands from the container
-  -v "${docker_sock}":/var/run/docker.sock
-  # Bind mount /tmp so we can store temporary files
-  -v /tmp/:/tmp/
-  -it
-)
-
-DEFAULT_ARGS=(--grep @screenshot)
-LINK_MODULES=true
-
-# Some arguments to customise behaviour so the same script / image can be
-# re-used for other screenshot generation.
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    # Mounts a separate node_modules directory from a docker volume in the container.
-    # Must be used if executing something that requires native node modules
-    # It's a volume rather than a directory because otherwise things tend to start picking up
-    # files from it in the native environment and break.
-    --with-node-modules)
-      mount_param="type=volume,src=ew-docker-node-modules,dst=/work/node_modules"
-      # podman doesn't support `volume-nocopy`
-      if [ -z "$docker_is_podman" ]; then mount_param+=",volume-nocopy"; fi
-      RUN_ARGS+=(--mount "${mount_param}" -e YARN_INSTALL=true)
-      shift
-      ;;
-    # Disables the automatic detection & linking of node_modules which can clash with developer tooling e.g. pnpm-link
-    --no-link-modules)
-      LINK_MODULES=false
-      shift
-      ;;
-    # Sets a different entrypoint (in which case the default arguments to the script will be ignored)
-    --entrypoint)
-      shift
-      RUN_ARGS+=(--entrypoint "$1")
-      DEFAULT_ARGS=()
-      shift
-      ;;
-    *)
-      break
-      ;;
-  esac
-done
-
-build_image
+WS_PORT=3000
 
-if [[ $LINK_MODULES == true ]]; then
-  # Ensure we pass all symlinked node_modules to the container
-  pushd node_modules > /dev/null
-  SYMLINKS=$(find . -maxdepth 2 -type l -not -path "./.bin/*")
-  popd > /dev/null
-  for LINK in $SYMLINKS; do
-    TARGET=$(readlink -f "node_modules/$LINK") || true
-    if [ -d "$TARGET" ]; then
-       if [ -n "$docker_is_podman" ]; then
-          echo -e "\033[31m" >&2
-          cat <<'EOF' >&2
-WARNING: `node_modules` contains symlinks, and the support for this in
-`playwright-screenshots.sh` is broken under podman due to
-https://github.com/containers/podman/issues/25947.
+# Check the playwright version
+PW_VERSION=$(pnpm --silent -- playwright --version | awk '{print $2}')
+IMAGE_NAME="ghcr.io/element-hq/element-web/playwright-server:$PW_VERSION"
 
-If you get errors such as 'Error: crun: creating `<path>`', then retry this
-having `yarn unlink`ed the relevant node modules.
-EOF
-        echo -e "\033[0m" >&2
-      fi
-      echo "mounting linked package ${LINK:2} in container"
-      RUN_ARGS+=( "-v" "$TARGET:/work/node_modules/${LINK:2}" )
-    fi
-  done
+# If the image exists in the repository, pull it; otherwise, build it.
+#
+# (This explicit test gives the user clearer progress info than just
+# `docker pull 2>/dev/null || build_image`.)
+if docker manifest inspect "$IMAGE_NAME" &>/dev/null; then
+    docker pull "$IMAGE_NAME"
+else
+    build_image "$IMAGE_NAME"
 fi
 
-# Our Playwright fixtures use Testcontainers [1], which uses a docker image
-# called Ryuk [2], which will clean up any dangling containers/networks/etc
-# after a timeout, if the parent process dies unexpectedly.
-#
-# To do this, Ryuk requires access to the docker socket, so Testcontainers
-# starts the Ryuk container with a bind-mount of `/var/run/docker.sock`.
-# However, we're going to be running Playwright (and hence Testcontainers)
-# itself in a container, but talking to the Docker daemon on the *host*, which
-# means that bind mounts will be relative to the *host* filesystem. In short,
-# it will try to bind-mount the *host's* `/var/run/docker.sock` rather than
-# that from inside the element-web-playwright-common container.
-#
-# To solve this problem, we start Ryuk ourselves (with the correct docker
-# socket) rather than waiting for Testcontainers to do so. Testcontainers will
-# find the running Ryuk instance and connect to it rather than start a new one.
-#
-# [1] https://testcontainers.com/
-# [2] https://github.com/testcontainers/moby-ryuk
-docker run -d --rm --label org.testcontainers.ryuk=true -v "${docker_sock}":/var/run/docker.sock -p 8080 --name="playwright-ryuk" testcontainers/ryuk:0.14.0
+# Start the playwright-server in docker
+CONTAINER=$(docker run --network=host -v /tmp:/tmp --rm -d -e PORT="$WS_PORT" "$IMAGE_NAME")
+# Set up an exit trap to clean up the docker container
+clean_up() {
+    ARG=$?
+    echo "Stopping playwright-server"
+    docker stop "$CONTAINER" > /dev/null
+    exit $ARG
+}
+trap clean_up EXIT
+
+# Wait for playwright-server to be ready
+echo "Waiting for playwright-server"
+pnpm --dir "$SCRIPT_DIR" exec wait-on "tcp:$WS_PORT"
 
-docker run "${RUN_ARGS[@]}" "$IMAGE_NAME" "${DEFAULT_ARGS[@]}" "$@"
+# Run the test we were given, setting PW_TEST_CONNECT_WS_ENDPOINT accordingly
+echo "Running '$@'"
+PW_TEST_CONNECT_WS_ENDPOINT="http://localhost:$WS_PORT" "$@"

package/project.json

@@ -0,0 +1,44 @@
+{
+    "$schema": "../../node_modules/nx/schemas/project-schema.json",
+    "projectType": "library",
+    "root": "packages/playwright-common",
+    "targets": {
+        "build:playwright": {
+            "cache": true,
+            "command": "tsc",
+            "inputs": ["src"],
+            "outputs": ["{projectRoot}/lib"],
+            "options": { "cwd": "packages/playwright-common" },
+            "dependsOn": ["^build"]
+        },
+        "lint:types": {
+            "command": "pnpm exec tsc --noEmit",
+            "options": { "cwd": "packages/playwright-common" },
+            "dependsOn": ["^build"]
+        },
+        "docker:prebuild": {
+            "cache": true,
+            "command": "echo PLAYWRIGHT_VERSION=$(pnpm --silent -- playwright --version | awk '{print $2}') > .env.docker:build",
+            "inputs": [{ "runtime": "pnpm --silent -- playwright --version" }],
+            "outputs": ["{projectRoot}/.env.docker:build"],
+            "options": { "cwd": "packages/playwright-common" }
+        },
+        "docker:build": {
+            "executor": "@nx-tools/nx-container:build",
+            "dependsOn": ["docker:prebuild"],
+            "options": {
+                "load": true,
+                "engine": "docker",
+                "platforms": ["linux/amd64", "linux/arm64"],
+                "provenance": "true",
+                "sbom": true,
+                "build-args": ["PLAYWRIGHT_VERSION=$PLAYWRIGHT_VERSION"],
+                "context": "{projectRoot}",
+                "metadata": {
+                    "images": ["ghcr.io/element-hq/element-web/playwright-server"],
+                    "tags": ["type=ref,event=branch", "type=raw,enable={{is_default_branch}},value=$PLAYWRIGHT_VERSION"]
+                }
+            }
+        }
+    }
+}

package/src/fixtures/services.ts

@@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details.
 
 import { type MailpitClient } from "mailpit-api";
 import { Network, type StartedNetwork } from "testcontainers";
-import { PostgreSqlContainer, type StartedPostgreSqlContainer } from "@testcontainers/postgresql";
+import { type StartedPostgreSqlContainer } from "@testcontainers/postgresql";
 
 import {
     type SynapseConfig,
@@ -22,6 +22,7 @@ import { Logger } from "../utils/logger.js";
 // We want to avoid using `mergeTests` in index.ts because it drops useful type information about the fixtures. Instead,
 // we add `axe` into our fixture suite by using its `test` as a base, so that there is a linear hierarchy.
 import { test as base } from "./axe.js";
+import { makePostgres } from "../testcontainers/postgres.js";
 
 /**
  * Test-scoped fixtures available in the test
@@ -101,27 +102,7 @@ export const test = base.extend<TestFixtures, WorkerOptions & Services>({
     ],
     postgres: [
         async ({ logger, network }, use) => {
-            const container = await new PostgreSqlContainer("postgres:13.3-alpine")
-                .withNetwork(network)
-                .withNetworkAliases("postgres")
-                .withLogConsumer(logger.getConsumer("postgres"))
-                .withTmpFs({
-                    "/dev/shm/pgdata/data": "",
-                })
-                .withEnvironment({
-                    PG_DATA: "/dev/shm/pgdata/data",
-                })
-                .withCommand([
-                    "-c",
-                    "shared_buffers=128MB",
-                    "-c",
-                    `fsync=off`,
-                    "-c",
-                    `synchronous_commit=off`,
-                    "-c",
-                    "full_page_writes=off",
-                ])
-                .start();
+            const container = await makePostgres(network, logger);
             await use(container);
             await container.stop();
         },

package/src/fixtures/toasts.ts

@@ -0,0 +1,109 @@
+/*
+ * Copyright 2026 Element Creations Ltd.
+ *
+ * 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 { expect, type Locator, type Page } from "@playwright/test";
+
+// We want to avoid using `mergeTests` in index.ts because it drops useful type
+// information about the fixtures. Instead, we add `services` into our fixture
+// suite by using its `test` as a base, so that there is a linear hierarchy.
+import { test as base } from "./services.js";
+
+// This fixture provides convenient handling of Element Web's toasts.
+export const test = base.extend<{
+    /**
+     * Convenience functions for handling toasts.
+     */
+    toasts: Toasts;
+}>({
+    toasts: async ({ page }, use) => {
+        const toasts = new Toasts(page);
+        await use(toasts);
+    },
+});
+
+class Toasts {
+    public constructor(public readonly page: Page) {}
+
+    /**
+     * Assert that no toasts exist
+     */
+    public async assertNoToasts(): Promise<void> {
+        await expect(this.page.locator(".mx_Toast_toast")).not.toBeVisible();
+    }
+
+    /**
+     * Assert that a toast with the given title exists, and return it
+     *
+     * @param title - Expected title of the toast
+     * @param timeout - Time to retry the assertion for in milliseconds.
+     *                  Defaults to `timeout` in `TestConfig.expect`.
+     * @returns the Locator for the matching toast
+     */
+    public async getToast(title: string, timeout?: number): Promise<Locator> {
+        const toast = this.getToastIfExists(title);
+        await expect(toast).toBeVisible({ timeout });
+        return toast;
+    }
+
+    /**
+     * Find a toast with the given title, if it exists.
+     *
+     * @param title - Title of the toast.
+     * @returns the Locator for the matching toast, or an empty locator if it
+     *          doesn't exist.
+     */
+    public getToastIfExists(title: string): Locator {
+        return this.page.locator(".mx_Toast_toast", { hasText: title }).first();
+    }
+
+    /**
+     * Accept a toast with the given title. Only works for the first toast in
+     * the stack.
+     *
+     * @param title - Expected title of the toast
+     */
+    public async acceptToast(title: string): Promise<void> {
+        const toast = await this.getToast(title);
+        await toast.locator('.mx_Toast_buttons button[data-kind="primary"]').click();
+    }
+    /**
+     * Accept a toast with the given title, if it exists. Only works for the
+     * first toast in the stack.
+     *
+     * @param title - Title of the toast
+     */
+    public async acceptToastIfExists(title: string): Promise<void> {
+        const toast = this.getToastIfExists(title).locator('.mx_Toast_buttons button[data-kind="primary"]');
+        if ((await toast.count()) > 0) {
+            await toast.click();
+        }
+    }
+
+    /**
+     * Reject a toast with the given title. Only works for the first toast in
+     * the stack.
+     *
+     * @param title - Expected title of the toast
+     */
+    public async rejectToast(title: string): Promise<void> {
+        const toast = await this.getToast(title);
+        await toast.locator('.mx_Toast_buttons button[data-kind="secondary"]').click();
+    }
+
+    /**
+     * Reject a toast with the given title, if it exists. Only works for the
+     * first toast in the stack.
+     *
+     * @param title - Title of the toast
+     */
+    public async rejectToastIfExists(title: string): Promise<void> {
+        const toast = this.getToastIfExists(title).locator('.mx_Toast_buttons button[data-kind="secondary"]');
+        if ((await toast.count()) > 0) {
+            await toast.click();
+        }
+    }
+}

package/src/fixtures/user.ts

@@ -9,7 +9,10 @@ Please see LICENSE files in the repository root for full details.
 import { type Page } from "@playwright/test";
 import { sample, uniqueId } from "lodash-es";
 
-import { test as base } from "./services.js";
+// We want to avoid using `mergeTests` in index.ts because it drops useful type
+// information about the fixtures. Instead, we add `toasts` into our fixture
+// suite by using its `test` as a base, so that there is a linear hierarchy.
+import { test as base } from "./toasts.js";
 import { type Credentials } from "../utils/api.js";
 
 /** Adds an initScript to the given page which will populate localStorage appropriately so that Element will use the given credentials. */