From dab5b7b9de12c31ea54813ec0ed1c96daceaefe5 Mon Sep 17 00:00:00 2001
From: Alessandro Magionami <alessandro.magionami@gmail.com>
Date: Wed, 10 Jul 2024 09:52:19 +0200
Subject: [PATCH] chore(user-emails): use test helpers

---
 .../core/tests/integration/create-user.spec.ts       | 12 ++++++------
 packages/server/modules/core/tests/users.spec.js     |  6 +-----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/packages/server/modules/core/tests/integration/create-user.spec.ts b/packages/server/modules/core/tests/integration/create-user.spec.ts
index 16dc07588..8109ca95f 100644
--- a/packages/server/modules/core/tests/integration/create-user.spec.ts
+++ b/packages/server/modules/core/tests/integration/create-user.spec.ts
@@ -4,7 +4,7 @@ import { beforeEach, describe, it } from 'mocha'
 import { beforeEachContext } from '@/test/hooks'
 import { UserRecord } from '../../helpers/types'
 import knexInstance from '@/db/knex'
-import { createRandomEmail } from '../../helpers/test-helpers'
+import { createRandomEmail, createRandomPassword } from '../../helpers/test-helpers'
 import { USER_EMAILS_TABLE_NAME } from '@/modules/user-emails/constants'
 
 const db = knexInstance
@@ -19,7 +19,7 @@ describe('Users @core-users', () => {
     const newUser = {
       name: 'John Doe',
       email: createRandomEmail(),
-      password: 'sn3aky-1337-b1m'
+      password: createRandomPassword()
     }
 
     const actorId = await createUser(newUser)
@@ -31,7 +31,7 @@ describe('Users @core-users', () => {
     const user = {
       name: 'Marty McFly',
       email: createRandomEmail(),
-      password: 'something_future_proof'
+      password: createRandomPassword()
     }
 
     const userId = await createUser(user)
@@ -44,7 +44,7 @@ describe('Users @core-users', () => {
       await createUser({
         name: 'Dim Sum',
         email: createRandomEmail(),
-        password: '1234567'
+        password: createRandomPassword()
       })
     } catch {
       return
@@ -55,7 +55,7 @@ describe('Users @core-users', () => {
     const newUser = {
       name: 'John Doe',
       email: createRandomEmail(),
-      password: 'testthebest'
+      password: createRandomPassword()
     }
 
     // create user
@@ -77,7 +77,7 @@ describe('Users @core-users', () => {
     const userId = await createUser({
       name: 'John Doe',
       email,
-      password: 'testthebest'
+      password: createRandomPassword()
     })
 
     const user = (await getUserById({ userId })) as UserRecord
diff --git a/packages/server/modules/core/tests/users.spec.js b/packages/server/modules/core/tests/users.spec.js
index 67b65b6fa..46bb025aa 100644
--- a/packages/server/modules/core/tests/users.spec.js
+++ b/packages/server/modules/core/tests/users.spec.js
@@ -43,11 +43,7 @@ const {
 const { createObject } = require('../services/objects')
 const { beforeEachContext } = require('@/test/hooks')
 const { Scopes, Roles } = require('@speckle/shared')
-const { randomUUID } = require('crypto')
-
-function createRandomEmail() {
-  return `${randomUUID()}@example.org`
-}
+const { createRandomEmail } = require('../helpers/test-helpers')
 
 describe('Actors & Tokens @user-services', () => {
   const myTestActor = {