Remove duplicated test block between sign-in

Author: LauraBeatris

integration/tests/session-tasks-sign-in.test.ts

@@ -1,6 +1,6 @@
-import { createClerkClient } from '@clerk/backend';
 import { expect, test } from '@playwright/test';
 
+import { createClerkClient } from '@clerk/backend';
 import { appConfigs } from '../presets';
 import { instanceKeys } from '../presets/envs';
 import type { FakeUser } from '../testUtils';
@@ -82,34 +82,5 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
       // Delete the user on the app instance.
       await u.services.users.deleteIfExists({ email: fakeUser.email });
     });
-
-    test('when switching sessions, navigate to task', async ({ page, context }) => {
-      const u = createTestUtils({ app, page, context });
-      fakeUser = u.services.users.createFakeUser();
-      await u.services.users.createBapiUser(fakeUser);
-
-      // Create user for second session
-      const fakeUser2 = u.services.users.createFakeUser();
-      await u.services.users.createBapiUser(fakeUser2);
-
-      // Performs sign-in
-      await u.po.signIn.goTo();
-      await u.po.signIn.setIdentifier(fakeUser.email);
-      await u.po.signIn.continue();
-      await u.po.signIn.setPassword(fakeUser.password);
-      await u.po.signIn.continue();
-      await u.po.expect.toBeSignedIn();
-
-      // Resolves task
-      const fakeOrganization = u.services.organizations.createFakeOrganization();
-      await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
-      await u.po.expect.toHaveResolvedTask();
-
-      // Navigates to after sign-in
-      await u.page.waitForAppUrl('/');
-
-      await u.po.userButton.toggleTrigger();
-      await u.po.userButton.waitForPopover();
-    });
   },
 );

integration/tests/session-tasks-sign-up.test.ts

@@ -1,18 +1,25 @@
 import { expect, test } from '@playwright/test';
 
-import { createClerkClient } from '@clerk/backend';
 import { appConfigs } from '../presets';
-import { instanceKeys } from '../presets/envs';
 import type { FakeUser } from '../testUtils';
 import { createTestUtils, testAgainstRunningApps } from '../testUtils';
-import { createUserService } from '../testUtils/usersService';
 
 testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
   'session tasks after sign-up flow @nextjs',
   ({ app }) => {
     test.describe.configure({ mode: 'serial' });
 
     let fakeUser: FakeUser;
+
+    test.beforeAll(() => {
+      const u = createTestUtils({ app });
+      fakeUser = u.services.users.createFakeUser({
+        fictionalEmail: true,
+        withPhoneNumber: true,
+        withUsername: true,
+      });
+    });
+
     test.afterAll(async () => {
       const u = createTestUtils({ app });
       await u.services.organizations.deleteAll();
@@ -23,11 +30,6 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
     test('navigate to task on after sign-up', async ({ page, context }) => {
       // Performs sign-up
       const u = createTestUtils({ app, page, context });
-      fakeUser = u.services.users.createFakeUser({
-        fictionalEmail: true,
-        withPhoneNumber: true,
-        withUsername: true,
-      });
 
       await u.po.signUp.goTo();
       await u.po.signUp.signUpWithEmailAndPassword({
@@ -48,42 +50,5 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
       // Navigates to after sign-up
       await u.page.waitForAppUrl('/');
     });
-
-    test('with sso, navigate to task on after sign-up', async ({ page, context }) => {
-      const u = createTestUtils({ app, page, context });
-
-      // Create a clerkClient for the OAuth provider instance
-      const client = createClerkClient({
-        secretKey: instanceKeys.get('oauth-provider').sk,
-        publishableKey: instanceKeys.get('oauth-provider').pk,
-      });
-      const users = createUserService(client);
-      fakeUser = users.createFakeUser({
-        withUsername: true,
-      });
-      // Create the user on the OAuth provider instance so we do not need to sign up twice
-      await users.createBapiUser(fakeUser);
-
-      // Performs sign-up (transfer flow with sign-in) with SSO
-      await u.po.signIn.goTo();
-      await u.page.getByRole('button', { name: 'E2E OAuth Provider' }).click();
-      await u.page.getByText('Sign in to oauth-provider').waitFor();
-      await u.po.signIn.setIdentifier(fakeUser.email);
-      await u.po.signIn.continue();
-      await u.po.signIn.enterTestOtpCode();
-
-      // Resolves task
-      const fakeOrganization = u.services.organizations.createFakeOrganization();
-      await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
-      await u.po.expect.toHaveResolvedTask();
-
-      // Navigates to after sign-up
-      await u.page.waitForAppUrl('/');
-
-      // Delete the user on the OAuth provider instance
-      await fakeUser.deleteIfExists();
-      // Delete the user on the app instance.
-      await u.services.users.deleteIfExists({ email: fakeUser.email });
-    });
   },
 );

packages/clerk-js/src/core/clerk.ts

@@ -1274,6 +1274,15 @@ export class Clerk implements ClerkInterface {
       return;
     }
 
+    /**
+     * Invalidate previously cache pages with auth state before navigating
+     */
+    const onBeforeSetActive: SetActiveHook =
+      typeof window !== 'undefined' && typeof window.__unstable__onBeforeSetActive === 'function'
+        ? window.__unstable__onBeforeSetActive
+        : noop;
+    await onBeforeSetActive();
+
     let newSession: SignedInSessionResource | null = session;
 
     // Handles multi-session scenario when switching between `pending` sessions
@@ -1290,15 +1299,6 @@ export class Clerk implements ClerkInterface {
       eventBus.emit(events.TokenUpdate, { token: null });
     }
 
-    /**
-     * Invalidate previously cache pages with auth state before navigating
-     */
-    const onBeforeSetActive: SetActiveHook =
-      typeof window !== 'undefined' && typeof window.__unstable__onBeforeSetActive === 'function'
-        ? window.__unstable__onBeforeSetActive
-        : noop;
-    await onBeforeSetActive();
-
     // Only triggers navigation for internal AIO components routing or multi-session switch
     const isSwitchingSessions = this.session?.id != session.id;
     const shouldNavigateOnSetActive = this.#componentNavigationContext || isSwitchingSessions;