Next attempt

Author: schmidt-sebastian

integration/firestore/firebase_export.ts

@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 
-import * as firebase from 'firebase';
+import * as firebase from 'firebase/app';
+import 'firebase/firestore';
 
 // This file replaces "packages/firestore/test/integration/util/firebase_export"
 // and depends on the minified sources.

integration/firestore/firebase_export_memory.ts

@@ -0,0 +1,57 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import * as firebase from 'firebase/app';
+import 'firebase/firestore/memory';
+
+// This file replaces "packages/firestore/test/integration/util/firebase_export"
+// and depends on the minified sources.
+
+let appCount = 0;
+
+export function newTestFirestore(
+  projectId: string,
+  nameOrApp?: string | firebase.app.App,
+  settings?: firebase.firestore.Settings
+): firebase.firestore.Firestore {
+  if (nameOrApp === undefined) {
+    nameOrApp = 'test-app-' + appCount++;
+  }
+  const app =
+    typeof nameOrApp === 'string'
+      ? firebase.initializeApp({ apiKey: 'fake-api-key', projectId }, nameOrApp)
+      : nameOrApp;
+
+  const firestore = firebase.firestore(app);
+  if (settings) {
+    firestore.settings(settings);
+  }
+  return firestore;
+}
+
+export function usesFunctionalApi(): false {
+  return false;
+}
+
+const Firestore = firebase.firestore.Firestore;
+const FieldPath = firebase.firestore.FieldPath;
+const Timestamp = firebase.firestore.Timestamp;
+const GeoPoint = firebase.firestore.GeoPoint;
+const FieldValue = firebase.firestore.FieldValue;
+const Blob = firebase.firestore.Blob;
+
+export { Firestore, FieldValue, FieldPath, Timestamp, Blob, GeoPoint };

integration/firestore/gulpfile.js

@@ -38,17 +38,9 @@ function copyTests() {
    * Therefore these tests and helpers cannot have any src/ dependencies.
    */
   const testBase = resolve(__dirname, '../../packages/firestore/test');
-  const firebaseAppSdk = 'firebase/app/dist/index.esm.js';
-  const firebaseFirestoreSdk = resolve(
-    __dirname,
-    isPersistenceEnabled()
-      ? '../../packages/firestore/dist/index.esm.js'
-      : '../../packages/firestore/dist/index.memory.esm.js'
-  );
   return gulp
     .src(
       [
-        'firebase_export.ts',
         testBase + '/integration/api/*.ts',
         testBase + '/integration/util/events_accumulator.ts',
         testBase + '/integration/util/helpers.ts',
@@ -72,7 +64,9 @@ function copyTests() {
         /import\s+\* as firebaseExport\s+from\s+('|")[^\1]+firebase_export\1;?/,
         `import * as firebaseExport from '${resolve(
           __dirname,
-          './firebase_export'
+          isPersistenceEnabled()
+            ? './firebase_export'
+            : './firebase_export_memory'
         )}';
         
          if (typeof process === 'undefined') {
@@ -82,13 +76,6 @@ function copyTests() {
          }`
       )
     )
-    .pipe(
-      replace(
-        'import * as firebase from "firebase";',
-        `import firebase from '${firebaseAppSdk}';
-         import '${firebaseFirestoreSdk}';`
-      )
-    )
     .pipe(
       /**
        * Fixing the project.json require to properly reference the file

integration/firestore/package.json

@@ -11,7 +11,7 @@
     "test:persistence": " yarn build:persistence; karma start --single-run",
     "test:memory": "yarn build:memory; karma start --single-run",
     "test:debug:persistence": "yarn build:deps; yarn build:persistence; karma start --auto-watch --browsers Chrome",
-    "test:debug:memory": "yarn build:deps; yarn build:memory; karma start --single-run"
+    "test:debug:memory": "yarn build:deps; yarn build:memory; karma start --auto-watch --browsers Chrome"
   },
   "devDependencies": {
     "@types/mocha": "7.0.2",

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

@@ -155,7 +155,7 @@ describe('doc', () => {
   it('validates path', () => {
     return withTestDb(db => {
       expect(() => doc(db, 'coll')).to.throw(
-        'Invalid document path (coll). Path points to a collection.'
+        'Invalid document reference. Document references must have an even number of segments, but coll has 1.'
       );
       expect(() => doc(db, '')).to.throw(
         'Function doc() requires its second argument to be of type non-empty string, but it was: ""'
@@ -191,7 +191,7 @@ describe('collection', () => {
   it('validates path', () => {
     return withTestDb(db => {
       expect(() => collection(db, 'coll/doc')).to.throw(
-        'Invalid collection path (coll/doc). Path points to a document.'
+        'Invalid collection reference. Collection references must have an odd number of segments, but coll/doc has 2.'
       );
       // TODO(firestorelite): Explore returning a more helpful message
       // (e.g. "Empty document paths are not supported.")