getPrivateSettings and tests

Author: DellaBitta

packages/firestore/src/lite-api/database.ts

@@ -130,7 +130,11 @@ export class Firestore implements FirestoreService {
     }
   }
 
-  _getSettings(): PrivateSettings {
+  _getSettings(): FirestoreSettingsImpl {
+    return this._settings;
+  }
+
+  _getPrivateSettings(): PrivateSettings {
     const privateSettings: PrivateSettings = {
       ...this._settings,
       emulatorOptions: this._emulatorOptions
@@ -328,7 +332,7 @@ export function connectFirestoreEmulator(
   } = {}
 ): void {
   firestore = cast(firestore, Firestore);
-  const settings = firestore._getSettings();
+  const settings = firestore._getPrivateSettings();
   const newHostSetting = `${host}:${port}`;
 
   if (settings.host !== DEFAULT_HOST && settings.host !== newHostSetting) {

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

@@ -179,7 +179,7 @@ apiDescribe('Validation:', persistence => {
 
     validationIt(
       persistence,
-      'disallows calling connectFirestoreEmulator() after use',
+      'disallows calling connectFirestoreEmulator() for first time after use',
       async db => {
         const errorMsg =
           'Firestore has already been started and its settings can no longer be changed.';
@@ -191,6 +191,32 @@ apiDescribe('Validation:', persistence => {
       }
     );
 
+    validationIt(
+      persistence,
+      'allows calling connectFirestoreEmulator() after use with same config',
+      async db => {
+        connectFirestoreEmulator(db, '127.0.0.1', 9000);
+        await setDoc(doc(db, 'foo/bar'), {});
+        expect(() =>
+          connectFirestoreEmulator(db, '127.0.0.1', 9000)
+        ).to.not.throw();
+      }
+    );
+
+    validationIt(
+      persistence,
+      'disallows calling connectFirestoreEmulator() after use with different config',
+      async db => {
+        const errorMsg =
+          'Firestore has already been started and its settings can no longer be changed.';
+        connectFirestoreEmulator(db, '127.0.0.1', 9000);
+        await setDoc(doc(db, 'foo/bar'), {});
+        expect(() => connectFirestoreEmulator(db, '127.0.0.1', 9001)).to.throw(
+          errorMsg
+        );
+      }
+    );
+
     validationIt(
       persistence,
       'connectFirestoreEmulator() can set mockUserToken object',

packages/firestore/test/unit/api/database.test.ts

@@ -553,6 +553,19 @@ describe('Settings', () => {
     expect(db._getSettings().ssl).to.be.false;
   });
 
+  it('gets privateSettings from useEmulator', () => {
+    // Use a new instance of Firestore in order to configure settings.
+    const db = newTestFirestore();
+    const emulatorOptions = { mockUserToken: 'test' };
+    connectFirestoreEmulator(db, '127.0.0.1', 9000, emulatorOptions);
+
+    expect(db._getPrivateSettings().host).to.exist.and.to.equal(
+      '127.0.0.1:9000'
+    );
+    expect(db._getPrivateSettings().ssl).to.exist.and.to.be.false;
+    expect(db._getPrivateSettings().emulatorOptions).to.equal(emulatorOptions);
+  });
+
   it('prefers host from useEmulator to host from settings', () => {
     // Use a new instance of Firestore in order to configure settings.
     const db = newTestFirestore();