diff --git a/tests/playwright/pages/Account/AppStore.ts b/tests/playwright/pages/Account/AppStore.ts index 0ac3ff39d2..d95378be4f 100644 --- a/tests/playwright/pages/Account/AppStore.ts +++ b/tests/playwright/pages/Account/AppStore.ts @@ -12,7 +12,7 @@ export class AccountAppStorePage extends BasePage { async goto() { await this.waitForResponse({ - uiAction: () => this.rootPage.goto('/#/account/apps', { waitUntil: 'networkidle' }), + uiAction: async () => await this.rootPage.goto('/#/account/apps'), httpMethodsToMatch: ['GET'], requestUrlPathToMatch: 'api/v1/db/meta/plugins', }); diff --git a/tests/playwright/pages/Account/License.ts b/tests/playwright/pages/Account/License.ts index 8501ed0864..bea4eea8e3 100644 --- a/tests/playwright/pages/Account/License.ts +++ b/tests/playwright/pages/Account/License.ts @@ -10,7 +10,7 @@ export class AccountLicensePage extends BasePage { } async goto() { - await this.rootPage.goto('/#/account/license', { waitUntil: 'networkidle' }); + await this.rootPage.goto('/#/account/license'); } async waitUntilContentLoads() { diff --git a/tests/playwright/pages/Account/Settings.ts b/tests/playwright/pages/Account/Settings.ts index 07bdd37d7a..0bf7e1589c 100644 --- a/tests/playwright/pages/Account/Settings.ts +++ b/tests/playwright/pages/Account/Settings.ts @@ -11,9 +11,8 @@ export class AccountSettingsPage extends BasePage { } async goto() { - // await this.rootPage.goto('/#/account/users/settings', { waitUntil: 'networkidle' }); await this.waitForResponse({ - uiAction: () => this.rootPage.goto('/#/account/users/settings', { waitUntil: 'networkidle' }), + uiAction: async () => await this.rootPage.goto('/#/account/users/settings'), httpMethodsToMatch: ['GET'], requestUrlPathToMatch: `api/v1/app-settings`, }); diff --git a/tests/playwright/pages/Account/Token.ts b/tests/playwright/pages/Account/Token.ts index 4bed02e320..71592720b2 100644 --- a/tests/playwright/pages/Account/Token.ts +++ b/tests/playwright/pages/Account/Token.ts @@ -15,7 +15,7 @@ export class AccountTokenPage extends BasePage { } async goto() { - await this.rootPage.goto('/#/account/tokens', { waitUntil: 'networkidle' }); + await this.rootPage.goto('/#/account/tokens'); } get() { diff --git a/tests/playwright/pages/Account/Users.ts b/tests/playwright/pages/Account/Users.ts index 9b6bbdd854..aff846a82c 100644 --- a/tests/playwright/pages/Account/Users.ts +++ b/tests/playwright/pages/Account/Users.ts @@ -18,7 +18,7 @@ export class AccountUsersPage extends BasePage { } async goto() { - await this.rootPage.goto('/#/account/users/list', { waitUntil: 'networkidle' }); + await this.rootPage.goto('/#/account/users/list'); } get() { diff --git a/tests/playwright/pages/SigninPage/index.ts b/tests/playwright/pages/SigninPage/index.ts index 6a1cc05cc8..a1d0a2c54d 100644 --- a/tests/playwright/pages/SigninPage/index.ts +++ b/tests/playwright/pages/SigninPage/index.ts @@ -17,7 +17,7 @@ export class SigninPage extends BasePage { } goto() { - return this.rootPage.goto('/#/signin/', { waitUntil: 'networkidle' }); + return this.rootPage.goto('/#/signin/'); } get() { diff --git a/tests/playwright/pages/SignupPage/index.ts b/tests/playwright/pages/SignupPage/index.ts index 5c9b415507..7ee8a9cf2f 100644 --- a/tests/playwright/pages/SignupPage/index.ts +++ b/tests/playwright/pages/SignupPage/index.ts @@ -17,7 +17,7 @@ export class SignupPage extends BasePage { } goto() { - return this.rootPage.goto('/#/signup/', { waitUntil: 'networkidle' }); + return this.rootPage.goto('/#/signup/'); } get() { diff --git a/tests/playwright/setup/index.ts b/tests/playwright/setup/index.ts index 3c75c36e67..7a2fb4487f 100644 --- a/tests/playwright/setup/index.ts +++ b/tests/playwright/setup/index.ts @@ -79,7 +79,7 @@ const setup = async ({ page, isEmptyProject }: { page: Page; isEmptyProject?: bo const project = response.data.project; - await page.goto(`/#/nc/${project.id}/auth`, { waitUntil: 'networkidle' }); + await page.goto(`/#/nc/${project.id}/auth`); return { project, token, dbType, workerId } as NcContext; }; diff --git a/tests/playwright/tests/db/accountUserManagement.spec.ts b/tests/playwright/tests/db/accountUserManagement.spec.ts index 45b4a3c3da..476bf62e72 100644 --- a/tests/playwright/tests/db/accountUserManagement.spec.ts +++ b/tests/playwright/tests/db/accountUserManagement.spec.ts @@ -28,7 +28,7 @@ test.describe('User roles', () => { projectsPage = new ProjectsPage(accountPage.rootPage); }); - test('Invite user, update role and delete user', async () => { + test.only('Invite user, update role and delete user', async () => { test.slow(); await accountUsersPage.goto(); @@ -41,7 +41,7 @@ test.describe('User roles', () => { }); await accountUsersPage.closeInvite(); await signupAndVerify(i); - await accountPage.rootPage.reload({ waitUntil: 'networkidle' }); + await accountPage.rootPage.reload(); await accountUsersPage.goto(); } diff --git a/tests/playwright/tests/db/rolesSuperUser.spec.ts b/tests/playwright/tests/db/rolesSuperUser.spec.ts index f5fd01aeab..9c87ba7c96 100644 --- a/tests/playwright/tests/db/rolesSuperUser.spec.ts +++ b/tests/playwright/tests/db/rolesSuperUser.spec.ts @@ -14,7 +14,7 @@ test.describe('Super user', () => { test('AppStore access', async () => { await dashboard.closeTab({ title: 'Team & Auth' }); - await dashboard.rootPage.goto('/#/account/apps', { waitUntil: 'networkidle' }); + await dashboard.rootPage.goto('/#/account/apps'); await dashboard.rootPage.waitForLoadState('load'); const appPage = await dashboard.rootPage; diff --git a/tests/playwright/tests/db/swagger.spec.ts b/tests/playwright/tests/db/swagger.spec.ts index 05b51f7568..9b37f4108a 100644 --- a/tests/playwright/tests/db/swagger.spec.ts +++ b/tests/playwright/tests/db/swagger.spec.ts @@ -16,7 +16,7 @@ test.describe('Table Column Operations', () => { test('Create column', async () => { // access swagger link const link = `http://localhost:8080/api/v1/db/meta/projects/${context.project.id}/swagger`; - await dashboard.rootPage.goto(link, { waitUntil: 'networkidle' }); + await dashboard.rootPage.goto(link); const swagger = await dashboard.rootPage;