@@ -126,22 +126,24 @@ describe("UserDal", () => {
126126
127127 it ( "isNameAvailable should correctly check if a username is available" , async ( ) => {
128128 // given
129- const { uid : user1 } = await UserTestData . createUser ( { name : "user1" } ) ;
130- await UserTestData . createUser ( { name : "user2" } ) ;
129+ const name1 = "user" + new ObjectId ( ) . toHexString ( ) ;
130+ const name2 = "user" + new ObjectId ( ) . toHexString ( ) ;
131+ const { uid : user1 } = await UserTestData . createUser ( { name : name1 } ) ;
132+ await UserTestData . createUser ( { name : name2 } ) ;
131133
132134 const testCases = [
133135 {
134- name : "user1" ,
136+ name : name1 ,
135137 whosChecking : user1 ,
136138 expected : true ,
137139 } ,
138140 {
139- name : "USER1" ,
141+ name : name1 . toUpperCase ( ) ,
140142 whosChecking : user1 ,
141143 expected : true ,
142144 } ,
143145 {
144- name : "user2" ,
146+ name : name2 ,
145147 whosChecking : user1 ,
146148 expected : false ,
147149 } ,
@@ -184,14 +186,16 @@ describe("UserDal", () => {
184186
185187 it ( "UserDAL.updateName should change the name of a user" , async ( ) => {
186188 // given
187- const testUser = await UserTestData . createUser ( { name : "bob" } ) ;
189+ const name = "user" + new ObjectId ( ) . toHexString ( ) ;
190+ const renamed = "renamed" + new ObjectId ( ) . toHexString ( ) ;
191+ const testUser = await UserTestData . createUser ( { name : name } ) ;
188192
189193 // when
190- await UserDAL . updateName ( testUser . uid , "renamedTestUser" , testUser . name ) ;
194+ await UserDAL . updateName ( testUser . uid , renamed , testUser . name ) ;
191195
192196 // then
193197 const updatedUser = await UserDAL . getUser ( testUser . uid , "test" ) ;
194- expect ( updatedUser . name ) . toBe ( "renamedTestUser" ) ;
198+ expect ( updatedUser . name ) . toBe ( renamed ) ;
195199 } ) ;
196200
197201 it ( "clearPb should clear the personalBests of a user" , async ( ) => {
@@ -1472,8 +1476,9 @@ describe("UserDal", () => {
14721476 } ) ;
14731477 } ) ;
14741478 describe ( "isDiscordIdAvailable" , ( ) => {
1479+ const discordId = new ObjectId ( ) . toHexString ( ) ;
14751480 it ( "should return true for available discordId" , async ( ) => {
1476- await expect ( UserDAL . isDiscordIdAvailable ( "myId" ) ) . resolves . toBe ( true ) ;
1481+ await expect ( UserDAL . isDiscordIdAvailable ( discordId ) ) . resolves . toBe ( true ) ;
14771482 } ) ;
14781483
14791484 it ( "should return false if discordId is taken" , async ( ) => {
0 commit comments