Included index in our tests

Author: maneesht

config/database.rules.json

@@ -3,7 +3,7 @@
     ".read": true,
     ".write": true,
     "testing": {
-      ".indexOn": "lease"
+      ".indexOn": "testIndex"
     }
   }
 }

packages/database-compat/test/query.test.ts

@@ -4676,26 +4676,22 @@ describe('Query Tests', () => {
     // TODO(mtewani): This repro requires an index to be created.
     await root.remove();
 
-    const query = root.orderByChild('lease').limitToFirst(2);
+    const query = root.orderByChild('testIndex').limitToFirst(2);
 
     await root
       .child('i|1')
-      .set({ lease: 3, timestamp: Date.now(), action: 'test' });
+      .set({ testIndex: 3, timestamp: Date.now(), action: 'test' });
     await root
       .child('i|2')
-      .set({ lease: 1, timestamp: Date.now(), action: 'test' });
+      .set({ testIndex: 1, timestamp: Date.now(), action: 'test' });
     await root
       .child('i|3')
-      .set({ lease: 2, timestamp: Date.now(), action: 'test' });
+      .set({ testIndex: 2, timestamp: Date.now(), action: 'test' });
     const childAdded = query.on('child_added', snap => {
       const value = snap.val();
-      console.log('onChildAdded', value);
-      if(value.timestamp && !value.lease) {
-        console.log("ERR: missing value");
-      }
       expect(value).to.haveOwnProperty('timestamp');
       expect(value).to.haveOwnProperty('action');
-      expect(value).to.haveOwnProperty('lease');
+      expect(value).to.haveOwnProperty('testIndex');
     });
     const onValue = root.child('i|1').on('value', snap => {
       console.log('onValue', snap.val());

packages/database/test/exp/integration.test.ts

@@ -21,13 +21,18 @@ import { expect, use } from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 
 import {
+  child,
   get,
   limitToFirst,
+  onChildAdded,
   onValue,
+  orderByChild,
   query,
   refFromURL,
+  remove,
   set,
-  startAt
+  startAt,
+  update
 } from '../../src/api/Reference_impl';
 import {
   getDatabase,
@@ -112,6 +117,51 @@ describe('Database@exp Tests', () => {
     unsubscribe();
   });
 
+  it('can properly handle unknown deep merges', async () => {
+    const database = getDatabase(defaultApp);
+    const root = ref(database, 'testing');
+    await remove(root);
+
+    const q = query(root, orderByChild('testIndex'), limitToFirst(2));
+
+    const i1 = child(root, 'i1');
+    await set(root, {
+      i1: {
+        testIndex: 3,
+        timestamp: Date.now(),
+        action: 'test'
+      },
+      i2: {
+        testIndex: 1,
+        timestamp: Date.now(),
+        action: 'test'
+      },
+      i3: {
+        testIndex: 2,
+        timestamp: Date.now(),
+        action: 'test'
+      }
+    });
+    const ec = EventAccumulatorFactory.waitsForExactCount(1);
+    const onChildAddedCb = onChildAdded(q, snap => {
+      const value = snap.val();
+      ec.addEvent(snap);
+    });
+    const onValueCb = onValue(i1, () => {
+      //no-op
+    });
+    await update(i1, {
+      timestamp: `${Date.now()}|1`
+    });
+    const [result] = await ec.promise;
+    const value = result.val();
+    expect(value).to.haveOwnProperty('timestamp');
+    expect(value).to.haveOwnProperty('action');
+    expect(value).to.haveOwnProperty('testIndex');
+    onChildAddedCb();
+    onValueCb();
+  });
+
   // Tests to make sure onValue's data does not get mutated after calling get
   it('calls onValue only once after get request with a non-default query', async () => {
     const db = getDatabase(defaultApp);

packages/rules-unit-testing/src/initialize.ts

@@ -82,6 +82,7 @@ export async function initializeTestEnvironment(
   }
 
   if (config.database?.rules) {
+    console.log('RUNNING RULES');
     assertEmulatorRunning(emulators, 'database');
     await loadDatabaseRules(
       emulators.database,

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

@@ -41,7 +41,7 @@ export class DatabaseEmulator extends Emulator {
         {
           uri: `http://localhost:${this.port}/.settings/rules.json?ns=${this.namespace}`,
           headers: { Authorization: 'Bearer owner' },
-          body: '{ "rules": { ".read": true, ".write": true } }'
+          body: '{ "rules": { ".read": true, ".write": true, "testing": { ".indexOn": "testIndex" } } }'
         },
         (error, response, body) => {
           if (error) reject(error);