Skip to content

Commit 8fc6c33

Browse files
committed
Timing protection QuerySnapshot tests.
1 parent 2f27429 commit 8fc6c33

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

packages/firestore/test/integration/api/database.test.ts

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,7 +1198,7 @@ apiDescribe('Database', persistence => {
11981198
onSnapshot(docA, () => deferred2.resolve());
11991199
});
12001200
});
1201-
return Promise.all([deferred1.promise, deferred2.promise]).then(() => {});
1201+
return Promise.all([deferred1.promise, deferred2.promise]).then(() => { });
12021202
});
12031203
});
12041204

@@ -1349,35 +1349,35 @@ apiDescribe('Database', persistence => {
13491349
it('QuerySnapshot multiple events for snapshot created by a bundle', function (done) {
13501350
this.timeout(SNAPSHOT_TEST_TIMEOUT);
13511351
const testDocs = {
1352-
a: { foo: false },
1353-
b: { bar: false }
1352+
a: { foo: 0 },
13541353
};
13551354
void withTestCollection(persistence, testDocs, async (coll, db) => {
13561355
const q = query(coll, orderBy(documentId()));
13571356
const querySnap = await getDocs(q);
13581357
const json = querySnap.toJSON();
1359-
const updateFound = new Deferred<void>();
1358+
const firstUpdateFound = new Deferred<void>();
1359+
const secondUpdateFound = new Deferred<void>();
1360+
const docRef = querySnap.docs[0].ref;
13601361
let count = 0;
13611362
const unlisten = onSnapshot(db, json, (querySnap: QuerySnapshot) => {
13621363
const docs = querySnap.docs;
13631364
expect(docs).to.not.be.null;
13641365
if (docs) {
1365-
console.error("DEDB count: ", count, " bar: ", docs[1].data())
1366-
if (count === 0) {
1367-
expect(docs[0].data()).to.deep.equal({ foo: true });
1368-
expect(docs[1].data()).to.deep.equal({ bar: false });
1369-
} else if(count === 1) {
1370-
expect(docs[0].data()).to.deep.equal({ foo: true });
1371-
expect(docs[1].data()).to.deep.equal({ bar: true });
1372-
updateFound.resolve();
1373-
}
1366+
expect(docs[0]).to.exist;
13741367
count++;
1368+
if (docs[0] !== undefined && count === 1) {
1369+
expect(docs[0].data()).to.deep.equal({ foo: 1 });
1370+
firstUpdateFound.resolve();
1371+
} else if (docs[0] !== undefined && count === 2) {
1372+
expect(docs[0].data()).to.deep.equal({ foo: 2 });
1373+
secondUpdateFound.resolve();
1374+
}
13751375
}
13761376
});
1377-
await setDoc(querySnap.docs[0].ref, { foo: true });
1378-
await waitForPendingWrites(db);
1379-
await setDoc(querySnap.docs[1].ref, { bar: true });
1380-
await updateFound.promise;
1377+
await setDoc(docRef, { foo: 1 });
1378+
await firstUpdateFound.promise;
1379+
await setDoc(docRef, { foo: 2 });
1380+
await secondUpdateFound.promise;
13811381
expect(count).to.equal(2);
13821382
unlisten();
13831383
done();
@@ -1421,7 +1421,7 @@ apiDescribe('Database', persistence => {
14211421
const queryForRejection = collection(db, 'a/__badpath__/b');
14221422
onSnapshot(
14231423
queryForRejection,
1424-
() => {},
1424+
() => { },
14251425
(err: Error) => {
14261426
expect(err.name).to.exist;
14271427
expect(err.message).to.exist;
@@ -1438,13 +1438,13 @@ apiDescribe('Database', persistence => {
14381438
const queryForRejection = collection(db, 'a/__badpath__/b');
14391439
onSnapshot(
14401440
queryForRejection,
1441-
() => {},
1441+
() => { },
14421442
(err: Error) => {
14431443
expect(err.name).to.exist;
14441444
expect(err.message).to.exist;
14451445
onSnapshot(
14461446
queryForRejection,
1447-
() => {},
1447+
() => { },
14481448
(err2: Error) => {
14491449
expect(err2.name).to.exist;
14501450
expect(err2.message).to.exist;
@@ -1859,7 +1859,7 @@ apiDescribe('Database', persistence => {
18591859
it('can query after firestore restart', async () => {
18601860
return withTestDoc(persistence, async (docRef, firestore) => {
18611861
const deferred: Deferred<FirestoreError> = new Deferred();
1862-
const unsubscribe = onSnapshot(docRef, snapshot => {}, deferred.resolve);
1862+
const unsubscribe = onSnapshot(docRef, snapshot => { }, deferred.resolve);
18631863

18641864
await firestore._restart();
18651865

@@ -1879,7 +1879,7 @@ apiDescribe('Database', persistence => {
18791879
it('query listener throws error on termination', async () => {
18801880
return withTestDoc(persistence, async (docRef, firestore) => {
18811881
const deferred: Deferred<FirestoreError> = new Deferred();
1882-
const unsubscribe = onSnapshot(docRef, snapshot => {}, deferred.resolve);
1882+
const unsubscribe = onSnapshot(docRef, snapshot => { }, deferred.resolve);
18831883

18841884
await terminate(firestore);
18851885

@@ -1926,7 +1926,7 @@ apiDescribe('Database', persistence => {
19261926
readonly title: string,
19271927
readonly author: string,
19281928
readonly ref: DocumentReference | null = null
1929-
) {}
1929+
) { }
19301930
byline(): string {
19311931
return this.title + ', by ' + this.author;
19321932
}
@@ -2056,8 +2056,8 @@ apiDescribe('Database', persistence => {
20562056
batch.set(ref, { title: 'olive' }, { merge: true })
20572057
).to.throw(
20582058
'Function WriteBatch.set() called with invalid ' +
2059-
'data (via `toFirestore()`). Unsupported field value: undefined ' +
2060-
'(found in field author in document posts/some-post)'
2059+
'data (via `toFirestore()`). Unsupported field value: undefined ' +
2060+
'(found in field author in document posts/some-post)'
20612061
);
20622062
});
20632063
});

0 commit comments

Comments
 (0)