web-platform-tests
diff --git a/‎FileAPI/file/send-file-formdata-controls.tentative.html‎ renamed to ‎FileAPI/file/send-file-formdata-controls.html‎
Lines changed: 1 addition & 5 deletions b/‎FileAPI/file/send-file-formdata-controls.tentative.html‎ renamed to ‎FileAPI/file/send-file-formdata-controls.html‎
Lines changed: 1 addition & 5 deletions
diff --git a/‎FileAPI/file/send-file-formdata-punctuation.tentative.html‎ renamed to ‎FileAPI/file/send-file-formdata-punctuation.html‎
Lines changed: 1 addition & 5 deletions b/‎FileAPI/file/send-file-formdata-punctuation.tentative.html‎ renamed to ‎FileAPI/file/send-file-formdata-punctuation.html‎
Lines changed: 1 addition & 5 deletions
diff --git a/‎FileAPI/support/send-file-formdata-helper.js‎
Lines changed: 5 additions & 3 deletions b/‎FileAPI/support/send-file-formdata-helper.js‎
Lines changed: 5 additions & 3 deletions
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8" />
-<title>FormData: Upload files named using controls (tentative)</title>
-<!--
-    NOTE: This test is tentative because encoding for filename
-    control characters is not yet standardized.
-  -->
+<title>FormData: Upload files named using controls</title>
 <link
   rel="help"
   href="https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#multipart-form-data"
 
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8" />
-<title>FormData: Upload files named using punctuation (tentative)</title>
-<!--
-    NOTE: This test is tentative because encoding for filename
-    punctuation characters is not yet standardized.
-  -->
+<title>FormData: Upload files named using punctuation</title>
 <link
   rel="help"
   href="https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#multipart-form-data"
 
@@ -70,19 +70,21 @@ const formDataPostFileUploadTest = ({
       }`,
     );
 
-    const asName = fileBaseName.replace(/[\r\n"]/g, encodeURIComponent);
+    const asValue = fileBaseName.replace(/\r\n?|\n/g, "\r\n");
+    const asName = asValue.replace(/[\r\n"]/g, encodeURIComponent);
+    const asFilename = fileBaseName.replace(/[\r\n"]/g, encodeURIComponent);
     const expectedText = [
       boundary,
       'Content-Disposition: form-data; name="filename"',
       "",
-      fileBaseName,
+      asValue,
       boundary,
       `Content-Disposition: form-data; name="${asName}"`,
       "",
       "filename",
       boundary,
       `Content-Disposition: form-data; name="file"; ` +
-      `filename="${asName}"`,
+      `filename="${asFilename}"`,
       "Content-Type: text/plain",
       "",
       kTestChars,