From e6211f32827c65fd96a6f4ffc9897bfd06ff6da5 Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Thu, 27 Sep 2018 16:14:23 -0700 Subject: [PATCH] Fix Windows Kokoro builds (#1365) --- package.json | 2 +- samples/drive/download.js | 5 +++-- samples/drive/upload.js | 8 +++++--- samples/youtube/upload.js | 8 +++++--- test/test.kitchen.ts => system-test/kitchen.test.ts | 0 test/test.media.ts | 8 ++++---- tsconfig.json | 3 ++- 7 files changed, 20 insertions(+), 14 deletions(-) rename test/test.kitchen.ts => system-test/kitchen.test.ts (100%) diff --git a/package.json b/package.json index 2f7bdbbf94f..6fbbd0bb05a 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "prepare": "npm run compile", "test": "nyc mocha build/test", "docs": "echo no docs 👻", - "system-test": "echo no system tests 👻", + "system-test": "mocha build/system-test", "samples-test": "cd samples && npm link ../ && pwd && npm test", "lint": "gts check && eslint 'samples/**/*.js'", "compile": "tsc -v && tsc -p . && copyfiles src/apis/**/README.md src/apis/**/package.json build", diff --git a/samples/drive/download.js b/samples/drive/download.js index eb33f6d1c04..a7b9a1da50a 100644 --- a/samples/drive/download.js +++ b/samples/drive/download.js @@ -19,6 +19,7 @@ const fs = require('fs'); const os = require('os'); const uuid = require('uuid'); const path = require('path'); +const readline = require('readline'); const drive = google.drive({ version: 'v3', @@ -46,8 +47,8 @@ async function runSample(fileId) { }) .on('data', d => { progress += d.length; - process.stdout.clearLine(); - process.stdout.cursorTo(0); + readline.clearLine(); + readline.cursorTo(0); process.stdout.write(`Downloaded ${progress} bytes`); }) .pipe(dest); diff --git a/samples/drive/upload.js b/samples/drive/upload.js index 23675aa29a8..068ded93c6f 100644 --- a/samples/drive/upload.js +++ b/samples/drive/upload.js @@ -13,8 +13,10 @@ 'use strict'; -const {google} = require('googleapis'); const fs = require('fs'); +const readline = require('readline'); + +const {google} = require('googleapis'); const sampleClient = require('../sampleclient'); const drive = google.drive({ @@ -38,8 +40,8 @@ async function runSample(fileName) { // number of bytes uploaded to this point. onUploadProgress: evt => { const progress = (evt.bytesRead / fileSize) * 100; - process.stdout.clearLine(); - process.stdout.cursorTo(0); + readline.clearLine(); + readline.cursorTo(0); process.stdout.write(`${Math.round(progress)}% complete`); }, } diff --git a/samples/youtube/upload.js b/samples/youtube/upload.js index 4d7aa3f2113..eb7e8b3fb2a 100644 --- a/samples/youtube/upload.js +++ b/samples/youtube/upload.js @@ -17,9 +17,11 @@ * Usage: node upload.js PATH_TO_VIDEO_FILE */ +const fs = require('fs'); +const readline = require('readline'); + const {google} = require('googleapis'); const sampleClient = require('../sampleclient'); -const fs = require('fs'); // initialize the Youtube API library const youtube = google.youtube({ @@ -52,8 +54,8 @@ async function runSample(fileName) { // number of bytes uploaded to this point. onUploadProgress: evt => { const progress = (evt.bytesRead / fileSize) * 100; - process.stdout.clearLine(); - process.stdout.cursorTo(0); + readline.clearLine(); + readline.cursorTo(0); process.stdout.write(`${Math.round(progress)}% complete`); }, } diff --git a/test/test.kitchen.ts b/system-test/kitchen.test.ts similarity index 100% rename from test/test.kitchen.ts rename to system-test/kitchen.test.ts 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)) diff --git a/tsconfig.json b/tsconfig.json index b16a7ac5434..c72b3c8365e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,7 +8,8 @@ "src/*.ts", "src/**/*.ts", "test/*.ts", - "test/**/*.ts" + "test/**/*.ts", + "system-test/**/*.ts" ], "exclude": [ "node_modules",