From e479f0c0f62fbd42b011b002fc72c3357614cf8e Mon Sep 17 00:00:00 2001
From: Salakar <mike.diarmid@gmail.com>
Date: Sat, 21 Apr 2018 19:22:21 +0100
Subject: [PATCH] [tests] refactor/cleanup misc firestore tests

---
 bridge/e2e/firestore/documentReference.e2e.js | 84 +++++++++----------
 bridge/e2e/firestore/transactions.e2e.js      |  2 +-
 2 files changed, 39 insertions(+), 47 deletions(-)

diff --git a/bridge/e2e/firestore/documentReference.e2e.js b/bridge/e2e/firestore/documentReference.e2e.js
index 5fac2760..daa267f5 100644
--- a/bridge/e2e/firestore/documentReference.e2e.js
+++ b/bridge/e2e/firestore/documentReference.e2e.js
@@ -7,7 +7,6 @@ const {
   resetTestCollectionDoc,
 } = TestHelpers.firestore;
 
-// TODO cleanup promises and replace with async/await
 describe('firestore()', () => {
   describe('DocumentReference', () => {
     before(async () => {
@@ -487,59 +486,52 @@ describe('firestore()', () => {
       });
     });
 
-    // TODO async/await these tests
     describe('update()', () => {
       beforeEach(async () => {
         await resetTestCollectionDoc(COL2_DOC_1_PATH, { name: 'doc1' });
       });
-      it('should update Document using object', () =>
-        test2DocRef(COL2_DOC_1_ID)
-          .update({ name: 'updated' })
-          .then(async () => {
-            const doc = await test2DocRef(COL2_DOC_1_ID).get();
-            doc.data().name.should.equal('updated');
-          }));
 
-      it('should update Document using key/value pairs', () =>
-        test2DocRef(COL2_DOC_1_ID)
-          .update('name', 'updated')
-          .then(async () => {
-            const doc = await test2DocRef(COL2_DOC_1_ID).get();
-            doc.data().name.should.equal('updated');
-          }));
+      it('should update Document using object', async () => {
+        await test2DocRef(COL2_DOC_1_ID).update({ name: 'updated' });
+        const doc = await test2DocRef(COL2_DOC_1_ID).get();
+        doc.data().name.should.equal('updated');
+      });
 
-      it('should update Document using FieldPath/value pair', () =>
-        test2DocRef(COL2_DOC_1_ID)
-          .update(new firebase.firestore.FieldPath('name'), 'Name')
-          .then(async () => {
-            const doc = await test2DocRef(COL2_DOC_1_ID).get();
-            doc.data().name.should.equal('Name');
-          }));
+      it('should update Document using key/value pairs', async () => {
+        await test2DocRef(COL2_DOC_1_ID).update('name', 'updated');
+        const doc = await test2DocRef(COL2_DOC_1_ID).get();
+        doc.data().name.should.equal('updated');
+      });
 
-      it('should update Document using nested FieldPath and value pair', () =>
-        test2DocRef(COL2_DOC_1_ID)
-          .update(
-            new firebase.firestore.FieldPath('nested', 'name'),
-            'Nested Name'
-          )
-          .then(async () => {
-            const doc = await test2DocRef(COL2_DOC_1_ID).get();
-            doc.data().nested.name.should.equal('Nested Name');
-          }));
+      it('should update Document using FieldPath/value pair', async () => {
+        await test2DocRef(COL2_DOC_1_ID).update(
+          new firebase.firestore.FieldPath('name'),
+          'Name'
+        );
+        const doc = await test2DocRef(COL2_DOC_1_ID).get();
+        doc.data().name.should.equal('Name');
+      });
 
-      it('should update Document using multiple FieldPath/value pairs', () =>
-        test2DocRef(COL2_DOC_1_ID)
-          .update(
-            new firebase.firestore.FieldPath('nested', 'firstname'),
-            'First Name',
-            new firebase.firestore.FieldPath('nested', 'lastname'),
-            'Last Name'
-          )
-          .then(async () => {
-            const doc = await test2DocRef(COL2_DOC_1_ID).get();
-            doc.data().nested.firstname.should.equal('First Name');
-            doc.data().nested.lastname.should.equal('Last Name');
-          }));
+      it('should update Document using nested FieldPath and value pair', async () => {
+        await test2DocRef(COL2_DOC_1_ID).update(
+          new firebase.firestore.FieldPath('nested', 'name'),
+          'Nested Name'
+        );
+        const doc = await test2DocRef(COL2_DOC_1_ID).get();
+        doc.data().nested.name.should.equal('Nested Name');
+      });
+
+      it('should update Document using multiple FieldPath/value pairs', async () => {
+        await test2DocRef(COL2_DOC_1_ID).update(
+          new firebase.firestore.FieldPath('nested', 'firstname'),
+          'First Name',
+          new firebase.firestore.FieldPath('nested', 'lastname'),
+          'Last Name'
+        );
+        const doc = await test2DocRef(COL2_DOC_1_ID).get();
+        doc.data().nested.firstname.should.equal('First Name');
+        doc.data().nested.lastname.should.equal('Last Name');
+      });
 
       it('errors when invalid parameters supplied', async () => {
         const docRef = test2DocRef(COL2_DOC_1_ID);
diff --git a/bridge/e2e/firestore/transactions.e2e.js b/bridge/e2e/firestore/transactions.e2e.js
index 8418b694..4cf194aa 100644
--- a/bridge/e2e/firestore/transactions.e2e.js
+++ b/bridge/e2e/firestore/transactions.e2e.js
@@ -137,7 +137,7 @@ describe('firestore()', () => {
       should.equal(didReject, true);
     });
 
-    it.only('handle native exceptions', async () => {
+    it('handle native exceptions', async () => {
       const firestore = firebase.firestore();
       const docRef = testDocRef('tSet');
       const blockedRef = firestore.doc('denied/foo');