Skip to content

Commit 91f720d

Browse files
committed
remove unnecessary resumeToken test
1 parent a9bee4e commit 91f720d

File tree

3 files changed

+48
-48
lines changed

3 files changed

+48
-48
lines changed

packages/firestore/src/core/event_manager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ export class QueryListener {
372372
return false;
373373
}
374374

375-
// Raise data from cache if we have any documents or resume token,
375+
// Raise data from cache if we have any documents, have cached results before,
376376
// or we are offline.
377377
return (
378378
!snap.docs.isEmpty() ||

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

Lines changed: 45 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ import {
2525
} from '../../../src';
2626
import { EmulatorAuthCredentialsProvider } from '../../../src/api/credentials';
2727
import { User } from '../../../src/auth/user';
28-
import { encodeBase64 } from '../../../src/platform/base64';
29-
import { ByteString } from '../../../src/util/byte_string';
3028
import {
3129
collectionReference,
3230
documentReference,
@@ -179,48 +177,51 @@ describe('QuerySnapshot', () => {
179177
querySnapshot('foo', {}, { a: { a: 1 } }, keys('foo/a'), false, true)
180178
)
181179
).to.be.false;
182-
});
183-
184-
it('resume token should not effect querySnapshot equality', () => {
185-
const resumeToken1 = ByteString.fromBase64String(
186-
encodeBase64('ResumeToken1')
187-
);
188-
const resumeToken1Copy = ByteString.fromBase64String(
189-
encodeBase64('ResumeToken1')
190-
);
191-
const resumeToken2 = ByteString.fromBase64String(
192-
encodeBase64('ResumeToken2')
193-
);
194-
195-
const snapshot1 = querySnapshot(
196-
'foo',
197-
{},
198-
{ a: { a: 1 } },
199-
keys(),
200-
false,
201-
false,
202-
resumeToken1
203-
);
204-
const snapshot1Copy = querySnapshot(
205-
'foo',
206-
{},
207-
{ a: { a: 1 } },
208-
keys(),
209-
false,
210-
false,
211-
resumeToken1Copy
212-
);
213-
const snapshot2 = querySnapshot(
214-
'foo',
215-
{},
216-
{ a: { a: 1 } },
217-
keys(),
218-
false,
219-
false,
220-
resumeToken2
221-
);
222-
expect(snapshotEqual(snapshot1, snapshot1Copy)).to.be.true;
223-
expect(snapshotEqual(snapshot1, snapshot2)).to.be.true;
180+
// hasCachedResults should effect querySnapshot equality
181+
expect(
182+
snapshotEqual(
183+
querySnapshot(
184+
'foo',
185+
{},
186+
{ a: { a: 1 } },
187+
keys('foo/a'),
188+
false,
189+
false,
190+
true
191+
),
192+
querySnapshot(
193+
'foo',
194+
{},
195+
{ a: { a: 1 } },
196+
keys('foo/a'),
197+
false,
198+
false,
199+
true
200+
)
201+
)
202+
).to.be.true;
203+
expect(
204+
snapshotEqual(
205+
querySnapshot(
206+
'foo',
207+
{},
208+
{ a: { a: 1 } },
209+
keys('foo/a'),
210+
false,
211+
false,
212+
true
213+
),
214+
querySnapshot(
215+
'foo',
216+
{},
217+
{ a: { a: 1 } },
218+
keys('foo/a'),
219+
false,
220+
false,
221+
false
222+
)
223+
)
224+
).to.be.false;
224225
});
225226

226227
it('JSON.stringify() does not throw', () => {

packages/firestore/test/util/api_helpers.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ import {
4343
import { DocumentKeySet } from '../../src/model/collections';
4444
import { DocumentSet } from '../../src/model/document_set';
4545
import { JsonObject } from '../../src/model/object_value';
46-
import { ByteString } from '../../src/util/byte_string';
4746
import { TEST_PROJECT } from '../unit/local/persistence_test_helpers';
4847

4948
import { doc, key, path as pathFrom } from './helpers';
@@ -132,7 +131,7 @@ export function querySnapshot(
132131
mutatedKeys: DocumentKeySet,
133132
fromCache: boolean,
134133
syncStateChanged: boolean,
135-
resumeToken?: ByteString
134+
hasCachedResults?: boolean
136135
): QuerySnapshot {
137136
const query: InternalQuery = newQueryForPath(pathFrom(path));
138137
let oldDocuments: DocumentSet = new DocumentSet();
@@ -155,7 +154,7 @@ export function querySnapshot(
155154
fromCache,
156155
syncStateChanged,
157156
false,
158-
resumeToken !== undefined && resumeToken.approximateByteSize() > 0
157+
hasCachedResults ?? false
159158
);
160159
const db = firestore();
161160
return new QuerySnapshot(

0 commit comments

Comments
 (0)