Merge branch 'master' into gentle-mite

Author: max-ostapenko

bin/webpagetest

@@ -59,13 +59,13 @@ var formatData = function(err, data, info) {
   }
 
   if (file) {
-    fs.writeFile(file, dataStr, encoding, function writeFile(err) {
+    fs.writeFile(file, (dataStr || data), encoding, function writeFile(err) {
       if (err) {
         output(err.message, 1);
       }
     });
   } else {
-    output(dataStr, err ? 1 : 0);
+    output((dataStr || data), err ? 1 : 0);
   }
 
   return data;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpagetest",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "description": "WebPageTest API wrapper for NodeJS",
   "author": "WebPageTest <[email protected]> (http://github.com/WebPageTest)",
   "homepage": "http://github.com/WebPageTest/webpagetest-api",

test/command-line-test.js

@@ -322,25 +322,6 @@ describe('WebPageTest Command Line', function() {
     });
   });
 
-  // loop all commands help
-  [
-    '', 'status', 'results', 'locations', 'testers', 'test', 'testAndWait', 'restart', 'cancel', 'har',
-    'pagespeed', 'utilization', 'request', 'timeline', 'netlog', 'chrometrace',
-    'console', 'testinfo', 'history', 'googlecsi', 'response', 'waterfall',
-    'screenshot', 'video', 'player', 'listen', 'batch','testBalance'
-  ].forEach(function eachCmd(command) {
-      it('gets a ' + command + ' help input and returns the help text', function(done) {
-        exec(mock(command + ' --help'), function(err, data) {
-          if (err) return done(err);
-          data = data.replace(/[\r\n\s]/g, '');
-          var output = getHelp(command);
-          output = output.replace(/[\r\n\s]/g, '');
-          assert.equal(data, output);
-          done();
-        });
-      });
-  });
-
   it('gets a batch input returns the batch commands output in order', function(done) {
     exec(mock('batch ' + path.join(__dirname, 'fixtures/batch.txt')), function(err, data) {
       if (err) return done(err);

test/dryrun-test.js

@@ -9,7 +9,7 @@ var assert      = require('assert'),
     WebPageTest = require('../lib/webpagetest');
 
 var wptServer = 'https://www.example.com:1234/foo/bar/',
-    wpt = new WebPageTest(wptServer);
+    wpt = new WebPageTest(wptServer, 'YOURAPIKEY');
 
 describe('Dry Run', function() {
   describe('An Example WebPageTest Server', function() {

test/edge-cases-test.js

@@ -8,10 +8,10 @@
 var assert      = require('assert'),
     os          = require('os'),
     WebPageTest = require('../lib/webpagetest'),
-    helper      = require('../lib/helper'),
-    packageJson = require('../package.json');
+    helper      = require('../lib/helper')
 
 var wptServer = 'https://www.example.com:1234/foo/bar/';
+var MOCK_KEY = '0987654321';
 
 describe('Edge Cases of', function() {
   describe('An HTTPS WebPageTest Server with API key', function() {
@@ -20,7 +20,7 @@ describe('Edge Cases of', function() {
     it('gets a simple test request with another HTTP server and API key then returns API url', function(done) {
       wpt.runTest('http://foobar.com', {
         server: 'http://wpt.com',
-        key: '0987654321',
+        key: MOCK_KEY,
         dryRun: true
       }, function (err, data) {
         if (err) return done(err);
@@ -36,7 +36,7 @@ describe('Edge Cases of', function() {
     it('gets a simple test request with another HTTPS server and API key then returns API url', function(done) {
       wpt.runTest('http://foobar.com', {
         server: 'https://wpt.com:4321/baz/',
-        key: '0987654321',
+        key: MOCK_KEY,
         dryRun: true
       }, function (err, data) {
         if (err) return done(err);