Merge branch 'release' into develop

This commit is contained in:
Sabe Jones 2018-11-27 19:46:39 -06:00
commit 88a2f317d8
5 changed files with 5710 additions and 5638 deletions

11334
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -245,7 +245,9 @@ describe('Password Utilities', () => {
it('returns false if the user has no local auth', async () => {
let user = await generateUser({
auth: 'not an object with valid fields',
auth: {
facebook: {},
},
});
let res = await validatePasswordResetCodeAndFindUser(encrypt(JSON.stringify({
userId: user._id,

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,

Binary file not shown.

After

Width:  |  Height:  |  Size: 950 B