Improve comments and function naming.

Author: tom-andersen

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

@@ -73,7 +73,7 @@ import {
   withTestDbs,
   withTestDoc,
   withTestDocAndInitialData,
-  withNamedTestDbs
+  withNamedTestDbsOrSkipUnlessUsingEmulator
 } from '../util/helpers';
 import { DEFAULT_SETTINGS, DEFAULT_PROJECT_ID } from '../util/settings';
 
@@ -1710,7 +1710,7 @@ apiDescribe('Database', (persistence: boolean) => {
   });
 
   it('can keep docs separate with multi-db when online', () => {
-    return withNamedTestDbs(persistence, ['db1', 'db2'], async ([db1, db2]) => {
+    return withNamedTestDbsOrSkipUnlessUsingEmulator(persistence, ['db1', 'db2'], async ([db1, db2]) => {
       const data = { name: 'Rafi', email: '[email protected]' };
 
       const ref1 = await doc(collection(db1, 'users'), 'doc1');
@@ -1726,7 +1726,7 @@ apiDescribe('Database', (persistence: boolean) => {
   });
 
   it('can keep docs separate with multi-db when offline', () => {
-    return withNamedTestDbs(persistence, ['db1', 'db2'], async ([db1, db2]) => {
+    return withNamedTestDbsOrSkipUnlessUsingEmulator(persistence, ['db1', 'db2'], async ([db1, db2]) => {
       await disableNetwork(db1);
       await disableNetwork(db2);
       const data = { name: 'Rafi', email: '[email protected]' };

packages/firestore/test/integration/util/helpers.ts

@@ -203,14 +203,15 @@ export async function withTestDbsSettings(
   }
 }
 
-export async function withNamedTestDbs(
+export async function withNamedTestDbsOrSkipUnlessUsingEmulator(
   persistence: boolean,
   dbNames: string[],
   fn: (db: Firestore[]) => Promise<void>
 ): Promise<void> {
-  // Named DBs requires preparing project with DBs beforehand.
-  // Emulator does not DB to have been created beforehand.
-  // TODO: Improve integration testing to have more than just (default) available.
+  // Tests with named DBs can only run on emulator for now. This is because the
+  // emulator does not require DB to be created before use.
+  // TODO: Design ability to run named DB tests on backend. Maybe create DBs
+  // TODO: beforehand, or create DBs as part of test setup.
   if (!USE_EMULATOR) {
     return Promise.resolve();
   }