Check paths in Query.isEqual

invertase · Oct 16, 2019 · 0a3913e · 0a3913e
1 parent 7caeab3
commit 0a3913e
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/src/modules/firestore/Query.js b/src/modules/firestore/Query.js
@@ -199,6 +199,13 @@ export default class Query {
       return false;
     }
 
+    if (
+      this._referencePath.relativeName !==
+      otherQuery._referencePath.relativeName
+    ) {
+      return false;
+    }
+
     if (this._fieldFilters.length !== otherQuery._fieldFilters.length) {
       return false;
     }

diff --git a/tests/e2e/firestore/query.e2e.js b/tests/e2e/firestore/query.e2e.js
@@ -1,7 +1,7 @@
 describe('firestore()', () => {
   describe('Query', () => {
     describe('isEqual()', () => {
-      it(`returns true if two Queries have the same .where and .orderBy calls`, () => {
+      it(`returns true if two Queries for the same collection have the same .where and .orderBy calls`, () => {
         const ref1 = firebase
           .firestore()
           .collection('foo')
@@ -17,6 +17,31 @@ describe('firestore()', () => {
         should.equal(ref1.isEqual(ref2), true);
       });
 
+      it(`returns false if the two Queries are for different collections`, () => {
+        const ref1 = firebase
+          .firestore()
+          .collection('foo')
+          .where('bar', '==', true);
+        const ref2 = firebase
+          .firestore()
+          .collection('baz')
+          .where('bar', '==', true);
+        should.equal(ref1.isEqual(ref2), false);
+      });
+
+      it(`returns false if two Queries have different number of .where calls`, () => {
+        const ref1 = firebase
+          .firestore()
+          .collection('foo')
+          .where('bar', '==', true);
+        const ref2 = firebase
+          .firestore()
+          .collection('foo')
+          .where('bar', '==', true)
+          .where('baz', '!=', false);
+        should.equal(ref1.isEqual(ref2), false);
+      });
+
       it(`returns false if two Queries have different number of .where calls`, () => {
         const ref1 = firebase
           .firestore()