Skip to content

Commit b60db7a

Browse files
Unit test fix
1 parent d43f0d0 commit b60db7a

File tree

1 file changed

+12
-28
lines changed

1 file changed

+12
-28
lines changed

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

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,8 @@
1616
*/
1717

1818
import { expect } from 'chai';
19-
import {
20-
changesFromSnapshot,
21-
QueryDocumentSnapshot,
22-
SnapshotMetadata
23-
} from '../../../src/api/database';
24-
import { QueryDocumentSnapshot as ExpQueryDocumentSnapshot } from '../../../exp/src/api/snapshot';
25-
import { Query } from '../../../src/core/query';
19+
import { QuerySnapshot } from '../../../exp/src/api/snapshot';
20+
import { Query as InternalQuery } from '../../../src/core/query';
2621
import { View } from '../../../src/core/view';
2722
import { documentKeySet } from '../../../src/model/collections';
2823
import { Document } from '../../../src/model/document';
@@ -36,13 +31,11 @@ import {
3631
query
3732
} from '../../util/helpers';
3833
import { firestore } from '../../util/api_helpers';
39-
import { UserDataWriter } from '../../../src/api/user_data_writer';
40-
41-
const userDataWriter = new UserDataWriter(firestore());
34+
import { ExpUserDataWriter, Query } from '../../../exp/src/api/reference';
4235

4336
describe('DocumentChange:', () => {
4437
function expectPositions(
45-
query: Query,
38+
query: InternalQuery,
4639
initialDocs: Document[],
4740
updates: Array<Document | DocumentKey>
4841
): void {
@@ -58,29 +51,20 @@ describe('DocumentChange:', () => {
5851
const expected = documentSetAsArray(updatedSnapshot.docs);
5952
const actual = documentSetAsArray(initialSnapshot.docs);
6053

61-
const changes = changesFromSnapshot(
62-
updatedSnapshot,
63-
true,
64-
(doc, fromCache, hasPendingWrite) =>
65-
new QueryDocumentSnapshot(
66-
firestore(),
67-
new ExpQueryDocumentSnapshot(
68-
firestore()._delegate,
69-
userDataWriter,
70-
doc.key,
71-
doc,
72-
new SnapshotMetadata(hasPendingWrite, fromCache),
73-
/* converter= */ null
74-
)
75-
)
54+
const db = firestore()._delegate;
55+
const snapshot = new QuerySnapshot(
56+
db,
57+
new ExpUserDataWriter(db),
58+
new Query(db, /* converter= */ null, query),
59+
updatedSnapshot
7660
);
7761

78-
for (const change of changes) {
62+
for (const change of snapshot.docChanges()) {
7963
if (change.type !== 'added') {
8064
actual.splice(change.oldIndex, 1);
8165
}
8266
if (change.type !== 'removed') {
83-
actual.splice(change.newIndex, 0, change.doc._delegate._document!);
67+
actual.splice(change.newIndex, 0, change.doc._document!);
8468
}
8569
}
8670

0 commit comments

Comments
 (0)