11import type { ClerkClient } from '@clerk/backend' ;
2+ import { parsePublishableKey } from '@clerk/shared/keys' ;
23import { createPageObjects } from '@clerk/testing/playwright/unstable' ;
34
45import { appConfigs } from '../../presets' ;
56import { createTestUtils } from '../../testUtils' ;
6- import { createEmailService } from '../../testUtils/emailService' ;
77import type { FakeUser , UserService } from '../../testUtils/usersService' ;
88import { expect , test as extensionTest } from './fixtures' ;
99
@@ -22,6 +22,7 @@ for (const environmentType of ['development', 'production'] as const) {
2222 let services : { clerk : ClerkClient ; users : UserService } ;
2323 let user : FakeUser ;
2424 let addedOrigin : string | undefined ;
25+ let restoreTestMode = false ;
2526
2627 test . beforeAll ( async ( { extensionApp } ) => {
2728 const publishableKey = extensionApp . env . publicVariables . get ( 'CLERK_PUBLISHABLE_KEY' ) ;
@@ -30,9 +31,7 @@ for (const environmentType of ['development', 'production'] as const) {
3031 } ) ;
3132
3233 test . beforeEach ( async ( { extensionId } ) => {
33- user = services . users . createFakeUser ( test , {
34- fictionalEmail : environmentType === 'development' ,
35- } ) ;
34+ user = services . users . createFakeUser ( test , { fictionalEmail : true } ) ;
3635
3736 if ( environmentType === 'production' ) {
3837 const origin = `chrome-extension://${ extensionId } ` ;
@@ -48,12 +47,19 @@ for (const environmentType of ['development', 'production'] as const) {
4847 try {
4948 await user ?. deleteIfExists ( ) ;
5049 } finally {
51- if ( addedOrigin ) {
52- const instance = await services . clerk . instance . get ( ) ;
53- await services . clerk . instance . update ( {
54- allowedOrigins : ( instance . allowedOrigins || [ ] ) . filter ( origin => origin !== addedOrigin ) ,
55- } ) ;
56- addedOrigin = undefined ;
50+ try {
51+ if ( addedOrigin ) {
52+ const instance = await services . clerk . instance . get ( ) ;
53+ await services . clerk . instance . update ( {
54+ allowedOrigins : ( instance . allowedOrigins || [ ] ) . filter ( origin => origin !== addedOrigin ) ,
55+ } ) ;
56+ addedOrigin = undefined ;
57+ }
58+ } finally {
59+ if ( restoreTestMode ) {
60+ await services . clerk . instance . update ( { testMode : false } ) ;
61+ restoreTestMode = false ;
62+ }
5763 }
5864 }
5965 } ) ;
@@ -70,18 +76,33 @@ for (const environmentType of ['development', 'production'] as const) {
7076 await expect ( extensionPage . getByTestId ( 'session-id' ) ) . toHaveText ( / ^ s e s s _ / ) ;
7177 } ) ;
7278
73- test ( 'signs up with email and password without a Testing Token' , async ( { extensionPage } ) => {
79+ test ( 'signs up with email and password without a Testing Token' , async ( { extensionPage, extensionApp } ) => {
80+ if ( environmentType === 'production' ) {
81+ const { frontendApi } = parsePublishableKey ( extensionApp . env . publicVariables . get ( 'CLERK_PUBLISHABLE_KEY' ) , {
82+ fatal : true ,
83+ } ) ;
84+ const response = await fetch ( `https://${ frontendApi } /v1/environment?_is_native=1` ) ;
85+ expect ( response . ok ) . toBe ( true ) ;
86+ const environment = await response . json ( ) ;
87+ expect ( typeof environment . auth_config . test_mode ) . toBe ( 'boolean' ) ;
88+ restoreTestMode = ! environment . auth_config . test_mode ;
89+ if ( restoreTestMode ) {
90+ await services . clerk . instance . update ( { testMode : true } ) ;
91+ }
92+ }
93+
7494 await extensionPage . getByRole ( 'button' , { name : 'Create account' , exact : true } ) . click ( ) ;
7595 const { signUp } = createPageObjects ( { page : extensionPage , useTestingToken : false } ) ;
7696 await signUp . waitForMounted ( ) ;
77- await signUp . signUpWithEmailAndPassword ( { email : user . email , password : user . password } ) ;
78-
79- if ( environmentType === 'development' ) {
80- await signUp . enterTestOtpCode ( { awaitPrepare : false } ) ;
81- } else {
82- const code = await createEmailService ( ) . getCodeForEmailAddress ( user . email ! ) ;
83- await signUp . enterOtpCode ( code , { awaitPrepare : false } ) ;
84- }
97+ const [ response ] = await Promise . all ( [
98+ extensionPage . waitForResponse (
99+ response =>
100+ response . request ( ) . method ( ) === 'POST' && new URL ( response . url ( ) ) . pathname === '/v1/client/sign_ups' ,
101+ ) ,
102+ signUp . signUpWithEmailAndPassword ( { email : user . email , password : user . password } ) ,
103+ ] ) ;
104+ expect ( response . ok ( ) ) . toBe ( true ) ;
105+ await signUp . enterTestOtpCode ( { awaitPrepare : false } ) ;
85106
86107 await expect ( extensionPage . getByTestId ( 'user-id' ) ) . toHaveText ( / ^ u s e r _ / ) ;
87108 await expect ( extensionPage . getByTestId ( 'session-id' ) ) . toHaveText ( / ^ s e s s _ / ) ;
0 commit comments