Merge pull request #140 from marcelduran/develop

Deep clone the options object so we don't mutate it. Closes #55

Author: tkadlec

lib/helper.js

@@ -237,6 +237,25 @@ function setQuery(map, options, query) {
   return query;
 }
 
+function deepClone(obj) {
+  var newObj, value, key;
+
+  if (typeof obj !== "object" || obj === null) {
+    return obj;
+  }
+
+  newObj = Array.isArray(obj) ? [] : {};
+
+  for (key in obj) {
+    value = obj[key];
+
+    // Recursively (deep) copy for nested objects, including arrays
+    newObj[key] = deepClone(value);
+  }
+
+  return newObj;
+}
+
 module.exports = {
   xmlToObj: xmlToObj,
   csvToObj: svToObj.bind(null, ',', false),
@@ -249,5 +268,6 @@ module.exports = {
   normalizeServer: normalizeServer,
   localhost: localhost,
   setQuery: setQuery,
-  WPTAPIError: WPTAPIError
+  WPTAPIError: WPTAPIError,
+  deepClone: deepClone
 };

lib/webpagetest.js

@@ -281,7 +281,7 @@ function getTestResults(id, options, callback) {
   var query = {test: id};
 
   callback = callback || typeof options === 'function' && options;
-  options = options === callback ? {} : options || {};
+  options = options === callback ? {} : helper.deepClone(options) || {};
   helper.setQuery(mapping.commands.results, options, query);
 
   // specs
@@ -317,8 +317,8 @@ function runTest(what, options, callback) {
   var query = {};
 
   callback = callback || options;
-  options = options === callback ? {} : options;
-
+  options = options === callback ? {} : helper.deepClone(options);
+  
   // testing url or script?
   query[reSpace.test(what) ? 'script' : 'url'] = what;
   // set dummy url when scripting, needed when webdriver script
@@ -479,7 +479,7 @@ function restartTest(id, options, callback) {
   var query = {resubmit: id};
 
   callback = callback || options;
-  options = options === callback ? undefined : options;
+  options = options === callback ? undefined : helper.deepClone(options);
 
   helper.setQuery(mapping.commands.restart, options, query);
 
@@ -490,7 +490,7 @@ function cancelTest(id, options, callback) {
   var query = {test: id};
 
   callback = callback || options;
-  options = options === callback ? undefined : options;
+  options = options === callback ? undefined : helper.deepClone(options);
 
   helper.setQuery(mapping.commands.cancel, options, query);