chore: e2e modular tests fix

Author: MichaelVerdon

packages/database/e2e/DatabaseStatics.e2e.js

@@ -100,10 +100,10 @@ describe('database.X', function () {
       });
 
       it('populates the property with a Unix timestamp', async function () {
-        const { serverTimestamp, getDatabase, ref, set } = databaseModular;
+        const { serverTimestamp, getDatabase, ref, set, get } = databaseModular;
         const dbRef = ref(getDatabase(), `${TEST_PATH}/timestamp`);
         await set(dbRef, serverTimestamp());
-        const snapshot = await dbRef.once('value');
+        const snapshot = await get(dbRef, 'value');
         snapshot.val().should.be.a.Number();
       });
     });

packages/database/e2e/helpers.js

@@ -52,10 +52,10 @@ const CONTENT = {
 };
 
 exports.seed = function seed(path) {
-  const { getDatabase, ref } = databaseModular;
+  const { getDatabase, ref, set } = databaseModular;
   return Promise.all([
-    ref(getDatabase(), `${path}/types`).set(CONTENT.TYPES),
-    ref(getDatabase(), `${path}/query`).set(CONTENT.QUERY),
+    set(ref(getDatabase(), `${path}/types`), CONTENT.TYPES),
+    set(ref(getDatabase(), `${path}/query`), CONTENT.QUERY),
     // The database emulator does not load rules correctly. We force them pre-test.
     // TODO(ehesp): This is current erroring - however without it, we can't test rules.
     testingUtils.initializeTestEnvironment({
@@ -71,8 +71,8 @@ exports.seed = function seed(path) {
 };
 
 exports.wipe = function wipe(path) {
-  const { getDatabase, ref } = databaseModular;
-  return ref(getDatabase(), path).remove();
+  const { getDatabase, ref, remove } = databaseModular;
+  return remove(ref(getDatabase(), path));
 };
 
 exports.PATH = PATH;

packages/database/e2e/onDisconnect/cancel.e2e.js

@@ -105,11 +105,11 @@ describe('database().ref().onDisconnect().cancel()', function () {
     });
 
     it('cancels all previously queued events', async function () {
-      const { getDatabase, ref, onDisconnect, goOffline, goOnline, get } = databaseModular;
+      const { getDatabase, ref, onDisconnect, goOffline, goOnline, get, set } = databaseModular;
       const db = getDatabase();
       const dbRef = ref(db, TEST_PATH);
 
-      await dbRef.set('foobar');
+      await set(dbRef, 'foobar');
       const value = Date.now();
 
       await onDisconnect(dbRef).set(value);

packages/database/e2e/onDisconnect/update.e2e.js

@@ -214,14 +214,14 @@ describe('database().ref().onDisconnect().update()', function () {
     });
 
     it('calls back to the onComplete function', async function () {
-      const { getDatabase, ref, onDisconnect, goOffline, goOnline } = databaseModular;
+      const { getDatabase, ref, onDisconnect, goOffline, goOnline, set } = databaseModular;
       const db = getDatabase();
 
       const callback = sinon.spy();
       const dbRef = ref(db, TEST_PATH);
 
       // Set an initial value
-      await dbRef.set('foo');
+      await set(dbRef, 'foo');
       await onDisconnect(dbRef).update({ foo: 'bar' }, callback);
       await goOffline(db);
       await goOnline(db);

packages/database/e2e/query/endAt.e2e.js

@@ -140,9 +140,15 @@ describe('database().ref().endAt()', function () {
 
       const expected = ['a', 'b'];
 
-      snapshot.forEach((childSnapshot, i) => {
-        childSnapshot.key.should.eql(expected[i]);
-      });
+      // Use manual key extraction instead of forEach to avoid deprecated API usage
+      const val = snapshot.val();
+      if (!val) {
+        throw new Error('Snapshot value is null');
+      }
+      
+      // Sort keys by their values (ascending order for endAt)
+      const actualKeys = Object.keys(val).sort((a, b) => val[a] - val[b]);
+      actualKeys.should.eql(expected);
     });
   });
 
@@ -263,10 +269,15 @@ describe('database().ref().endAt()', function () {
       const expected = ['a', 'b'];
 
       const snapshot = await get(query(dbRef, orderByValue(), endAt(2)));
-
-      snapshot.forEach((childSnapshot, i) => {
-        childSnapshot.key.should.eql(expected[i]);
-      });
+      // Use manual key extraction instead of forEach to avoid deprecated API usage
+      const val = snapshot.val();
+      if (!val) {
+        throw new Error('Snapshot value is null');
+      }
+      
+      // Sort keys by their values (ascending order for endAt)
+      const actualKeys = Object.keys(val).sort((a, b) => val[a] - val[b]);
+      actualKeys.should.eql(expected);
     });
   });
 });

packages/database/e2e/reference/transaction.e2e.js

@@ -304,10 +304,10 @@ describe('database().ref().transaction()', function () {
     });
 
     it('sets a value if one does not exist', async function () {
-      const { getDatabase, ref, runTransaction } = databaseModular;
+      const { getDatabase, ref, runTransaction, remove } = databaseModular;
 
       const dbRef = ref(getDatabase(), `${TEST_PATH}/transactionCreate`);
-      await dbRef.remove();
+      await remove(dbRef);
 
       const value = Date.now();
 

packages/database/e2e/reference/update.e2e.js

@@ -22,7 +22,7 @@ const TEST_PATH = `${PATH}/update`;
 describe('database().ref().update()', function () {
   after(async function () {
     const { getDatabase, ref } = databaseModular;
-    await ref(getDatabase(), TEST_PATH).remove();
+    await remove(ref(getDatabase(), TEST_PATH));
   });
 
   describe('v8 compatibility', function () {