Add Browser tests for Lite and Exp

schmidt-sebastian · schmidt-sebastian · commit 1bc1f98df036 · 2020-07-21T15:39:07.000-07:00
diff --git a/config/karma.base.js b/config/karma.base.js
@@ -58,8 +58,7 @@ const config = {
   // available preprocessors:
   // https://npmjs.org/browse/keyword/karma-preprocessor
   preprocessors: {
-    'test/**/*.ts': ['webpack', 'sourcemap'],
-    'src/**/*.test.ts': ['webpack', 'sourcemap']
+    '**/test/**/*.ts': ['webpack', 'sourcemap']
   },
 
   mime: { 'text/x-typescript': ['ts', 'tsx'] },
diff --git a/packages/firestore/exp/test/bootstrap.ts b/packages/firestore/exp/test/bootstrap.ts
@@ -0,0 +1,35 @@
+/**
+ * @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 '../';
+
+/**
+ * This will include all of the test files and compile them as needed
+ *
+ * Taken from karma-webpack source:
+ * https://github.com/webpack-contrib/karma-webpack#alternative-usage
+ */
+
+// 'context()' definition requires additional dependency on webpack-env package.
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const testsContext = (require as any).context(
+  '../../test/integration/api',
+  true,
+  /^*\.test$/
+);
+const browserTests = testsContext.keys();
+browserTests.forEach(testsContext);
diff --git a/packages/firestore/exp/test/deps/verify_dependencies.test.ts b/packages/firestore/exp/test/deps/verify_dependencies.test.ts
diff --git a/packages/firestore/index.console.ts b/packages/firestore/index.console.ts
@@ -20,14 +20,14 @@
 
 export { Firestore, FirestoreDatabase } from './src/api/database';
 export {
-  PublicCollectionReference as CollectionReference,
-  PublicDocumentReference as DocumentReference,
-  PublicDocumentSnapshot as DocumentSnapshot,
-  PublicQuerySnapshot as QuerySnapshot,
-  PublicFieldValue as FieldValue,
-  PublicBlob as Blob
-} from './src/config';
+  CollectionReference,
+  DocumentReference,
+  DocumentSnapshot,
+  QuerySnapshot
+} from './src/api/database';
+export { Blob } from './src/api/blob';
 export { GeoPoint } from './src/api/geo_point';
 export { FirstPartyCredentialsSettings } from './src/api/credentials';
 export { FieldPath } from './src/api/field_path';
+export { FieldValue } from './src/api/field_value';
 export { Timestamp } from './src/api/timestamp';
diff --git a/packages/firestore/karma.conf.js b/packages/firestore/karma.conf.js
@@ -41,13 +41,22 @@ module.exports = function (config) {
  */
 function getTestFiles(argv) {
   const unitTests = 'test/unit/bootstrap.ts';
-  const integrationTests = 'test/integration/bootstrap.ts';
+  const legcayIntegrationTests = 'test/integration/bootstrap.ts';
+  const liteIntegrationTests = 'lite/test/bootstrap.ts';
+  const expIntegrationTests = 'exp/test/bootstrap.ts';
   if (argv.unit) {
     return [unitTests];
   } else if (argv.integration) {
-    return [integrationTests];
+    return [legcayIntegrationTests];
+  } else if (argv.lite) {
+    return [liteIntegrationTests];
+  } else if (argv.exp) {
+    return [expIntegrationTests];
   } else {
-    return [unitTests, integrationTests];
+    // Note that we cannot include both the firestore-exp and the legacy SDK
+    // as the test runners modify the global namespace cannot be both included
+    // in the same bundle.
+    return [unitTests, legcayIntegrationTests];
   }
 }
 
diff --git a/packages/firestore/lite/test/bootstrap.ts b/packages/firestore/lite/test/bootstrap.ts
@@ -0,0 +1,31 @@
+/**
+ * @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 '../index';
+
+/**
+ * This will include all of the test files and compile them as needed
+ *
+ * Taken from karma-webpack source:
+ * https://github.com/webpack-contrib/karma-webpack#alternative-usage
+ */
+
+// 'context()' definition requires additional dependency on webpack-env package.
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const testsContext = (require as any).context('.', true, /^.*\.test$/);
+const browserTests = testsContext.keys();
+browserTests.forEach(testsContext);
diff --git a/packages/firestore/lite/test/verify_dependencies.test.ts b/packages/firestore/lite/test/verify_dependencies.test.ts
diff --git a/packages/firestore/package.json b/packages/firestore/package.json
@@ -26,11 +26,16 @@
     "gendeps:exp": "../../scripts/exp/extract-deps.sh --types ./exp/index.d.ts --bundle ./dist/exp/index.node.esm2017.js --output ./exp/test/deps/dependencies.json",
     "pregendeps:lite": "yarn build:lite",
     "gendeps:lite": "../../scripts/exp/extract-deps.sh --types ./lite/index.d.ts --bundle ./dist/lite/index.node.esm2017.js --output ./lite/test/dependencies.json",
+    "test:lite": "TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'lite/test/**/*.test.ts' --file lite/index.ts --config ../../config/mocharc.node.js",
+    "test:lite:browser": "karma start --single-run --lite",
+    "test:lite:browser:debug": "karma start --single-run --lite --auto-watch",
     "test:exp": "TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/integration/api/*.test.ts' --file exp/index.ts --config ../../config/mocharc.node.js",
     "test:exp:persistence": "USE_MOCK_PERSISTENCE=YES TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/integration/api/*.test.ts' --require ts-node/register --require exp/index.ts --require test/util/node_persistence.ts  --config ../../config/mocharc.node.js",
+    "test:exp:browser": "karma start --single-run --exp",
+    "test:exp:browser:debug": "karma start --single-run --exp --auto-watch",
     "test": "run-s lint test:all",
     "test:ci": "node ../../scripts/run_tests_in_ci.js",
-    "test:all": "run-p test:browser test:travis test:minified test:exp test:lite",
+    "test:all": "run-p test:browser test:lite:browser test:exp:browser test:travis test:minified test:exp",
     "test:browser": "karma start --single-run",
     "test:browser:debug": "karma start --browsers=Chrome --auto-watch",
     "test:node": "FIRESTORE_EMULATOR_PORT=8080 FIRESTORE_EMULATOR_PROJECT_ID=test-emulator TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --file index.node.ts --config ../../config/mocharc.node.js",
@@ -39,8 +44,6 @@
     "test:node:persistence:prod": "USE_MOCK_PERSISTENCE=YES TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --require ts-node/register --require index.node.ts --require test/util/node_persistence.ts --config ../../config/mocharc.node.js",
     "test:travis": "ts-node --compiler-options='{\"module\":\"commonjs\"}' ../../scripts/emulator-testing/firestore-test-runner.ts",
     "test:minified": "(cd ../../integration/firestore ; yarn test)",
-    "pretest:lite": "yarn build:lite",
-    "test:lite": "TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'lite/test/**/*.test.ts' --file lite/index.ts --config ../../config/mocharc.node.js",
     "prepare": "yarn build:release"
   },
   "main": "dist/index.node.cjs.js",
diff --git a/packages/firestore/src/platform/browser/webchannel_connection.ts b/packages/firestore/src/platform/browser/webchannel_connection.ts
@@ -62,6 +62,7 @@ const RPC_URL_VERSION = 'v1';
 const RPC_NAME_REST_MAPPING: { [key: string]: string } = {};
 RPC_NAME_REST_MAPPING['BatchGetDocuments'] = 'batchGet';
 RPC_NAME_REST_MAPPING['Commit'] = 'commit';
+RPC_NAME_REST_MAPPING['RunQuery'] = 'runQuery';
 
 // TODO(b/38203344): The SDK_VERSION is set independently from Firebase because
 // we are doing out-of-band releases. Once we release as part of Firebase, we
