Remove now duplicate firestore-exp test run (#4073)

Author: schmidt-sebastian

packages/firestore/exp/test/bootstrap.ts

@@ -29,15 +29,9 @@
     "test:lite:prod": "node ./scripts/run-tests.js --platform node_lite --main=lite/index.ts 'lite/test/**/*.test.ts'",
     "test:lite:browser": "karma start --single-run --lite",
     "test:lite:browser:debug": "karma start --browsers=Chrome --lite --auto-watch",
-    "test:exp": "node ./scripts/run-tests.js --emulator --main=exp/index.ts test/integration/api/*.test.ts",
-    "test:exp:prod": "node ./scripts/run-tests.js --main=exp/index.ts test/integration/api/*.test.ts",
-    "test:exp:persistence": "node ./scripts/run-tests.js --emulator --persistence --main=exp/index.ts test/integration/api/*.test.ts",
-    "test:exp:persistence:prod": "node ./scripts/run-tests.js --persistence --main=exp/index.ts test/integration/api/*.test.ts",
-    "test:exp:browser": "karma start --single-run --exp",
-    "test:exp:browser:debug": "karma start --browsers=Chrome --exp --auto-watch",
     "test": "run-s lint test:all",
     "test:ci": "node ../../scripts/run_tests_in_ci.js -s test:all",
-    "test:all": "run-p test:browser test:lite:browser test:exp:browser test:travis test:minified",
+    "test:all": "run-p test:browser test:lite:browser test:travis test:minified",
     "test:browser": "karma start --single-run",
     "test:browser:debug": "karma start --browsers=Chrome --auto-watch",
     "test:node": "node ./scripts/run-tests.js  --main=index.node.ts  --emulator 'test/{,!(browser)/**/}*.test.ts'",

packages/firestore/exp/test/shim.ts

@@ -15,43 +15,22 @@
  * limitations under the License.
  */
 
-// Imports firebase via the raw sources and re-exports it.
-// This file exists for two reasons:
-// - It serves as a single entry point to all Firebase types and can return
-//   the leagcy SDK types directly (if `firebase.firestore` exists), or wrapping
-//   types that use the firebase-exp SDK.
-// - It can be replaced by the "<repo-root>/integration/firestore" test suite
-//   with a reference to the minified sources.
-//
-// If you change any exports in this file, you need to also adjust
-// "integration/firestore/firebase_export.ts".
+// Imports firebase via the raw sources and re-exports it. The
+// "<repo-root>/integration/firestore" test suite replaces this file with a
+// reference to the minified sources. If you change any exports in this file,
+// you need to also adjust "integration/firestore/firebase_export.ts".
 
 import * as firestore from '@firebase/firestore-types';
 
 import firebase from '@firebase/app';
-// eslint-disable-next-line import/no-extraneous-dependencies
-import firebaseAppCompat from '@firebase/app-compat';
 
-import * as exp from '../../../exp/test/shim';
 import { FieldValue } from '../../../src/compat/field_value';
 import { FieldPath } from '../../../src/api/field_path';
+import { Timestamp } from '../../../src/api/timestamp';
+import { Blob } from '../../../src/api/blob';
+import { GeoPoint } from '../../../src/api/geo_point';
 import { FirebaseApp } from '@firebase/app-types';
-import {
-  Firestore,
-  IndexedDbPersistenceProvider
-} from '../../../src/api/database';
-import { getFirestore } from '../../../exp/src/api/database';
-
-/**
- * Detects whether we are running against the functionial (tree-shakeable)
- * Firestore API. Used to exclude some tests, e.g. those that validate invalid
- * TypeScript input.
- */
-function usesFunctionalApi(): boolean {
-  // Use the firebase namespace to detect if `firebase.firestore` has been
-  // registered, which is only registered in the classic version of Firestore.
-  return !('firestore' in firebase);
-}
+import { Firestore } from '../../../src/api/database';
 
 // TODO(dimond): Right now we create a new app and Firestore instance for
 // every test and never clean them up. We may need to revisit.
@@ -70,56 +49,22 @@ export function newTestFirestore(
     nameOrApp = 'test-app-' + appCount++;
   }
 
-  let firestore: firestore.FirebaseFirestore;
-  if (usesFunctionalApi()) {
-    const app =
-      typeof nameOrApp === 'string'
-        ? firebaseAppCompat.initializeApp(
-            {
-              apiKey: 'fake-api-key',
-              projectId
-            },
-            nameOrApp
-          )
-        : nameOrApp;
-
-    firestore = new Firestore(
-      app,
-      getFirestore(app),
-      new IndexedDbPersistenceProvider()
-    );
-  } else {
-    const app =
-      typeof nameOrApp === 'string'
-        ? firebase.initializeApp(
-            {
-              apiKey: 'fake-api-key',
-              projectId
-            },
-            nameOrApp
-          )
-        : nameOrApp;
-
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    firestore = (firebase as any).firestore(app);
-  }
+  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;
 }
 
-// We only register firebase.firestore if the tests are run against the
-// legacy SDK. To prevent a compile-time error with the firestore-exp
-// SDK, we cast to `any`.
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const legacyNamespace = (firebase as any).firestore;
-
-const Timestamp = usesFunctionalApi()
-  ? exp.Timestamp
-  : legacyNamespace.Timestamp;
-const GeoPoint = usesFunctionalApi() ? exp.GeoPoint : legacyNamespace.GeoPoint;
-const Blob = usesFunctionalApi() ? exp.Blob : legacyNamespace.Blob;
-
 export { Firestore, FieldValue, FieldPath, Timestamp, Blob, GeoPoint };

packages/firestore/package.json

@@ -43,13 +43,11 @@ function runTest(port: number, projectId: string, withPersistence: boolean) {
   if (withPersistence) {
     childProcesses.push(
       spawn('yarn', ['test:node:persistence:prod'], options),
-      spawn('yarn', ['test:exp:persistence:prod'], options),
       spawn('yarn', ['test:lite:prod'], options)
     );
   } else {
     childProcesses.push(
       spawn('yarn', ['test:node:prod'], options),
-      spawn('yarn', ['test:exp:prod'], options),
       spawn('yarn', ['test:lite:prod'], options)
     );
   }