Merge pull request #1252 from stephenplusplus/spp--windows-clrf-tests

normalize new lines for Vision test

package.json

@@ -140,6 +140,7 @@
     "mockery-next": "^2.0.1-3",
     "multiline": "^1.0.2",
     "node-uuid": "^1.4.3",
+    "normalize-newline": "^2.0.0",
     "tmp": "0.0.27"
   },
   "scripts": {

system-test/storage.js

@@ -20,6 +20,7 @@ var assert = require('assert');
 var async = require('async');
 var crypto = require('crypto');
 var fs = require('fs');
+var normalizeNewline = require('normalize-newline');
 var prop = require('propprop');
 var request = require('request');
 var through = require('through2');
@@ -569,8 +570,9 @@ describe('storage', function() {
         }
       };
 
-      var expectedContents = fs.readFileSync(FILES.html.path, 'utf-8')
-        .replace(/\r\n/g, '\n'); // Normalize line endings.
+      var expectedContents = normalizeNewline(
+        fs.readFileSync(FILES.html.path, 'utf-8')
+      );
 
       bucket.upload(FILES.gzip.path, options, function(err, file) {
         assert.ifError(err);

system-test/vision.js

@@ -19,6 +19,7 @@
 var assert = require('assert');
 var is = require('is');
 var multiline = require('multiline');
+var normalizeNewline = require('normalize-newline');
 var path = require('path');
 
 var env = require('./env.js');
@@ -311,12 +312,12 @@ describe('Vision', function() {
 
   describe('text', function() {
     var expectedResults = [
-      multiline.stripIndent(function() {/*
+      normalizeNewline(multiline.stripIndent(function() {/*
         Google Cloud Client Library for Node.js an idiomatic, intuitive, and
         natural way for Node.js developers to integrate with Google Cloud
         Platform services, like Cloud Datastore and Cloud Storage.
 
-      */})
+      */}))
     ];
 
     expectedResults = expectedResults.concat(