Merge remote-tracking branch 'origin/develop' into negue/flagpm

This commit is contained in:
negue
2018-11-29 19:02:01 +01:00
316 changed files with 18625 additions and 17558 deletions

View File

@@ -18,7 +18,12 @@ describe('GET /user/anonymized', () => {
'profile.name': 'profile',
'purchased.plan': 'purchased plan',
contributor: 'contributor',
invitations: 'invitations',
invitations: {
guilds: ['guild1', 'guild2'],
party: {
_id: 'partyid',
},
},
'items.special.nyeReceived': 'some',
'items.special.valentineReceived': 'some',
webhooks: [{url: 'https://somurl.com'}],

View File

@@ -94,9 +94,6 @@ describe('POST /user/auth/reset-password-set-new-one', () => {
userId: user._id,
expiresAt: moment().add({days: 1}),
}));
await user.update({
auth: 'not an object with valid fields',
});
await expect(api.post(`${endpoint}`, {
code,