Merge branch 'develop' into phillip/autocomplete-username

2018-11-28 14:02:35 +01:00
parent 664a457b47 bf7fabb20a
commit 8641a98107
9 changed files with 6613 additions and 6419 deletions
@@ -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,