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

2025-12-17 06:37:23 +01:00 · 2018-11-29 19:02:01 +01:00
parent 0aba448c48 b82660823d
commit 817c943860
316 changed files with 18625 additions and 17558 deletions
--- a/test/api/unit/libs/password.test.js
+++ b/test/api/unit/libs/password.test.js
@@ -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,