From b8fa983d85c8950ad8ac814033c55f134fee73a6 Mon Sep 17 00:00:00 2001
From: Daniel La Rocque <dlarocque@google.com>
Date: Mon, 19 Aug 2024 12:04:17 -0400
Subject: [PATCH 1/4] Use Blob.text() instead of FileReader

---
 packages/storage/test/unit/requests.test.ts | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/packages/storage/test/unit/requests.test.ts b/packages/storage/test/unit/requests.test.ts
index 65fbc17cfba..47cb610f442 100644
--- a/packages/storage/test/unit/requests.test.ts
+++ b/packages/storage/test/unit/requests.test.ts
@@ -145,19 +145,6 @@ describe('Firebase Storage > Requests', () => {
 
   const metadataContentType = 'application/json; charset=utf-8';
 
-  function readBlob(blob: Blob): Promise<string> {
-    const reader = new FileReader();
-    reader.readAsText(blob);
-    return new Promise((resolve, reject) => {
-      reader.onload = () => {
-        resolve(reader.result as string);
-      };
-      reader.onerror = () => {
-        reject(reader.error as Error);
-      };
-    });
-  }
-
   async function assertBodyEquals(
     body: Blob | string | Uint8Array | null,
     expectedStr: string
@@ -167,9 +154,11 @@ describe('Firebase Storage > Requests', () => {
     }
 
     if (typeof Blob !== 'undefined' && body instanceof Blob) {
-      return readBlob(body).then(str => {
+      return body.text().then(str => {
         assert.equal(str, expectedStr);
-      });
+      }).catch(err => {
+        return Promise.reject(err);
+      })
     } else if (body instanceof Uint8Array) {
       const str = decodeUint8Array(body);
       assert.equal(str, expectedStr);

From 2ed3edf69aef96a0be7bc02de3966f7dd6eee039 Mon Sep 17 00:00:00 2001
From: Daniel La Rocque <dlarocque@google.com>
Date: Tue, 20 Aug 2024 11:50:52 -0400
Subject: [PATCH 2/4] Set pause upload timeout to 2000

---
 packages/storage/test/integration/integration.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/storage/test/integration/integration.test.ts b/packages/storage/test/integration/integration.test.ts
index df6622b5878..05eca8d4ac0 100644
--- a/packages/storage/test/integration/integration.test.ts
+++ b/packages/storage/test/integration/integration.test.ts
@@ -209,7 +209,7 @@ describe('FirebaseStorage Exp', () => {
     );
     await Promise.race([
       failureDeferred.promise,
-      new Promise(resolve => setTimeout(resolve, 4000))
+      new Promise(resolve => setTimeout(resolve, 2000))
     ]);
     task.resume();
     await task;

From 35315a0185a95542300e8c190b534e3c91f4c2cc Mon Sep 17 00:00:00 2001
From: Daniel La Rocque <dlarocque@google.com>
Date: Tue, 20 Aug 2024 11:57:51 -0400
Subject: [PATCH 3/4] Run formatter

---
 packages/storage/test/unit/requests.test.ts | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/storage/test/unit/requests.test.ts b/packages/storage/test/unit/requests.test.ts
index 47cb610f442..efa6accb98b 100644
--- a/packages/storage/test/unit/requests.test.ts
+++ b/packages/storage/test/unit/requests.test.ts
@@ -154,11 +154,14 @@ describe('Firebase Storage > Requests', () => {
     }
 
     if (typeof Blob !== 'undefined' && body instanceof Blob) {
-      return body.text().then(str => {
-        assert.equal(str, expectedStr);
-      }).catch(err => {
-        return Promise.reject(err);
-      })
+      return body
+        .text()
+        .then(str => {
+          assert.equal(str, expectedStr);
+        })
+        .catch(err => {
+          return Promise.reject(err);
+        });
     } else if (body instanceof Uint8Array) {
       const str = decodeUint8Array(body);
       assert.equal(str, expectedStr);

From f65709ec961f37487f2cc240583e28cb3e95ca37 Mon Sep 17 00:00:00 2001
From: Daniel La Rocque <dlarocque@google.com>
Date: Tue, 20 Aug 2024 12:39:18 -0400
Subject: [PATCH 4/4] Increase test timeout duration

---
 packages/storage/test/integration/integration.test.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/storage/test/integration/integration.test.ts b/packages/storage/test/integration/integration.test.ts
index 05eca8d4ac0..d3d6a5fa0cc 100644
--- a/packages/storage/test/integration/integration.test.ts
+++ b/packages/storage/test/integration/integration.test.ts
@@ -209,11 +209,11 @@ describe('FirebaseStorage Exp', () => {
     );
     await Promise.race([
       failureDeferred.promise,
-      new Promise(resolve => setTimeout(resolve, 2000))
+      new Promise(resolve => setTimeout(resolve, 4000))
     ]);
     task.resume();
     await task;
     const bytes = await getBytes(referenceA);
     expect(bytes).to.deep.eq(bytesToUpload);
-  });
+  }).timeout(10_000);
 });