Made emulator changes more scalable

Author: maneesht

packages/data-connect/test/unit/queries.test.ts

@@ -22,12 +22,11 @@ import chaiAsPromised from 'chai-as-promised';
 import * as sinon from 'sinon';
 
 import {
-  AuthTokenListener,
-  AuthTokenProvider,
   DataConnectOptions
 } from '../../src';
 import { initializeFetch } from '../../src/network/fetch';
 import { RESTTransport } from '../../src/network/transport/rest';
+import { AuthTokenListener, AuthTokenProvider } from '../../src/core/FirebaseAuthProvider';
 chai.use(chaiAsPromised);
 const options: DataConnectOptions = {
   connector: 'c',

scripts/emulator-testing/emulators/dataconnect-emulator.ts

@@ -15,23 +15,40 @@
  * limitations under the License.
  */
 
+import { platform } from 'os';
 import { Emulator } from './emulator';
 
 const DATABASE_EMULATOR_VERSION = '1.1.17';
 
 export class DataConnectEmulator extends Emulator {
   //   namespace: string;
 
-  constructor(port = 3628, namespace = 'test-emulator') {
+  constructor(port = 3628) {
+    const os = platform();
+    let urlString = '';
+    switch(os) {
+      case 'darwin':
+        urlString = 'https://firebasestorage.googleapis.com/v0/b/firemat-preview-drop/o/emulator%2Fdataconnect-emulator-macos-v1.3.5?alt=media&token=52c3db6e-2a2a-4094-a482-a8c85ae67a88';
+      break;
+      case 'linux':
+        urlString = 'https://firebasestorage.googleapis.com/v0/b/firemat-preview-drop/o/emulator%2Fdataconnect-emulator-linux-v1.3.5?alt=media&token=bafb1f81-2a27-4851-b655-59934985b492';
+      break;
+      case 'win32':
+        urlString = 'https://firebasestorage.googleapis.com/v0/b/firemat-preview-drop/o/emulator%2Fdataconnect-emulator-windows-v1.3.5?alt=media&token=d3d04c57-992f-4a4b-931d-5c90efd54c5a';
+      break;
+      default:
+        throw new Error(`We are unable to support your environment ${os} at this time.`);
+
+      
+    }
     super(
       `cli-v${DATABASE_EMULATOR_VERSION}`,
       // Use locked version of emulator for test to be deterministic.
       // The latest version can be found from database emulator doc:
       // https://firebase.google.com/docs/database/security/test-rules-emulator
-      `https://firebasestorage.googleapis.com/v0/b/firemat-preview-drop/o/emulator%2Fdataconnect-emulator-macos-v1.1.17?alt=media&token=c5e758bc-aaad-4be6-bd41-bcc08f3944a7`,
+      urlString,
       port
     );
-    this.isJar = false;
-    // this.namespace = namespace;
+    this.isDataConnect = true;
   }
 }

scripts/emulator-testing/emulators/emulator.ts

@@ -36,7 +36,7 @@ export abstract class Emulator {
   cacheDirectory: string;
   cacheBinaryPath: string;
 
-  isJar = true;
+  isDataConnect = false;
 
   constructor(
     private binaryName: string,
@@ -96,7 +96,7 @@ export abstract class Emulator {
         throw new Error('You must call download() before setUp()');
       }
       let promise: ChildProcessPromise<SpawnPromiseResult>;
-      if (!this.isJar) {
+      if (this.isDataConnect) {
         promise = spawn(this.binaryPath, [
           'dev',
           '--local_connection_string',