Merge branch 'master' into gentle-mite

Author: max-ostapenko

lib/helper.js

@@ -12,18 +12,18 @@ var xml2js   = require('xml2js'),
     entities = require('entities')
     qs       = require('querystring');
 
-var parser = new xml2js.Parser({explicitArray: false, mergeAttrs: true});
+var parser = new xml2js.Parser({ explicitArray: false, mergeAttrs: true });
 
 var reNumber = /^[\.\+\-]?[\d\.]+$/,
-    reInvalidDec = /(?:\.\d*){2,}/,
-    reDec = /\./,
-    reLineBreak = /[\n\r]+/g,
-    reLastBreak = /\n$/,
-    reProtocol = /^https?:\/\//i,
-    reIp = /\d+\.\d+\.\d+\.\d+/, // 127.0.0.1
+  reInvalidDec = /(?:\.\d*){2,}/,
+  reDec = /\./,
+  reLineBreak = /[\n\r]+/g,
+  reLastBreak = /\n$/,
+  reProtocol = /^https?:\/\//i,
+  reIp = /\d+\.\d+\.\d+\.\d+/, // 127.0.0.1
 
-    TAB = '\t',
-    NEWLINE = '\n';
+  TAB = '\t',
+  NEWLINE = '\n';
 
 function parseNumber(s) {
   if (typeof s !== 'string' || !reNumber.test(s) || reInvalidDec.test(s)) {
@@ -35,7 +35,7 @@ function parseNumber(s) {
 
 function normalizeObj(root) {
   if (typeof root === 'object') {
-    Object.keys(root).forEach(function(key) {
+    Object.keys(root).forEach(function (key) {
       var value = root[key];
       if (typeof value === 'string') {
         if (value.length === 0 || value === '\n') {
@@ -63,8 +63,8 @@ function xmlToObj(xml, callback) {
 
 function svToObj(delimiter, headers, sv) {
   var data,
-      start = 0,
-      obj = {};
+    start = 0,
+    obj = {};
 
   delimiter = delimiter || ',';
 
@@ -102,11 +102,11 @@ function svToObj(delimiter, headers, sv) {
 }
 
 function csvParser(data, callback) {
-  csv.parse(data.toString(), { columns: true }, function(err, data) {
+  csv.parse(data.toString(), { columns: true }, function (err, data) {
     if (err) {
       callback.bind(this, err);
     }
-    csv.transform(data, function(row) {
+    csv.transform(data, function (row) {
       var key, value;
       for (key in row) {
         value = row[key].replace(/<b>|<\/b>/g, '');
@@ -235,8 +235,8 @@ function setQuery(map, options, query) {
   map.options.forEach(function eachOpts(opt) {
     Object.keys(opt).forEach(function eachOpt(key) {
       var param = opt[key],
-          name = param.name,
-          value = options[name] || options[key];
+        name = param.name,
+        value = options[name] || options[key];
 
       if (value !== undefined && param.api) {
         if (param.array) {

lib/webpagetest.js

@@ -172,7 +172,6 @@ function get(config, pathname, data, proxy, agent, callback, encoding) {
   }
 
   return request.end();
-
 }
 
 // execute callback properly normalizing optional args