@@ -2,7 +2,12 @@ import { invariant } from '@epic-web/invariant'
22import { faker } from '@faker-js/faker'
33import { prisma } from '#app/utils/db.server.ts'
44import { deleteText , waitForText } from '#tests/mocks/utils.ts'
5- import { test as base , createUser , expect } from '#tests/playwright-utils.ts'
5+ import {
6+ test as base ,
7+ createPhoneNumber ,
8+ createUser ,
9+ expect ,
10+ } from '#tests/playwright-utils.ts'
611
712const URL_REGEX = / (?< url > h t t p s ? : \/ \/ [ ^ \s $ . ? # ] .[ ^ \s ] * ) /
813const CODE_REGEX = / c o d e : (?< code > [ \d \w ] + ) /
@@ -16,6 +21,9 @@ function formatPhoneNumber(
1621 countryCode = defaultCountryCode ,
1722) {
1823 const digitsOnly = phoneNumber . replace ( / \D / g, '' )
24+ if ( phoneNumber . trim ( ) . startsWith ( '+' ) ) {
25+ return `+${ digitsOnly } ` . replace ( / \s + / g, '' )
26+ }
1927 return `${ countryCode } ${ digitsOnly } ` . replace ( / \s + / g, '' )
2028}
2129
@@ -29,21 +37,23 @@ const test = base.extend<{
2937} > ( {
3038 getOnboardingData : async ( { } , use ) => {
3139 const userData = createUser ( )
40+ const phoneNumber = createPhoneNumber ( { includeCountryCode : false } )
3241 // Clean up any stale text fixtures for this phone number before test
33- await deleteText ( userData . phoneNumber )
34- await deleteText ( formatPhoneNumber ( userData . phoneNumber ) )
42+ await deleteText ( phoneNumber )
43+ await deleteText ( formatPhoneNumber ( phoneNumber ) )
3544 // eslint-disable-next-line react-hooks/rules-of-hooks
3645 await use ( ( ) => {
3746 const onboardingData = {
3847 ...userData ,
48+ phoneNumber,
3949 password : faker . internet . password ( ) ,
4050 }
4151 return onboardingData
4252 } )
4353 await prisma . user . deleteMany ( { where : { username : userData . username } } )
4454 // Clean up text fixtures after test
45- await deleteText ( userData . phoneNumber )
46- await deleteText ( formatPhoneNumber ( userData . phoneNumber ) )
55+ await deleteText ( phoneNumber )
56+ await deleteText ( formatPhoneNumber ( phoneNumber ) )
4757 } ,
4858} )
4959
0 commit comments