From acd6eb096677c372be61afb3fe6c6ea15d1b1963 Mon Sep 17 00:00:00 2001
From: Jonathan Lui <jonathanlui@google.com>
Date: Thu, 27 Sep 2018 14:13:13 -0700
Subject: [PATCH] do not add \r if already has it

---
 test/test.media.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/test.media.ts b/test/test.media.ts
index 93e080294d0..27a982198ee 100644
--- a/test/test.media.ts
+++ b/test/test.media.ts
@@ -37,7 +37,7 @@ async function testMultpart(drive: drive_v2.Drive) {
       res.request.headers['content-type'].indexOf('multipart/related;'), 0);
   const boundary =
       res.request.headers['content-type'].replace(boundaryPrefix, '');
-  expectedResp = expectedResp.replace(/\n/g, '\r\n')
+  expectedResp = expectedResp.replace(/\r?\n/g, '\r\n')
                      .replace(/\$boundary/g, boundary)
                      .replace('$media', media.body)
                      .replace('$resource', JSON.stringify(requestBody))
@@ -61,7 +61,7 @@ async function testMediaBody(drive: drive_v2.Drive) {
       res.request.headers['content-type'].indexOf('multipart/related;'), 0);
   const boundary =
       res.request.headers['content-type'].replace(boundaryPrefix, '');
-  expectedResp = expectedResp.replace(/\n/g, '\r\n')
+  expectedResp = expectedResp.replace(/\r?\n/g, '\r\n')
                      .replace(/\$boundary/g, boundary)
                      .replace('$media', media.body)
                      .replace('$resource', JSON.stringify(requestBody))
@@ -309,7 +309,7 @@ describe('Media', () => {
         {userId: 'me', requestBody, media});
     const boundary =
         res.request.headers['content-type'].replace(boundaryPrefix, '');
-    expectedBody = expectedBody.replace(/\n/g, '\r\n')
+    expectedBody = expectedBody.replace(/\r?\n/g, '\r\n')
                        .replace(/\$boundary/g, boundary)
                        .replace('$media', bodyString)
                        .replace('$resource', JSON.stringify(requestBody))
@@ -332,7 +332,7 @@ describe('Media', () => {
         {userId: 'me', requestBody, media});
     const boundary2 =
         res2.request.headers['content-type'].replace(boundaryPrefix, '');
-    expectedBody = expectedBody.replace(/\n/g, '\r\n')
+    expectedBody = expectedBody.replace(/\r?\n/g, '\r\n')
                        .replace(/\$boundary/g, boundary2)
                        .replace('$media', bodyString)
                        .replace('$resource', JSON.stringify(requestBody))