diff --git a/frontend/playwright/ui/pages/BasePage.js b/frontend/playwright/ui/pages/BasePage.js index 2e7380b2a4..bb95840664 100644 --- a/frontend/playwright/ui/pages/BasePage.js +++ b/frontend/playwright/ui/pages/BasePage.js @@ -1,4 +1,8 @@ export class BasePage { + static async init(page) { + await BasePage.mockConfigFlags(page, []); + } + /** * Mocks multiple RPC calls in a single call. * diff --git a/frontend/playwright/ui/pages/BaseWebSocketPage.js b/frontend/playwright/ui/pages/BaseWebSocketPage.js index 21855312ee..e5de194537 100644 --- a/frontend/playwright/ui/pages/BaseWebSocketPage.js +++ b/frontend/playwright/ui/pages/BaseWebSocketPage.js @@ -2,13 +2,8 @@ import { MockWebSocketHelper } from "../../helpers/MockWebSocketHelper"; import BasePage from "./BasePage"; export class BaseWebSocketPage extends BasePage { - /** - * This should be called on `test.beforeEach`. - * - * @param {Page} page - * @returns - */ - static async initWebSockets(page) { + static async init(page) { + await super.init(page); await MockWebSocketHelper.init(page); } diff --git a/frontend/playwright/ui/pages/DashboardPage.js b/frontend/playwright/ui/pages/DashboardPage.js index 111913e5a3..8fbabf0d81 100644 --- a/frontend/playwright/ui/pages/DashboardPage.js +++ b/frontend/playwright/ui/pages/DashboardPage.js @@ -3,50 +3,50 @@ import { BaseWebSocketPage } from "./BaseWebSocketPage"; export class DashboardPage extends BaseWebSocketPage { static async init(page) { - await BaseWebSocketPage.initWebSockets(page); + await super.init(page); - await BaseWebSocketPage.mockRPC( + await super.mockRPC( page, "get-teams", "logged-in-user/get-teams-default.json", ); - await BaseWebSocketPage.mockRPC( + await super.mockRPC( page, "get-font-variants?team-id=*", "workspace/get-font-variants-empty.json", ); - await BaseWebSocketPage.mockRPC( + await super.mockRPC( page, "get-projects?team-id=*", "logged-in-user/get-projects-default.json", ); - await BaseWebSocketPage.mockRPC( + await super.mockRPC( page, "get-team-members?team-id=*", "logged-in-user/get-team-members-your-penpot.json", ); - await BaseWebSocketPage.mockRPC( + await super.mockRPC( page, "get-team-users?team-id=*", "logged-in-user/get-team-users-single-user.json", ); - await BaseWebSocketPage.mockRPC( + await super.mockRPC( page, "get-unread-comment-threads?team-id=*", "logged-in-user/get-team-users-single-user.json", ); - await BaseWebSocketPage.mockRPC( + await super.mockRPC( page, "get-team-recent-files?team-id=*", "logged-in-user/get-team-recent-files-empty.json", ); - await BaseWebSocketPage.mockRPC( + await super.mockRPC( page, "get-profiles-for-file-comments", "workspace/get-profile-for-file-comments.json", ); - await BaseWebSocketPage.mockRPC( + await super.mockRPC( page, "get-builtin-templates", "logged-in-user/get-built-in-templates-empty.json", diff --git a/frontend/playwright/ui/pages/LoginPage.js b/frontend/playwright/ui/pages/LoginPage.js index 80f471aa43..bb2efc68c6 100644 --- a/frontend/playwright/ui/pages/LoginPage.js +++ b/frontend/playwright/ui/pages/LoginPage.js @@ -1,6 +1,10 @@ import { BasePage } from "./BasePage"; export class LoginPage extends BasePage { + static async init(page) { + await super.init(page); + } + constructor(page) { super(page); this.loginButton = page.getByRole("button", { name: "Continue" }); diff --git a/frontend/playwright/ui/pages/RegisterPage.js b/frontend/playwright/ui/pages/RegisterPage.js index 097bbefb97..8d3633e678 100644 --- a/frontend/playwright/ui/pages/RegisterPage.js +++ b/frontend/playwright/ui/pages/RegisterPage.js @@ -29,8 +29,13 @@ export class RegisterPage extends BasePage { ); } + static async init(page) { + await BasePage.init(page); + } + static async initWithLoggedOutUser(page) { - await this.mockRPC(page, "get-profile", "get-profile-anonymous.json"); + await BasePage.init(page); + await BasePage.mockRPC(page, "get-profile", "get-profile-anonymous.json"); } } diff --git a/frontend/playwright/ui/pages/SubscriptionProfilePage.js b/frontend/playwright/ui/pages/SubscriptionProfilePage.js index b0e349a81a..b9769cfa52 100644 --- a/frontend/playwright/ui/pages/SubscriptionProfilePage.js +++ b/frontend/playwright/ui/pages/SubscriptionProfilePage.js @@ -3,9 +3,9 @@ import { DashboardPage } from "./DashboardPage"; export class SubscriptionProfilePage extends DashboardPage { static async init(page) { - await DashboardPage.initWebSockets(page); + await super.init(page); - await DashboardPage.mockRPC( + await super.mockRPC( page, "get-subscription-usage", "subscription/get-subscription-usage.json", diff --git a/frontend/playwright/ui/pages/ViewerPage.js b/frontend/playwright/ui/pages/ViewerPage.js index cf97f80fc6..05ba705bc5 100644 --- a/frontend/playwright/ui/pages/ViewerPage.js +++ b/frontend/playwright/ui/pages/ViewerPage.js @@ -4,16 +4,6 @@ export class ViewerPage extends BaseWebSocketPage { static anyFileId = "c7ce0794-0992-8105-8004-38f280443849"; static anyPageId = "c7ce0794-0992-8105-8004-38f28044384a"; - /** - * This should be called on `test.beforeEach`. - * - * @param {Page} page - * @returns - */ - static async init(page) { - await BaseWebSocketPage.initWebSockets(page); - } - async setupLoggedInUser() { await this.mockRPC( "get-profile", diff --git a/frontend/playwright/ui/pages/WorkspacePage.js b/frontend/playwright/ui/pages/WorkspacePage.js index 18da0810bd..7f1e871c66 100644 --- a/frontend/playwright/ui/pages/WorkspacePage.js +++ b/frontend/playwright/ui/pages/WorkspacePage.js @@ -112,9 +112,9 @@ export class WorkspacePage extends BaseWebSocketPage { * @returns */ static async init(page) { - await BaseWebSocketPage.initWebSockets(page); + await super.init(page); - await BaseWebSocketPage.mockRPCs(page, { + await super.mockRPCs(page, { "get-profile": "logged-in-user/get-profile-logged-in.json", "get-team-users?file-id=*": "logged-in-user/get-team-users-single-user.json", diff --git a/frontend/playwright/ui/specs/login.spec.js b/frontend/playwright/ui/specs/login.spec.js index 4a2604f4b1..254e205b75 100644 --- a/frontend/playwright/ui/specs/login.spec.js +++ b/frontend/playwright/ui/specs/login.spec.js @@ -2,6 +2,8 @@ import { test, expect } from "@playwright/test"; import { LoginPage } from "../pages/LoginPage"; test.beforeEach(async ({ page }) => { + await LoginPage.init(page); + const login = new LoginPage(page); await login.initWithLoggedOutUser(); diff --git a/frontend/playwright/ui/specs/versions.spec.js b/frontend/playwright/ui/specs/versions.spec.js index d3d566efd1..ea5a3e9606 100644 --- a/frontend/playwright/ui/specs/versions.spec.js +++ b/frontend/playwright/ui/specs/versions.spec.js @@ -1,6 +1,5 @@ import { test, expect } from "@playwright/test"; import { WasmWorkspacePage } from "../pages/WasmWorkspacePage"; -import { presenceFixture } from "../../data/workspace/ws-notifications"; test.beforeEach(async ({ page }) => { await WasmWorkspacePage.init(page); diff --git a/frontend/playwright/ui/visual-specs/visual-login.spec.js b/frontend/playwright/ui/visual-specs/visual-login.spec.js index b3b63a0c56..5ee1ba7a2b 100644 --- a/frontend/playwright/ui/visual-specs/visual-login.spec.js +++ b/frontend/playwright/ui/visual-specs/visual-login.spec.js @@ -2,6 +2,8 @@ import { test, expect } from "@playwright/test"; import { LoginPage } from "../pages/LoginPage"; test.beforeEach(async ({ page }) => { + await LoginPage.init(page); + const login = new LoginPage(page); await login.initWithLoggedOutUser(); await login.page.goto("/#/auth/login");