moving headless scripts to own folder #559

conf/defaultConfig.js

@@ -6,7 +6,7 @@ var defaultConfig = {
   memory: 1024,
   headless: 'phantomjs',
   userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.120 Safari/537.36',
-  yslow: 'headless/yslow-3.1.8-sitespeed.js',
+  yslow: 'headless/scripts/yslow-3.1.8-sitespeed.js',
   ruleSet: 'sitespeed.io-desktop',
   profile: 'desktop',
   testData: 'all',

lib/analyze/headless.js

@@ -12,7 +12,7 @@ var path = require('path'),
   inspect = require('util').inspect,
   fs = require('fs'),
   winston = require('winston'),
-  Timing = require('../headlessTiming'),
+  Timing = require('../headless/headlessTiming'),
   async = require('async'),
   PATH = 'headless';
 
@@ -89,7 +89,7 @@ function runHeadless(args, asyncDoneCallback) {
     } else {
       childArgs.push('--ssl-protocol=any', '--ignore-ssl-errors=yes');
     }
-    childArgs.push(path.join(__dirname, '..', PATH, 'collectTimings.js'));
+    childArgs.push(path.join(__dirname, '..', 'headless','scripts', 'collectTimings.js'));
     childArgs.push(url);
     childArgs.push(path.join(config.run.absResultDir, config.dataDir, PATH, util.getFileName(url) +
     '-' + run + '.json'));

lib/analyze/screenshots.js

@@ -74,7 +74,7 @@ function screenshot(args, asyncDoneCallback) {
     } else {
       childArgs.push('--ssl-protocol=any', '--ignore-ssl-errors=yes');
     }
-    childArgs.push(path.join(__dirname, '..', 'phantomjs', 'screenshot.js'));
+    childArgs.push(path.join(__dirname, '..', 'headless', 'scripts', 'screenshot.js'));
     childArgs.push(url);
     childArgs.push(path.join(config.run.absResultDir, config.dataDir, 'screenshots', util.getFileName(url) +
     '.png'));

lib/headless/headlessTiming.js

@@ -5,7 +5,7 @@
  * Released under the Apache 2.0 License
  */
 var Stats = require('fast-stats').Stats;
-var util = require('./util/util');
+var util = require('../util/util');
 var timeMetrics = ['domainLookupTime', 'redirectionTime', 'serverConnectionTime', 'serverResponseTime',
   'pageDownloadTime', 'domInteractiveTime', 'domContentLoadedTime', 'pageLoadTime', 'frontEndTime', 'backEndTime'
 ];