Merge branch 'dev' into fix/coverage

src/controllers/admin/tournaments/updateTournament.ts

@@ -15,10 +15,10 @@ export default [
       name: Joi.string().optional(),
       maxPlayers: Joi.number().optional(),
       cashprize: Joi.number().optional(),
-      cashprizeDetails: Joi.string().optional(),
+      cashprizeDetails: Joi.string().allow('').optional(),
       displayCashprize: Joi.boolean().optional(),
-      format: Joi.string().optional(),
-      infos: Joi.string().optional(),
+      format: Joi.string().allow('').optional(),
+      infos: Joi.string().allow('').optional(),
       casters: Joi.array().items(Joi.string()).optional(),
       displayCasters: Joi.boolean().optional(),
       display: Joi.boolean().optional(),

tests/admin/tournaments/updateTournament.test.ts

@@ -192,4 +192,12 @@ describe('PATCH /admin/tournaments/{tournamentId}', () => {
     const tournamentDatabase = await tournamentOperations.fetchTournament(tournament.id);
     expect(tournamentDatabase.maxPlayers).to.equal(validBody.maxPlayers);
   });
+
+  it('should allow for empty strings in fields `format` and `infos`', async () => {
+    await request(app)
+      .patch(`/admin/tournaments/${tournament.id}`)
+      .send({ format: '', infos: '' })
+      .set('Authorization', `Bearer ${adminToken}`)
+      .expect(200);
+  });
 });

tests/fake.ts

@@ -19,6 +19,9 @@ import { createFakeTeam, createFakeUser } from './utils';
   await database.cart.deleteMany();
   await database.log.deleteMany();
   await database.team.deleteMany();
+  await database.log.deleteMany();
+  await database.cart.deleteMany();
+  await database.orgaRole.deleteMany();
   await database.orga.deleteMany();
   await database.user.deleteMany();
 
@@ -66,19 +69,19 @@ import { createFakeTeam, createFakeUser } from './utils';
     username: 'ua_admin',
     password: defaultPassword,
     email: '[email protected]',
-    permissions: [Permission.admin],
+    permissions: [Permission.admin, Permission.orga],
   });
   await createFakeUser({
     username: 'ua_entry',
     password: defaultPassword,
     email: '[email protected]',
-    permissions: [Permission.entry],
+    permissions: [Permission.entry, Permission.orga],
   });
   await createFakeUser({
     username: 'ua_anim',
     password: defaultPassword,
     email: '[email protected]',
-    permissions: [Permission.anim],
+    permissions: [Permission.anim, Permission.orga],
   });
 
   // Set login and shop to allowed