Skip to content

Commit d9648f3

Browse files
committed
wip
1 parent cb9c08c commit d9648f3

File tree

7 files changed

+67
-71
lines changed

7 files changed

+67
-71
lines changed

integration/test/ParseLiveQueryTest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ describe('Parse LiveQuery', () => {
285285
it('connectPromise does throw', async () => {
286286
await reconfigureServer({
287287
cloud({ Cloud }) {
288-
Cloud.beforeConnect((params) => {
288+
Cloud.beforeConnect(params => {
289289
if (params.sessionToken === 'testToken') {
290290
throw 'not allowed to connect';
291291
}

integration/test/ParseObjectTest.js

Lines changed: 25 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1644,49 +1644,36 @@ describe('Parse Object', () => {
16441644
});
16451645
});
16461646

1647-
it('merges user attributes on fetchAll', done => {
1647+
it('merges user attributes on fetchAll', async () => {
16481648
Parse.User.enableUnsafeCurrentUser();
1649-
let sameUser;
1649+
const acl = new Parse.ACL();
1650+
acl.setPublicReadAccess(true);
16501651
let user = new Parse.User();
16511652
user.set('username', 'asdf');
16521653
user.set('password', 'zxcv');
16531654
user.set('foo', 'bar');
1654-
user
1655-
.signUp()
1656-
.then(() => {
1657-
Parse.User.logOut();
1658-
const query = new Parse.Query(Parse.User);
1659-
return query.get(user.id);
1660-
})
1661-
.then(userAgain => {
1662-
user = userAgain;
1663-
sameUser = new Parse.User();
1664-
sameUser.set('username', 'asdf');
1665-
sameUser.set('password', 'zxcv');
1666-
return sameUser.logIn();
1667-
})
1668-
.then(() => {
1669-
assert(!user.getSessionToken());
1670-
assert(sameUser.getSessionToken());
1671-
sameUser.set('baz', 'qux');
1672-
return sameUser.save();
1673-
})
1674-
.then(() => {
1675-
return Parse.Object.fetchAll([user]);
1676-
})
1677-
.then(() => {
1678-
assert.equal(user.createdAt.getTime(), sameUser.createdAt.getTime());
1679-
assert.equal(user.updatedAt.getTime(), sameUser.updatedAt.getTime());
1680-
return Parse.User.logOut().then(
1681-
() => {
1682-
done();
1683-
},
1684-
() => {
1685-
done();
1686-
}
1687-
);
1688-
})
1689-
.catch(done.fail);
1655+
user.setACL(acl);
1656+
await user.signUp();
1657+
1658+
Parse.User.logOut();
1659+
const query = new Parse.Query(Parse.User);
1660+
user = await query.get(user.id);
1661+
1662+
const sameUser = new Parse.User();
1663+
sameUser.set('username', 'asdf');
1664+
sameUser.set('password', 'zxcv');
1665+
sameUser.setACL(acl);
1666+
await sameUser.logIn();
1667+
1668+
assert(!user.getSessionToken());
1669+
assert(sameUser.getSessionToken());
1670+
sameUser.set('baz', 'qux');
1671+
await sameUser.save();
1672+
1673+
await Parse.Object.fetchAll([user]);
1674+
assert.equal(user.createdAt.getTime(), sameUser.createdAt.getTime());
1675+
assert.equal(user.updatedAt.getTime(), sameUser.updatedAt.getTime());
1676+
await Parse.User.logOut();
16901677
});
16911678

16921679
it('can fetchAllIfNeededWithInclude', async () => {

integration/test/ParseQueryTest.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,15 @@ describe('Parse Query', () => {
7171
assert.strictEqual(result.className, 'TestObject');
7272
assert.strictEqual(result.objectId, object.id);
7373

74-
await query.each((obj) => {
75-
assert.strictEqual(obj instanceof Parse.Object, false);
76-
assert.strictEqual(obj.foo, 'bar');
77-
assert.strictEqual(obj.className, 'TestObject');
78-
assert.strictEqual(obj.objectId, object.id);
79-
}, { json: true });
74+
await query.each(
75+
obj => {
76+
assert.strictEqual(obj instanceof Parse.Object, false);
77+
assert.strictEqual(obj.foo, 'bar');
78+
assert.strictEqual(obj.className, 'TestObject');
79+
assert.strictEqual(obj.objectId, object.id);
80+
},
81+
{ json: true }
82+
);
8083
});
8184

8285
it('can do query with count', async () => {

integration/test/ParseUserTest.js

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -521,26 +521,24 @@ describe('Parse User', () => {
521521
});
522522
});
523523

524-
it('can count users', done => {
524+
it('can count users', async () => {
525525
const james = new Parse.User();
526526
james.set('username', 'james');
527527
james.set('password', 'mypass');
528-
james
529-
.signUp()
530-
.then(() => {
531-
const kevin = new Parse.User();
532-
kevin.set('username', 'kevin');
533-
kevin.set('password', 'mypass');
534-
return kevin.signUp();
535-
})
536-
.then(() => {
537-
const query = new Parse.Query(Parse.User);
538-
return query.count();
539-
})
540-
.then(c => {
541-
assert.equal(c, 2);
542-
done();
543-
});
528+
const acl = new Parse.ACL();
529+
acl.setPublicReadAccess(true);
530+
james.setACL(acl);
531+
await james.signUp();
532+
const kevin = new Parse.User();
533+
kevin.set('username', 'kevin');
534+
kevin.set('password', 'mypass');
535+
kevin.setACL(acl);
536+
await kevin.signUp();
537+
538+
const query = new Parse.Query(Parse.User);
539+
const c = await query.count();
540+
541+
assert.equal(c, 2);
544542
});
545543

546544
it('can sign up user with container class', done => {

src/StorageController.react-native.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const StorageController = {
4040

4141
removeItemAsync(path: string): Promise {
4242
return new Promise((resolve, reject) => {
43-
CoreManager.getAsyncStorage().removeItem(path, (err) => {
43+
CoreManager.getAsyncStorage().removeItem(path, err => {
4444
if (err) {
4545
reject(err);
4646
} else {
@@ -76,7 +76,7 @@ const StorageController = {
7676

7777
multiRemove(keys: Array<string>): Promise {
7878
return new Promise((resolve, reject) => {
79-
CoreManager.getAsyncStorage().multiRemove(keys, (err) => {
79+
CoreManager.getAsyncStorage().multiRemove(keys, err => {
8080
if (err) {
8181
reject(err);
8282
} else {

src/__tests__/LiveQueryClient-test.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,12 @@ describe('LiveQueryClient', () => {
369369

370370
try {
371371
liveQueryClient._handleWebSocketMessage(event);
372-
await Promise.all([subscription.connectPromise, subscription.subscribePromise, liveQueryClient.connectPromise, liveQueryClient.subscribePromise]);
372+
await Promise.all([
373+
subscription.connectPromise,
374+
subscription.subscribePromise,
375+
liveQueryClient.connectPromise,
376+
liveQueryClient.subscribePromise,
377+
]);
373378
} catch (e) {
374379
expect(e.message).toEqual('error thrown');
375380
}

src/__tests__/ParseQuery-test.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,12 +1377,15 @@ describe('ParseQuery', () => {
13771377
expect(result.name).toEqual('Product 3');
13781378
expect(result.className).toEqual('Item');
13791379

1380-
await q.each((obj) => {
1381-
expect(obj.objectId).toBe('I1');
1382-
expect(obj.size).toBe('small');
1383-
expect(obj.name).toEqual('Product 3');
1384-
expect(obj.className).toEqual('Item');
1385-
}, { json: true });
1380+
await q.each(
1381+
obj => {
1382+
expect(obj.objectId).toBe('I1');
1383+
expect(obj.size).toBe('small');
1384+
expect(obj.name).toEqual('Product 3');
1385+
expect(obj.className).toEqual('Item');
1386+
},
1387+
{ json: true }
1388+
);
13861389
});
13871390

13881391
it('will error when getting a nonexistent object', done => {

0 commit comments

Comments
 (0)