Imports

Author: schmidt-sebastian

packages/firestore/lite/test/helpers.ts

@@ -17,10 +17,9 @@
 
 import { initializeApp } from '@firebase/app-exp';
 
-import * as firestore from '../index';
+import * as firestore from '../../lite-types';
 
-import { initializeFirestore } from '../src/api/database';
-import { doc, collection, setDoc } from '../src/api/reference';
+import { initializeFirestore, doc, collection, setDoc } from '..';
 import {
   DEFAULT_PROJECT_ID,
   DEFAULT_SETTINGS

packages/firestore/lite/test/integration.test.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import * as firestore from '../index';
+import * as firestore from '../../lite-types';
 
 import { initializeApp } from '@firebase/app-exp';
 import { expect, use } from 'chai';
@@ -52,25 +52,23 @@ import {
   refEqual,
   queryEqual,
   collectionGroup,
-  getQuery
-} from '../src/api/reference';
-import { FieldPath } from '../src/api/field_path';
-import {
-  DEFAULT_PROJECT_ID,
-  DEFAULT_SETTINGS
-} from '../../test/integration/util/settings';
-import { writeBatch } from '../src/api/write_batch';
-import { runTransaction } from '../src/api/transaction';
-import { expectEqual, expectNotEqual } from '../../test/util/helpers';
-import { snapshotEqual } from '../src/api/snapshot';
-import {
+  getQuery,
+  FieldPath,
+  writeBatch,
+  runTransaction,
+  snapshotEqual,
   FieldValue,
   deleteField,
   increment,
   serverTimestamp,
   arrayUnion,
   arrayRemove
-} from '../src/api/field_value';
+} from '..';
+import {
+  DEFAULT_PROJECT_ID,
+  DEFAULT_SETTINGS
+} from '../../test/integration/util/settings';
+import { expectEqual, expectNotEqual } from '../../test/util/helpers';
 import { Timestamp } from '../../src/api/timestamp';
 
 use(chaiAsPromised);

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

@@ -776,7 +776,9 @@ apiDescribe('Validation:', (persistence: boolean) => {
       expect(() =>
         collection.where('test', '==', { test: FieldValue.arrayUnion(1) })
       ).to.throw(
-        'Function Query.where() called with invalid data. ' +
+        `Function ${
+          usesFunctionalApi() ? 'where' : 'Query.where'
+        }() called with invalid data. ` +
           `${
             usesFunctionalApi() ? 'arrayUnion' : 'FieldValue.arrayUnion'
           }() can only be used with update() and set() (found in field test)`
@@ -785,7 +787,9 @@ apiDescribe('Validation:', (persistence: boolean) => {
       expect(() =>
         collection.where('test', '==', { test: FieldValue.arrayRemove(1) })
       ).to.throw(
-        'Function Query.where() called with invalid data. ' +
+        `Function ${
+          usesFunctionalApi() ? 'where' : 'Query.where'
+        }() called with invalid data. ` +
           `${
             usesFunctionalApi() ? 'arrayRemove' : 'FieldValue.arrayRemove'
           }() can only be used with update() and set() (found in field test)`
@@ -862,7 +866,9 @@ apiDescribe('Validation:', (persistence: boolean) => {
       expect(() =>
         collection.where('test', '==', { test: FieldValue.increment(1) })
       ).to.throw(
-        'Function Query.where() called with invalid data. ' +
+        `Function ${
+          usesFunctionalApi() ? 'where' : 'Query.where'
+        }() called with invalid data. ` +
           `${
             usesFunctionalApi() ? 'increment' : 'FieldValue.increment'
           }() can only be used with update() and set() (found in field test)`