From 867cf376fd8ec8e39a5025e2dccb307c1c2773bb Mon Sep 17 00:00:00 2001
From: Anne van Kesteren <annevk@annevk.nl>
Date: Tue, 11 Feb 2020 11:33:49 +0100
Subject: [PATCH] Fetch: improve ReadableStream upload test

See https://github.com/whatwg/fetch/issues/88#issuecomment-583038480 onward.
---
 fetch/api/basic/request-upload.any.js | 30 ++++++++++++++-------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/fetch/api/basic/request-upload.any.js b/fetch/api/basic/request-upload.any.js
index 01f92ccd65a554..14f4a07a4987e4 100644
--- a/fetch/api/basic/request-upload.any.js
+++ b/fetch/api/basic/request-upload.any.js
@@ -1,11 +1,12 @@
 // META: script=../resources/utils.js
 
 function testUpload(desc, url, method, createBody, expectedBody) {
-  var requestInit = {"method": method}
+  const requestInit = {"method": method}
   promise_test(function(test){
-    let body = createBody();
-    if (body)
+    const body = createBody();
+    if (body) {
       requestInit["body"] = body;
+    }
     return fetch(url, requestInit).then(function(resp) {
       return resp.text().then((text)=> {
         assert_equals(text, expectedBody);
@@ -16,15 +17,16 @@ function testUpload(desc, url, method, createBody, expectedBody) {
 
 function testUploadFailure(desc, url, method, createBody) {
   const requestInit = {"method": method};
-  promise_test(test => {
-    let body = createBody();
-    if (body)
+  promise_test(t => {
+    const body = createBody();
+    if (body) {
       requestInit["body"] = body;
-    return promise_rejects(new TypeError(), fetch(url, requestInit));
+    }
+    return promise_rejects_js(t, TypeError, fetch(url, requestInit));
   }, desc);
 }
 
-var url = RESOURCES_DIR + "echo-content.py"
+const url = RESOURCES_DIR + "echo-content.py"
 
 testUpload("Fetch with PUT with body", url,
   "PUT",
@@ -73,7 +75,7 @@ testUpload("Fetch with POST with Blob body with mime type", url,
 testUpload("Fetch with POST with ReadableStream", url,
   "POST",
   () => {
-    new ReadableStream({start: controller => {
+    return new ReadableStream({start: controller => {
       const encoder = new TextEncoder();
       controller.enqueue(encoder.encode("Test"));
       controller.close();
@@ -83,7 +85,7 @@ testUpload("Fetch with POST with ReadableStream", url,
 testUploadFailure("Fetch with POST with ReadableStream containing String", url,
   "POST",
   () => {
-    new ReadableStream({start: controller => {
+    return new ReadableStream({start: controller => {
       controller.enqueue("Test");
       controller.close();
     }})
@@ -91,7 +93,7 @@ testUploadFailure("Fetch with POST with ReadableStream containing String", url,
 testUploadFailure("Fetch with POST with ReadableStream containing null", url,
   "POST",
   () => {
-    new ReadableStream({start: controller => {
+    return new ReadableStream({start: controller => {
       controller.enqueue(null);
       controller.close();
     }})
@@ -99,7 +101,7 @@ testUploadFailure("Fetch with POST with ReadableStream containing null", url,
 testUploadFailure("Fetch with POST with ReadableStream containing number", url,
   "POST",
   () => {
-    new ReadableStream({start: controller => {
+    return new ReadableStream({start: controller => {
       controller.enqueue(99);
       controller.close();
     }})
@@ -107,7 +109,7 @@ testUploadFailure("Fetch with POST with ReadableStream containing number", url,
 testUploadFailure("Fetch with POST with ReadableStream containing ArrayBuffer", url,
   "POST",
   () => {
-    new ReadableStream({start: controller => {
+    return new ReadableStream({start: controller => {
       controller.enqueue(new ArrayBuffer());
       controller.close();
     }})
@@ -115,7 +117,7 @@ testUploadFailure("Fetch with POST with ReadableStream containing ArrayBuffer",
 testUploadFailure("Fetch with POST with ReadableStream containing Blob", url,
   "POST",
   () => {
-    new ReadableStream({start: controller => {
+    return new ReadableStream({start: controller => {
       controller.enqueue(new Blob());
       controller.close();
     }})