Merge pull request #61 from TaloDev/test-setup-fix

Fix test setup

Author: tudddorrr

src/entities/user-two-factor-auth.ts

@@ -12,7 +12,7 @@ export default class UserTwoFactorAuth {
   @Property({ hidden: true })
   secret: string
 
-  @Property()
+  @Property({ default: false })
   enabled: boolean
 
   constructor(secret: string) {

src/migrations/20220203130919SetUserTwoFactorAuthEnabledDefaultFalse.ts

@@ -0,0 +1,9 @@
+import { Migration } from '@mikro-orm/migrations'
+
+export class SetUserTwoFactorAuthEnabledDefaultFalse extends Migration {
+
+  async up(): Promise<void> {
+    this.addSql('alter table `user_two_factor_auth` modify `enabled` tinyint(1) default false;')
+  }
+
+}

src/migrations/index.ts

@@ -7,6 +7,7 @@ import { CascadeDeletePlayerAliasEvents } from './20211221195514CascadeDeletePla
 import { AddLeaderboardEntryHiddenColumn } from './20211224154919AddLeaderboardEntryHiddenColumn'
 import { CreateGameSavesTable } from './20220109144435CreateGameSavesTable'
 import { CreateGameActivitiesTable } from './20220125220401CreateGameActivitiesTable'
+import { SetUserTwoFactorAuthEnabledDefaultFalse } from './20220203130919SetUserTwoFactorAuthEnabledDefaultFalse'
 
 export default [
   {
@@ -44,5 +45,9 @@ export default [
   {
     name: 'CreateGameActivitiesTable',
     class: CreateGameActivitiesTable
+  },
+  {
+    name: 'SetUserTwoFactorAuthEnabledDefaultFalse',
+    class: SetUserTwoFactorAuthEnabledDefaultFalse
   }
 ]

src/services/public/demo.service.ts

@@ -10,6 +10,7 @@ import createQueue from '../../lib/queues/createQueue'
 import UserSession from '../../entities/user-session'
 import Event from '../../entities/event'
 import randomDate from '../../lib/dates/randomDate'
+import bcrypt from 'bcrypt'
 
 interface DemoUserJob {
   userId: number
@@ -44,6 +45,7 @@ export default class DemoService implements Service {
     user.type = UserType.DEMO
     user.organisation = await em.getRepository(Organisation).findOne({ name: process.env.DEMO_ORGANISATION_NAME })
     user.emailConfirmed = true
+    user.password = await bcrypt.hash(user.email, 10)
 
     await em.getRepository(User).persistAndFlush(user)
 

tests/fixtures/LeaderboardEntryFactory.ts

@@ -24,7 +24,8 @@ export default class LeaderboardEntryFactory extends Factory<LeaderboardEntry> {
     return {
       leaderboard: this.leaderboard,
       playerAlias: casual.random_element(player.aliases.getItems()),
-      score: Number(casual.double(10, 100000).toFixed(2))
+      score: Number(casual.double(10, 100000).toFixed(2)),
+      hidden: false
     }
   }
 

tests/refresh-db.ts

@@ -43,26 +43,7 @@ describe('Leaderboards API service - get', () => {
 
     apiKey.scopes = [APIKeyScope.READ_LEADERBOARDS]
     const players = await new PlayerFactory([game]).many(3)
-    const entries = await new LeaderboardEntryFactory(leaderboard, players).many(5)
-
-    await (<EntityManager>app.context.em).persistAndFlush([...players, ...entries])
-    token = await createToken(apiKey)
-
-    const res = await request(app.callback())
-      .get(`${baseUrl}/${leaderboard.internalName}/entries`)
-      .query({ page: 0 })
-      .auth(token, { type: 'bearer' })
-      .expect(200)
-
-    expect(res.body.entries).toHaveLength(entries.length)
-  })
-
-  it('should get leaderboard entries if the scope is valid', async () => {
-    const leaderboard = await new LeaderboardFactory([game]).one()
-
-    apiKey.scopes = [APIKeyScope.READ_LEADERBOARDS]
-    const players = await new PlayerFactory([game]).many(3)
-    const entries = await new LeaderboardEntryFactory(leaderboard, players).many(5)
+    const entries = await new LeaderboardEntryFactory(leaderboard, players).many(3)
     const hiddenEntries = await new LeaderboardEntryFactory(leaderboard, players).state('hidden').many(3)
 
     await (<EntityManager>app.context.em).persistAndFlush([...players, ...entries, ...hiddenEntries])

tests/services/_api/leaderboards-api/get.test.ts

@@ -51,14 +51,14 @@ describe('Demo service - post', () => {
 
     let oldEvents = events.filter((event) => event.createdAt < sub(new Date(), { months: 3 }))
     expect(oldEvents.length).toBeGreaterThan(0)
- 
+
     await request(app.callback())
       .post(`${baseUrl}`)
       .expect(200)
 
     await (<EntityManager>app.context.em).clear()
 
-    const updatedEvents = await (<EntityManager>app.context.em).getRepository(Event).findAll() 
+    const updatedEvents = await (<EntityManager>app.context.em).getRepository(Event).findAll()
     oldEvents = updatedEvents.filter((event) => event.createdAt < sub(new Date(), { months: 3 }))
 
     expect(oldEvents).toHaveLength(0)

tests/services/_public/demo/post.test.ts

@@ -17,15 +17,18 @@ set -e
 
 docker run --name $CONTAINER -e MYSQL_DATABASE=$DB_NAME -e MYSQL_ROOT_PASSWORD=$DB_PASS -p $DB_PORT:3306 -d mysql:8
 
-echo "Waiting for database..."
+echo "\nWaiting for database..."
 
 TIME_TAKEN=0
 while ! docker exec $CONTAINER mysql --password=$DB_PASS --port=$DB_PORT -e "SELECT 1" >/dev/null 2>&1; do
   TIME_TAKEN=$(( TIME_TAKEN + 1 ))
   sleep 1
 done
 
-echo "Database took $TIME_TAKEN seconds to get ready"
+echo "Database took $TIME_TAKEN seconds to get ready\n"
+
+yarn mikro-orm migration:up
+
+echo "\n"
 
-./node_modules/.bin/ts-node tests/refresh-db.ts 
 node --trace-warnings ./node_modules/.bin/jest "$@" --runInBand