puppeteer · aslushnikov · Aug 26, 2017 · Aug 25, 2017 · Aug 25, 2017 · Aug 26, 2017
diff --git a/.eslintignore b/.eslintignore
@@ -1,3 +1,4 @@
 third_party/*
 utils/doclint/check_public_api/test/
-node6/*
+node6/*
+node6-test/*
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@
 .vscode
 package-lock.json
 /node6
+/node6-test
diff --git a/.npmignore b/.npmignore
@@ -11,3 +11,4 @@ node_modules
 *.pyc
 .vscode
 package-lock.json
+/node6-test
diff --git a/.travis.yml b/.travis.yml
@@ -15,9 +15,8 @@ install:
 script:
   - 'if [ "$NODE7" = "true" ]; then yarn run lint; fi'
   - 'if [ "$NODE7" = "true" ]; then yarn run coverage; fi'
-  - 'if [ "$NODE6" = "true" ]; then yarn run node6; fi'
-  - 'if [ "$NODE6" = "true" ]; then yarn run test-node6; fi'
-  - 'if [ "$NODE6" = "true" ]; then yarn run node6-sanity; fi'
+  - 'if [ "$NODE6" = "true" ]; then yarn run test-node6-transformer; fi'
+  - 'if [ "$NODE6" = "true" ]; then yarn run unit-node6; fi'
 jobs:
   include:
     - node_js: "7"

diff --git a/package.json b/package.json
@@ -11,15 +11,14 @@
     "unit": "jasmine test/test.js",
     "debug-unit": "DEBUG_TEST=true node --inspect-brk ./node_modules/.bin/jasmine test/test.js",
     "test-doclint": "jasmine utils/doclint/check_public_api/test/test.js && jasmine utils/doclint/preprocessor/test.js",
-    "test": "npm run lint --silent && npm run coverage && npm run test-doclint && npm run test-node6",
+    "test": "npm run lint --silent && npm run coverage && npm run test-doclint && npm run test-node6-transformer",
     "install": "node install.js",
     "lint": "([ \"$CI\" = true ] && eslint --quiet -f codeframe . || eslint .) && npm run doc",
     "doc": "node utils/doclint/cli.js",
     "coverage": "COVERAGE=true npm run unit",
-    "node6": "node utils/node6-transform/index.js",
-    "test-node6": "jasmine utils/node6-transform/test/test.js",
-    "build": "npm run node6",
-    "node6-sanity": "jasmine test/sanity.js"
+    "test-node6-transformer": "jasmine utils/node6-transform/test/test.js",
+    "build": "node utils/node6-transform/index.js",
+    "unit-node6": "jasmine node6-test/test.js"
   },
   "author": "The Chromium Authors",
   "license": "SEE LICENSE IN LICENSE",

diff --git a/test/sanity.js b/test/sanity.js
diff --git a/test/test.js b/test/test.js
@@ -20,6 +20,7 @@ const path = require('path');
 const helper = require('../lib/helper');
 if (process.env.COVERAGE)
   helper.recordPublicAPICoverage();
+console.log('Testing on Node', process.version);
 const puppeteer = require('..');
 const SimpleServer = require('./server/SimpleServer');
 const GoldenUtils = require('./golden-utils');

diff --git a/utils/node6-transform/TransformAsyncFunctions.js b/utils/node6-transform/TransformAsyncFunctions.js
@@ -49,6 +49,7 @@ const asyncToGenerator = fn => {
 
 /**
  * @param {string} text
+ * @return {string}
  */
 function transformAsyncFunctions(text) {
   const edits = [];

diff --git a/utils/node6-transform/index.js b/utils/node6-transform/index.js
@@ -19,18 +19,25 @@ const path = require('path');
 const removeRecursive = require('rimraf').sync;
 const transformAsyncFunctions = require('./TransformAsyncFunctions');
 
-const dirPath = path.join(__dirname, '..', '..', 'lib');
-const outPath = path.join(__dirname, '..', '..', 'node6');
-const fileNames = fs.readdirSync(dirPath);
-const filePaths = fileNames.filter(fileName => fileName.endsWith('.js'));
+copyFolder(path.join(__dirname, '..', '..', 'lib'), path.join(__dirname, '..', '..', 'node6'));
+copyFolder(path.join(__dirname, '..', '..', 'test'), path.join(__dirname, '..', '..', 'node6-test'));
 
-if (fs.existsSync(outPath))
-  removeRecursive(outPath);
-fs.mkdirSync(outPath);
 
-filePaths.forEach(filePath => {
-  const content = fs.readFileSync(path.join(dirPath, filePath), 'utf8');
-  const output = transformAsyncFunctions(content);
-  fs.writeFileSync(path.resolve(outPath, filePath), output);
-});
+function copyFolder(source, target) {
+  if (fs.existsSync(target))
+    removeRecursive(target);
+  fs.mkdirSync(target);
 
+  fs.readdirSync(source).forEach(file => {
+    const from = path.join(source, file);
+    const to = path.join(target, file);
+    if (fs.lstatSync(from).isDirectory()) {
+      copyFolder(from, to);
+    } else {
+      let text = fs.readFileSync(from);
+      if (file.endsWith('.js'))
+        text = transformAsyncFunctions(text.toString()).replace(/require\('\.\.\/lib\//g, `require('../node6/`);
+      fs.writeFileSync(to, text);
+    }
+  });
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,3 +8,4 @@ @@
     .vscode
     package-lock.json
     /node6
+    /node6-test