restore automatic goto

Author: joshunrau

testing/e2e/src/global/global.setup.spec.ts

@@ -13,8 +13,7 @@ test.describe.serial(() => {
       await expect(response.json()).resolves.toMatchObject({ isSetup: false });
     });
     test('should successfully setup', async ({ getPageModel }) => {
-      const setupPage = getPageModel('/setup');
-      await setupPage.goto('/setup');
+      const setupPage = await getPageModel('/setup');
       await setupPage.fillSetupForm(initAppOptions);
       await setupPage.expect.toHaveURL('/auth/login');
     });

testing/e2e/src/helpers/fixtures.ts

@@ -6,15 +6,16 @@ import { LoginPage } from '../pages/auth/login.page';
 import { DashboardPage } from '../pages/dashboard.page';
 import { SubjectDataTablePage } from '../pages/datahub/subject-data-table.page';
 import { SetupPage } from '../pages/setup.page';
-import { users } from './data';
 
-import type { ProjectMetadata, RouteTo } from './types';
+import type { NavigateVariadicArgs, ProjectMetadata, RouteTo } from './types';
 
 type PageModels = typeof pageModels;
 
 type TestArgs = {
-  getPageModel: <TKey extends Extract<keyof PageModels, RouteTo>>(key: TKey) => InstanceType<PageModels[TKey]>;
-  login: () => Promise<void>;
+  getPageModel: <TKey extends Extract<keyof PageModels, RouteTo>>(
+    key: TKey,
+    ...args: NavigateVariadicArgs<TKey>
+  ) => Promise<InstanceType<PageModels[TKey]>>;
 };
 
 type WorkerArgs = {
@@ -30,10 +31,13 @@ const pageModels = {
 
 export const test = base.extend<TestArgs, WorkerArgs>({
   getPageModel: ({ page }, use) => {
-    return use(<TKey extends Extract<keyof PageModels, RouteTo>>(key: TKey) => {
-      const pageModel = new pageModels[key](page) as InstanceType<PageModels[TKey]>;
-      return pageModel;
-    });
+    return use(
+      async <TKey extends Extract<keyof PageModels, RouteTo>>(key: TKey, ...args: NavigateVariadicArgs<TKey>) => {
+        const pageModel = new pageModels[key](page) as InstanceType<PageModels[TKey]>;
+        await pageModel.goto(key, ...args);
+        return pageModel;
+      }
+    );
   },
   getProjectMetadata: [
     async ({}, use, workerInfo) => {
@@ -42,17 +46,7 @@ export const test = base.extend<TestArgs, WorkerArgs>({
       });
     },
     { scope: 'worker' }
-  ],
-  login: ({ getPageModel, getProjectMetadata }, use) => {
-    return use(async () => {
-      const loginPage = getPageModel('/auth/login');
-      await loginPage.goto('/auth/login');
-      const target = getProjectMetadata('browserTarget');
-      const credentials = users[target];
-      await loginPage.fillLoginForm(credentials);
-      await loginPage.expect.toHaveURL('/dashboard');
-    });
-  }
+  ]
 });
 
 export { expect };