fix(firestore): adjust withConverter test settings V2

Author: JiriHoffmann

packages/firestore/e2e/withConverter.e2e.js

@@ -32,8 +32,6 @@ const {
   increment,
   initializeFirestore,
 } = firestoreModular;
-const { getApp } = modular;
-
 
 // Used for testing the FirestoreDataConverter.
 class Post {
@@ -83,18 +81,27 @@ const postConverterMerge = {
   },
 };
 
+// v8 compatibility helper functions
+function modifyIgnoreUndefinedProperties(db, value) {
+  // JS SDK settings can only be called once
+  if (Platform.other) {
+    db._settings.ignoreUndefinedProperties = value;
+  } else {
+    db.settings({ ignoreUndefinedProperties: value });
+  }
+}
+
+// modular helper functions
 function withTestDb(fn) {
   return fn(getFirestore());
 }
 
 async function withModifiedUndefinedPropertiesTestDb(fn) {
-  const db = await initializeFirestore(getApp(), {
-    ignoreUndefinedProperties: false,
-  });
+  const db = getFirestore();
+  const previousValue = db._settings.ignoreUndefinedProperties;
+  initializeFirestore(db.app, { ignoreUndefinedProperties: false });
   await fn(db);
-  await initializeFirestore(getApp(), {
-    ignoreUndefinedProperties: true,
-  });
+  initializeFirestore(db.app, { ignoreUndefinedProperties: previousValue });
 }
 
 function withTestCollection(fn) {
@@ -115,7 +122,7 @@ function withTestCollectionAndInitialData(data, fn) {
   });
 }
 
-describe('firestore.Transaction', function () {
+describe('firestore.withConverter', function () {
   describe('v8 compatibility', function () {
     beforeEach(async function beforeEachTest() {
       // @ts-ignore
@@ -289,7 +296,9 @@ describe('firestore.Transaction', function () {
 
     it('requires the correct converter for Partial usage', async function () {
       const db = firebase.firestore();
-      db.settings({ ignoreUndefinedProperties: false });
+      const previousValue = db._settings.ignoreUndefinedProperties;
+      modifyIgnoreUndefinedProperties(db, false);
+
       const coll = db.collection('posts');
       const ref = coll.doc('post').withConverter(postConverter);
       const batch = db.batch();
@@ -300,7 +309,7 @@ describe('firestore.Transaction', function () {
       } catch (error) {
         error.message.should.containEql('Unsupported field value: undefined');
       }
-      db.settings({ ignoreUndefinedProperties: true });
+      modifyIgnoreUndefinedProperties(db, previousValue);
       return Promise.resolve();
     });