migrated evaluate() calls to use phantomjs ones

@@ -222,7 +222,7 @@ Casper.prototype.base64encode = function base64encode(url, method, data) {
     "use strict";
     "use strict";
     return this.evaluate(function _evaluate(url, method, data) {
     return this.evaluate(function _evaluate(url, method, data) {
         return window.__utils__.getBase64(url, method, data);
         return window.__utils__.getBase64(url, method, data);
-    }, { url: url, method: method, data: data });
+    }, url, method, data);
 };
 };
 
 
 /**
 /**
@@ -579,13 +579,7 @@ Casper.prototype.echo = function echo(text, style, pad) {
  *         document.querySelector('#username').value = username;
  *         document.querySelector('#username').value = username;
  *         document.querySelector('#password').value = password;
  *         document.querySelector('#password').value = password;
  *         document.querySelector('#submit').click();
  *         document.querySelector('#submit').click();
- *     }, {
- *         username: 'Bazoonga',
- *         password: 'baz00nga'
- *     })
- *
- * FIXME: waiting for a patch of PhantomJS to allow direct passing of
- * arguments to the function.
+ *     }, 'Bazoonga', 'baz00nga');
  *
  *
  * @param  Function  fn       The function to be evaluated within current page DOM
  * @param  Function  fn       The function to be evaluated within current page DOM
  * @param  Object    context  Object containing the parameters to inject into the function
  * @param  Object    context  Object containing the parameters to inject into the function
@@ -649,7 +643,7 @@ Casper.prototype.exists = function exists(selector) {
     this.checkStarted();
     this.checkStarted();
     return this.evaluate(function _evaluate(selector) {
     return this.evaluate(function _evaluate(selector) {
         return window.__utils__.exists(selector);
         return window.__utils__.exists(selector);
-    }, { selector: selector });
+    }, selector);
 };
 };
 
 
 /**
 /**
@@ -676,7 +670,7 @@ Casper.prototype.fetchText = function fetchText(selector) {
     this.checkStarted();
     this.checkStarted();
     return this.evaluate(function _evaluate(selector) {
     return this.evaluate(function _evaluate(selector) {
         return window.__utils__.fetchText(selector);
         return window.__utils__.fetchText(selector);
-    }, { selector: selector });
+    }, selector);
 };
 };
 
 
 /**
 /**
@@ -696,10 +690,7 @@ Casper.prototype.fill = function fill(selector, vals, submit) {
     this.emit('fill', selector, vals, submit);
     this.emit('fill', selector, vals, submit);
     var fillResults = this.evaluate(function _evaluate(selector, values) {
     var fillResults = this.evaluate(function _evaluate(selector, values) {
        return window.__utils__.fill(selector, values);
        return window.__utils__.fill(selector, values);
-    }, {
-        selector: selector,
-        values:   vals
-    });
+    }, selector, vals);
     if (!fillResults) {
     if (!fillResults) {
         throw new CasperError("Unable to fill form");
         throw new CasperError("Unable to fill form");
     } else if (fillResults.errors.length > 0) {
     } else if (fillResults.errors.length > 0) {
@@ -733,7 +724,7 @@ Casper.prototype.fill = function fill(selector, vals, submit) {
                 // http://www.spiration.co.uk/post/1232/Submit-is-not-a-function
                 // http://www.spiration.co.uk/post/1232/Submit-is-not-a-function
                 form.submit.click();
                 form.submit.click();
             }
             }
-        }, { selector: selector });
+        }, selector);
     }
     }
 };
 };
 
 
@@ -819,7 +810,7 @@ Casper.prototype.getElementAttribute = Casper.prototype.getElementAttr = functio
     this.checkStarted();
     this.checkStarted();
     return this.evaluate(function _evaluate(selector, attribute) {
     return this.evaluate(function _evaluate(selector, attribute) {
         return document.querySelector(selector).getAttribute(attribute);
         return document.querySelector(selector).getAttribute(attribute);
-    }, { selector: selector, attribute: attribute });
+    }, selector, attribute);
 };
 };
 
 
 /**
 /**
@@ -836,7 +827,7 @@ Casper.prototype.getElementBounds = function getElementBounds(selector) {
     }
     }
     var clipRect = this.evaluate(function _evaluate(selector) {
     var clipRect = this.evaluate(function _evaluate(selector) {
         return window.__utils__.getElementBounds(selector);
         return window.__utils__.getElementBounds(selector);
-    }, { selector: selector });
+    }, selector);
     if (!utils.isClipRect(clipRect)) {
     if (!utils.isClipRect(clipRect)) {
         throw new CasperError('Could not fetch boundaries for element matching selector: ' + selector);
         throw new CasperError('Could not fetch boundaries for element matching selector: ' + selector);
     }
     }
@@ -857,7 +848,7 @@ Casper.prototype.getElementsBounds = function getElementBounds(selector) {
     }
     }
     return this.evaluate(function _evaluate(selector) {
     return this.evaluate(function _evaluate(selector) {
         return window.__utils__.getElementsBounds(selector);
         return window.__utils__.getElementsBounds(selector);
-    }, { selector: selector });
+    }, selector);
 };
 };
 
 
 /**
 /**
@@ -879,16 +870,15 @@ Casper.prototype.getGlobal = function getGlobal(name) {
             result.error = message;
             result.error = message;
         }
         }
         return result;
         return result;
-    }, {'name': name});
+    }, name);
     if (typeof result !== "object") {
     if (typeof result !== "object") {
         throw new CasperError(f('Could not retrieve global value for "%s"', name));
         throw new CasperError(f('Could not retrieve global value for "%s"', name));
     } else if ('error' in result) {
     } else if ('error' in result) {
         throw new CasperError(result.error);
         throw new CasperError(result.error);
     } else if (utils.isString(result.value)) {
     } else if (utils.isString(result.value)) {
         return JSON.parse(result.value);
         return JSON.parse(result.value);
-    } else {
-        return undefined;
     }
     }
+    return undefined;
 };
 };
 
 
 /**
 /**
@@ -911,7 +901,7 @@ Casper.prototype.getHTML = function getHTML(selector, outer) {
     return this.evaluate(function getSelectorHTML(selector, outer) {
     return this.evaluate(function getSelectorHTML(selector, outer) {
         var element = __utils__.findOne(selector);
         var element = __utils__.findOne(selector);
         return outer ? element.outerHTML : element.innerHTML;
         return outer ? element.outerHTML : element.innerHTML;
-    }, { selector: selector, outer: !!outer });
+    }, selector, !!outer);
 };
 };
 
 
 /**
 /**
@@ -1113,10 +1103,7 @@ Casper.prototype.mouseEvent = function mouseEvent(type, selector) {
     }
     }
     var eventSuccess = this.evaluate(function(type, selector) {
     var eventSuccess = this.evaluate(function(type, selector) {
         return window.__utils__.mouseEvent(type, selector);
         return window.__utils__.mouseEvent(type, selector);
-    }, {
-        type: type,
-        selector: selector
-    });
+    }, type, selector);
     if (!eventSuccess) {
     if (!eventSuccess) {
         // fallback onto native QtWebKit mouse events
         // fallback onto native QtWebKit mouse events
         try {
         try {
@@ -1561,7 +1548,7 @@ Casper.prototype.visible = function visible(selector) {
     this.checkStarted();
     this.checkStarted();
     return this.evaluate(function _evaluate(selector) {
     return this.evaluate(function _evaluate(selector) {
         return window.__utils__.visible(selector);
         return window.__utils__.visible(selector);
-    }, { selector: selector });
+    }, selector);
 };
 };
 
 
 /**
 /**

@@ -198,7 +198,7 @@ Tester.prototype.assertNotEquals = function assertNotEquals(subject, shouldnt, m
  *
  *
  * @param  Function  fn       A function to be evaluated in remote DOM
  * @param  Function  fn       A function to be evaluated in remote DOM
  * @param  String    message  Test description
  * @param  String    message  Test description
- * @param  Object    params   Object containing the parameters to inject into the function (optional)
+ * @param  Object    params   Object/Array containing the parameters to inject into the function (optional)
  * @return Object             An assertion result object
  * @return Object             An assertion result object
  */
  */
 Tester.prototype.assertEval = Tester.prototype.assertEvaluate = function assertEval(fn, message, params) {
 Tester.prototype.assertEval = Tester.prototype.assertEvaluate = function assertEval(fn, message, params) {
@@ -250,7 +250,7 @@ Tester.prototype.assertField = function assertField(inputName, expected,  messag
     "use strict";
     "use strict";
     var actual = this.casper.evaluate(function(inputName) {
     var actual = this.casper.evaluate(function(inputName) {
         return __utils__.getFieldValue(inputName);
         return __utils__.getFieldValue(inputName);
-    }, { inputName: inputName });
+    }, inputName);
     return this.assert(this.testEquals(actual, expected),  message, {
     return this.assert(this.testEquals(actual, expected),  message, {
         type: 'assertField',
         type: 'assertField',
         standard: f('"%s" input field has the value "%s"', inputName, expected),
         standard: f('"%s" input field has the value "%s"', inputName, expected),