From cae93faec6c45a50c09223fd01d97f988b066148 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 13 Jan 2025 17:50:28 +0000 Subject: [PATCH] Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- playwright/e2e/csAPI.ts | 2 +- playwright/plugins/homeserver/index.ts | 2 +- playwright/{testcontainers/utils.ts => plugins/utils/api.ts} | 4 ++-- playwright/testcontainers/synapse.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename playwright/{testcontainers/utils.ts => plugins/utils/api.ts} (96%) diff --git a/playwright/e2e/csAPI.ts b/playwright/e2e/csAPI.ts index f171ded5e3b..4153d09199c 100644 --- a/playwright/e2e/csAPI.ts +++ b/playwright/e2e/csAPI.ts @@ -9,7 +9,7 @@ import { APIRequestContext } from "playwright-core"; import { KeyBackupInfo } from "matrix-js-sdk/src/crypto-api"; import { HomeserverInstance } from "../plugins/homeserver"; -import { ClientServerApi } from "../testcontainers/utils.ts"; +import { ClientServerApi } from "../plugins/utils/api.ts"; /** * A small subset of the Client-Server API used to manipulate the state of the diff --git a/playwright/plugins/homeserver/index.ts b/playwright/plugins/homeserver/index.ts index 9e54e0aa916..b6956a82678 100644 --- a/playwright/plugins/homeserver/index.ts +++ b/playwright/plugins/homeserver/index.ts @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com Please see LICENSE files in the repository root for full details. */ -import { ClientServerApi } from "../../testcontainers/utils.ts"; +import { ClientServerApi } from "../utils/api.ts"; export interface HomeserverInstance { readonly baseUrl: string; diff --git a/playwright/testcontainers/utils.ts b/playwright/plugins/utils/api.ts similarity index 96% rename from playwright/testcontainers/utils.ts rename to playwright/plugins/utils/api.ts index cfe538edfc1..ccee723687f 100644 --- a/playwright/testcontainers/utils.ts +++ b/playwright/plugins/utils/api.ts @@ -1,5 +1,5 @@ /* -Copyright 2024 New Vector Ltd. +Copyright 2025 New Vector 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. @@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details. import { APIRequestContext } from "@playwright/test"; -import { Credentials } from "../plugins/homeserver"; +import { Credentials } from "../homeserver"; export type Verb = "GET" | "POST" | "PUT" | "DELETE"; diff --git a/playwright/testcontainers/synapse.ts b/playwright/testcontainers/synapse.ts index e6744b340a3..5460c9300ba 100644 --- a/playwright/testcontainers/synapse.ts +++ b/playwright/testcontainers/synapse.ts @@ -17,7 +17,7 @@ import { Credentials } from "../plugins/homeserver"; import { deepCopy } from "../plugins/utils/object.ts"; import { HomeserverContainer, StartedHomeserverContainer } from "./HomeserverContainer.ts"; import { StartedMatrixAuthenticationServiceContainer } from "./mas.ts"; -import { Api, ClientServerApi, Verb } from "./utils.ts"; +import { Api, ClientServerApi, Verb } from "../plugins/utils/api.ts"; const TAG = "develop@sha256:b69222d98abe9625d46f5d3cb01683d5dc173ae339215297138392cfeec935d9";