Merge 86bea3c into 6ea51fb

Author: dconeybe

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

@@ -159,17 +159,9 @@ apiDescribe('Count queries', persistence => {
           where('key1', '==', 42),
           where('key2', '<', 42)
         );
-        // TODO(b/316359394) Remove the special logic for non-default databases
-        // once cl/582465034 is rolled out to production.
-        if (coll.firestore._databaseId.isDefaultDatabase) {
-          await expect(
-            getCountFromServer(query_)
-          ).to.be.eventually.rejectedWith(
-            /index.*https:\/\/console\.firebase\.google\.com/
-          );
-        } else {
-          await expect(getCountFromServer(query_)).to.be.eventually.rejected;
-        }
+        await expect(getCountFromServer(query_)).to.be.eventually.rejectedWith(
+          /index.*https:\/\/console\.firebase\.google\.com/
+        );
       });
     }
   );
@@ -371,23 +363,13 @@ apiDescribe('Aggregation queries', persistence => {
           where('key1', '==', 42),
           where('key2', '<', 42)
         );
-        // TODO(b/316359394) Remove the special logic for non-default databases
-        // once cl/582465034 is rolled out to production.
-        if (coll.firestore._databaseId.isDefaultDatabase) {
-          await expect(
-            getAggregateFromServer(query_, {
-              count: count()
-            })
-          ).to.be.eventually.rejectedWith(
-            /index.*https:\/\/console\.firebase\.google\.com/
-          );
-        } else {
-          await expect(
-            getAggregateFromServer(query_, {
-              count: count()
-            })
-          ).to.be.eventually.rejected;
-        }
+        await expect(
+          getAggregateFromServer(query_, {
+            count: count()
+          })
+        ).to.be.eventually.rejectedWith(
+          /index.*https:\/\/console\.firebase\.google\.com/
+        );
       });
     }
   );

packages/firestore/test/lite/integration.test.ts

@@ -2451,15 +2451,9 @@ describe('Count queries', () => {
           where('key1', '==', 42),
           where('key2', '<', 42)
         );
-        // TODO(b/316359394) Remove the special logic for non-default databases
-        // once cl/582465034 is rolled out to production.
-        if (coll.firestore._databaseId.isDefaultDatabase) {
-          await expect(getCount(query_)).to.be.eventually.rejectedWith(
-            /index.*https:\/\/console\.firebase\.google\.com/
-          );
-        } else {
-          await expect(getCount(query_)).to.be.eventually.rejected;
-        }
+        await expect(getCount(query_)).to.be.eventually.rejectedWith(
+          /index.*https:\/\/console\.firebase\.google\.com/
+        );
       });
     }
   );
@@ -2760,23 +2754,13 @@ describe('Aggregate queries', () => {
           where('key1', '==', 42),
           where('key2', '<', 42)
         );
-        // TODO(b/316359394) Remove the special logic for non-default databases
-        // once cl/582465034 is rolled out to production.
-        if (coll.firestore._databaseId.isDefaultDatabase) {
-          await expect(
-            getAggregate(query_, {
-              myCount: count()
-            })
-          ).to.be.eventually.rejectedWith(
-            /index.*https:\/\/console\.firebase\.google\.com/
-          );
-        } else {
-          await expect(
-            getAggregate(query_, {
-              myCount: count()
-            })
-          ).to.be.eventually.rejected;
-        }
+        await expect(
+          getAggregate(query_, {
+            myCount: count()
+          })
+        ).to.be.eventually.rejectedWith(
+          /index.*https:\/\/console\.firebase\.google\.com/
+        );
       });
     }
   );