Alls tests should pass

Author: flovilmart

spec/.eslintrc.json

@@ -20,9 +20,7 @@
       "describe_only": true,
       "on_db": true,
       "defaultConfiguration": true,
-      "expectSuccess": true,
       "range": true,
-      "expectError": true,
       "jequal": true,
       "create": true,
       "arrayContains": true

spec/FilesController.spec.js

@@ -48,7 +48,8 @@ describe("FilesController", () => {
         () => done.fail('should not succeed'),
         () => setImmediate(() => Promise.resolve('done'))
       )
-      .then(() => logController.getLogs({ from: Date.now() - 500, size: 1000 }))
+      .then(() => new Promise(resolve => setTimeout(resolve, 200)))
+      .then(() => logController.getLogs({ from: Date.now() - 1000, size: 1000 }))
       .then((logs) => {
         // we get two logs here: 1. the source of the failure to save the file
         // and 2 the message that will be sent back to the client.

spec/ParseAPI.spec.js

@@ -62,7 +62,7 @@ describe('miscellaneous', function() {
   });
 
   it('create a valid parse user', function(done) {
-    createTestUser(function(data) {
+    createTestUser().then(function(data) {
       expect(data.id).not.toBeUndefined();
       expect(data.getSessionToken()).not.toBeUndefined();
       expect(data.get('password')).toBeUndefined();
@@ -104,7 +104,8 @@ describe('miscellaneous', function() {
       .catch(done);
   });
 
-  it('ensure that email is uniquely indexed', done => {
+  it('ensure that email is uniquely indexed', async done => {
+    Parse.User.disableUnsafeCurrentUser();
     let numFailed = 0;
     let numCreated = 0;
     const user1 = new Parse.User();
@@ -138,9 +139,11 @@ describe('miscellaneous', function() {
     Promise.all([p1, p2])
       .then(() => {
         fail('one of the users should not have been created');
-        done();
       })
-      .catch(done);
+      .finally(() => {
+        Parse.User.enableUnsafeCurrentUser();
+        done();
+      });
   });
 
   it('ensure that if people already have duplicate users, they can still sign up new users', done => {
@@ -229,15 +232,16 @@ describe('miscellaneous', function() {
       });
   });
 
-  it('succeed in logging in', function() {
-    createTestUser(async function(u) {
+  it('succeed in logging in', function(done) {
+    createTestUser().then(async function(u) {
       expect(typeof u.id).toEqual('string');
 
       const user = await Parse.User.logIn('test', 'moon-y');
       expect(typeof user.id).toEqual('string');
       expect(user.get('password')).toBeUndefined();
       expect(user.getSessionToken()).not.toBeUndefined();
-      Parse.User.logOut();
+      await Parse.User.logOut();
+      done();
     }, fail);
   });
 

spec/WinstonLoggerAdapter.spec.js

@@ -21,7 +21,7 @@ describe('info logs', () => {
         // Check the error log
         // Regression #2639
         winstonLoggerAdapter.query({
-          from: new Date(Date.now() - 500),
+          from: new Date(Date.now() - 200),
           size: 100,
           level: 'error'
         }, (results) => {

spec/helper.js

@@ -235,27 +235,14 @@ const Container = Parse.Object.extend({
 // Convenience method to create a new TestObject with a callback
 function create(options, callback) {
   const t = new TestObject(options);
-  t.save().then(callback);
+  return t.save().then(callback);
 }
 
-function createTestUser(success, error) {
+function createTestUser() {
   const user = new Parse.User();
   user.set('username', 'test');
   user.set('password', 'moon-y');
-  const promise = user.signUp();
-  if (success || error) {
-    promise.then(function(user) {
-      if (success) {
-        success(user);
-      }
-    }, function(err) {
-      if (error) {
-        error(err);
-      }
-    });
-  } else {
-    return promise;
-  }
+  return user.signUp();
 }
 
 // Shims for compatibility with the old qunit tests.
@@ -271,37 +258,6 @@ function strictEqual(a, b, message) {
 function notEqual(a, b, message) {
   expect(a).not.toEqual(b, message);
 }
-function expectSuccess(params, done) {
-  return {
-    success: params.success,
-    error: function() {
-      fail('failure happened in expectSuccess');
-      done ? done() : null;
-    },
-  }
-}
-function expectError(errorCode, callback) {
-  return {
-    success: function(result) {
-      console.log('got result', result);
-      fail('expected error but got success');
-    },
-    error: function(obj, e) {
-      // Some methods provide 2 parameters.
-      e = e || obj;
-      if (errorCode !== undefined) {
-        if (!e) {
-          fail('expected a specific error but got a blank error');
-          return;
-        }
-        expect(e.code).toEqual(errorCode, e.message);
-      }
-      if (callback) {
-        callback(e);
-      }
-    },
-  }
-}
 
 // Because node doesn't have Parse._.contains
 function arrayContains(arr, item) {
@@ -393,8 +349,6 @@ global.ok = ok;
 global.equal = equal;
 global.strictEqual = strictEqual;
 global.notEqual = notEqual;
-global.expectSuccess = expectSuccess;
-global.expectError = expectError;
 global.arrayContains = arrayContains;
 global.jequal = jequal;
 global.range = range;

src/LiveQuery/ParseLiveQueryServer.js

@@ -197,7 +197,7 @@ class ParseLiveQueryServer {
               originalACLCheckingPromise,
               currentACLCheckingPromise
             ]
-          ).then((isOriginalMatched, isCurrentMatched) => {
+          ).then(([isOriginalMatched, isCurrentMatched]) => {
             logger.verbose('Original %j | Current %j | Match: %s, %s, %s, %s | Query: %s',
               originalParseObject,
               currentParseObject,