ci: Add support for Parse Server 6

integration/test/ParseLiveQueryTest.js

@@ -285,7 +285,7 @@ describe('Parse LiveQuery', () => {
   it('connectPromise does throw', async () => {
     await reconfigureServer({
       cloud({ Cloud }) {
-        Cloud.beforeConnect((params) => {
+        Cloud.beforeConnect(params => {
           if (params.sessionToken === 'testToken') {
             throw 'not allowed to connect';
           }

integration/test/ParseObjectTest.js

@@ -1644,49 +1644,36 @@ describe('Parse Object', () => {
       });
   });
 
-  it('merges user attributes on fetchAll', done => {
+  it('merges user attributes on fetchAll', async () => {
     Parse.User.enableUnsafeCurrentUser();
-    let sameUser;
+    const acl = new Parse.ACL();
+    acl.setPublicReadAccess(true);
     let user = new Parse.User();
     user.set('username', 'asdf');
     user.set('password', 'zxcv');
     user.set('foo', 'bar');
-    user
-      .signUp()
-      .then(() => {
-        Parse.User.logOut();
-        const query = new Parse.Query(Parse.User);
-        return query.get(user.id);
-      })
-      .then(userAgain => {
-        user = userAgain;
-        sameUser = new Parse.User();
-        sameUser.set('username', 'asdf');
-        sameUser.set('password', 'zxcv');
-        return sameUser.logIn();
-      })
-      .then(() => {
-        assert(!user.getSessionToken());
-        assert(sameUser.getSessionToken());
-        sameUser.set('baz', 'qux');
-        return sameUser.save();
-      })
-      .then(() => {
-        return Parse.Object.fetchAll([user]);
-      })
-      .then(() => {
-        assert.equal(user.createdAt.getTime(), sameUser.createdAt.getTime());
-        assert.equal(user.updatedAt.getTime(), sameUser.updatedAt.getTime());
-        return Parse.User.logOut().then(
-          () => {
-            done();
-          },
-          () => {
-            done();
-          }
-        );
-      })
-      .catch(done.fail);
+    user.setACL(acl);
+    await user.signUp();
+
+    Parse.User.logOut();
+    const query = new Parse.Query(Parse.User);
+    user = await query.get(user.id);
+
+    const sameUser = new Parse.User();
+    sameUser.set('username', 'asdf');
+    sameUser.set('password', 'zxcv');
+    sameUser.setACL(acl);
+    await sameUser.logIn();
+
+    assert(!user.getSessionToken());
+    assert(sameUser.getSessionToken());
+    sameUser.set('baz', 'qux');
+    await sameUser.save();
+
+    await Parse.Object.fetchAll([user]);
+    assert.equal(user.createdAt.getTime(), sameUser.createdAt.getTime());
+    assert.equal(user.updatedAt.getTime(), sameUser.updatedAt.getTime());
+    await Parse.User.logOut();
   });
 
   it('can fetchAllIfNeededWithInclude', async () => {

integration/test/ParseQueryTest.js

@@ -71,12 +71,15 @@ describe('Parse Query', () => {
     assert.strictEqual(result.className, 'TestObject');
     assert.strictEqual(result.objectId, object.id);
 
-    await query.each((obj) => {
-      assert.strictEqual(obj instanceof Parse.Object, false);
-      assert.strictEqual(obj.foo, 'bar');
-      assert.strictEqual(obj.className, 'TestObject');
-      assert.strictEqual(obj.objectId, object.id);
-    }, { json: true });
+    await query.each(
+      obj => {
+        assert.strictEqual(obj instanceof Parse.Object, false);
+        assert.strictEqual(obj.foo, 'bar');
+        assert.strictEqual(obj.className, 'TestObject');
+        assert.strictEqual(obj.objectId, object.id);
+      },
+      { json: true }
+    );
   });
 
   it('can do query with count', async () => {
@@ -1771,22 +1774,22 @@ describe('Parse Query', () => {
     }
   });
 
-  it('can include User fields', done => {
-    Parse.User.signUp('bob', 'password', { age: 21 })
-      .then(user => {
-        const obj = new TestObject();
-        return obj.save({ owner: user });
-      })
-      .then(obj => {
-        const query = new Parse.Query(TestObject);
-        query.include('owner');
-        return query.get(obj.id);
-      })
-      .then(objAgain => {
-        assert(objAgain.get('owner') instanceof Parse.User);
-        assert.equal(objAgain.get('owner').get('age'), 21);
-        done();
-      });
+  it('can include User fields', async () => {
+    const user = new Parse.User();
+    user.set('username', 'bob');
+    user.set('password', 'password');
+    user.set('age', 21);
+    const acl = new Parse.ACL();
+    acl.setPublicReadAccess(true);
+    user.setACL(acl);
+    await user.signUp();
+    const obj = new TestObject();
+    await obj.save({ owner: user });
+    const query = new Parse.Query(TestObject);
+    query.include('owner');
+    const objAgain = await query.get(obj.id);
+    assert(objAgain.get('owner') instanceof Parse.User);
+    assert.equal(objAgain.get('owner').get('age'), 21);
   });
 
   it('can build OR queries', done => {

integration/test/ParseUserTest.js

@@ -521,26 +521,24 @@ describe('Parse User', () => {
       });
   });
 
-  it('can count users', done => {
+  it('can count users', async () => {
     const james = new Parse.User();
     james.set('username', 'james');
     james.set('password', 'mypass');
-    james
-      .signUp()
-      .then(() => {
-        const kevin = new Parse.User();
-        kevin.set('username', 'kevin');
-        kevin.set('password', 'mypass');
-        return kevin.signUp();
-      })
-      .then(() => {
-        const query = new Parse.Query(Parse.User);
-        return query.count();
-      })
-      .then(c => {
-        assert.equal(c, 2);
-        done();
-      });
+    const acl = new Parse.ACL();
+    acl.setPublicReadAccess(true);
+    james.setACL(acl);
+    await james.signUp();
+    const kevin = new Parse.User();
+    kevin.set('username', 'kevin');
+    kevin.set('password', 'mypass');
+    kevin.setACL(acl);
+    await kevin.signUp();
+
+    const query = new Parse.Query(Parse.User);
+    const c = await query.count();
+
+    assert.equal(c, 2);
   });
 
   it('can sign up user with container class', done => {

integration/test/helper.js

@@ -97,38 +97,26 @@ const destroyAliveConnections = function () {
 let parseServer;
 let server;
 
-const reconfigureServer = (changedConfiguration = {}) => {
-  return new Promise((resolve, reject) => {
-    if (server) {
-      return parseServer.handleShutdown().then(() => {
-        server.close(() => {
-          parseServer = undefined;
-          server = undefined;
-          reconfigureServer(changedConfiguration).then(resolve, reject);
-        });
-      });
-    }
-    try {
-      didChangeConfiguration = Object.keys(changedConfiguration).length !== 0;
-      const newConfiguration = Object.assign({}, defaultConfiguration, changedConfiguration || {}, {
-        serverStartComplete: error => {
-          if (error) {
-            reject(error);
-          } else {
-            resolve(parseServer);
-          }
-        },
-        mountPath,
-        port,
-      });
-      parseServer = ParseServer.start(newConfiguration);
-      const app = parseServer.expressApp;
-      for (const fileName of ['parse.js', 'parse.min.js']) {
-        const file = fs
-          .readFileSync(path.resolve(__dirname, `./../../dist/${fileName}`))
-          .toString();
-        app.get(`/${fileName}`, (req, res) => {
-          res.send(`<html><head>
+const reconfigureServer = async (changedConfiguration = {}) => {
+  if (server) {
+    await parseServer.handleShutdown();
+    await new Promise(resolve => server.close(resolve));
+    parseServer = undefined;
+    server = undefined;
+    return reconfigureServer(changedConfiguration);
+  }
+
+  didChangeConfiguration = Object.keys(changedConfiguration).length !== 0;
+  const newConfiguration = Object.assign({}, defaultConfiguration, changedConfiguration || {}, {
+    mountPath,
+    port,
+  });
+  parseServer = await ParseServer.startApp(newConfiguration);
+  const app = parseServer.expressApp;
+  for (const fileName of ['parse.js', 'parse.min.js']) {
+    const file = fs.readFileSync(path.resolve(__dirname, `./../../dist/${fileName}`)).toString();
+    app.get(`/${fileName}`, (req, res) => {
+      res.send(`<html><head>
           <meta charset="utf-8">
           <meta http-equiv="X-UA-Compatible" content="IE=edge">
           <title>Parse Functionality Test</title>
@@ -142,26 +130,23 @@ const reconfigureServer = (changedConfiguration = {}) => {
           </head>
         <body>
         </body></html>`);
-        });
-      }
-      app.get('/clear/:fast', (req, res) => {
-        const { fast } = req.params;
-        TestUtils.destroyAllDataPermanently(fast).then(() => {
-          res.send('{}');
-        });
-      });
-      server = parseServer.server;
-      server.on('connection', connection => {
-        const key = `${connection.remoteAddress}:${connection.remotePort}`;
-        openConnections[key] = connection;
-        connection.on('close', () => {
-          delete openConnections[key];
-        });
-      });
-    } catch (error) {
-      reject(error);
-    }
+    });
+  }
+  app.get('/clear/:fast', (req, res) => {
+    const { fast } = req.params;
+    TestUtils.destroyAllDataPermanently(fast).then(() => {
+      res.send('{}');
+    });
+  });
+  server = parseServer.server;
+  server.on('connection', connection => {
+    const key = `${connection.remoteAddress}:${connection.remotePort}`;
+    openConnections[key] = connection;
+    connection.on('close', () => {
+      delete openConnections[key];
+    });
   });
+  return parseServer;
 };
 global.DiffObject = Parse.Object.extend('DiffObject');
 global.Item = Parse.Object.extend('Item');