Merge pull request #98 from millermedeiros/983797-script-with

Bug 983795 - Element#scriptWith should accept extra arguments r=gaye
mozilla-b2g · Mar 14, 2014 · 7d3d724 · 7d3d724
2 parents 49bac73 + 7221f61
commit 7d3d724
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 9 deletions.
diff --git a/lib/marionette/element.js b/lib/marionette/element.js
@@ -94,11 +94,16 @@
      * a function with this element as first argument.
      * @method scriptWith
      * @param {Function|String} script remote script.
+     * @param {Array} [args] optional arguments for script.
      * @param {Function} callback callback when script completes.
      * @return {String|Number} return value of the script.
      */
-    scriptWith: function scriptWith(script, callback) {
-      return this.client.executeScript(script, [this], callback);
+    scriptWith: function scriptWith(script, args, callback) {
+      if (!Array.isArray(args)) {
+        callback = args;
+        args = [];
+      }
+      return this.client.executeScript(script, [this].concat(args), callback);
     },
 
     /**

diff --git a/test/integration/element-test.js b/test/integration/element-test.js
@@ -16,11 +16,11 @@ suite('element methods', function() {
 
   test('#scriptWith', function() {
     var element = client.findElement('html');
-    var evaled = element.scriptWith(function() {
-      return '111';
-    });
+    var evaled = element.scriptWith(function(el, arg) {
+      return el.tagName + ' ' + arg;
+    }, ['FTW!']);
 
-    assert.equal(evaled, '111');
+    assert.equal(evaled, 'HTML FTW!');
   });
 
   test('#findElement', function() {

diff --git a/test/marionette/element-test.js b/test/marionette/element-test.js
@@ -109,17 +109,39 @@ suite('marionette/element', function() {
       subject.client.executeScript = function() {
         calledWith = arguments;
       };
-
-      subject.scriptWith(fn, cb);
     });
 
-    test('should call client.executeScript with' +
+    test('should call client.executeScript with ' +
       'element as argument', function() {
+      subject.scriptWith(fn);
+
+      assert.strictEqual(calledWith[0], fn);
+      assert.deepEqual(calledWith[1], [
+        subject
+      ]);
+      assert.strictEqual(calledWith[2], undefined);
+    });
+
+
+    test('should call client.executeScript with element ' +
+      ' + callback', function(){
+      subject.scriptWith(fn, cb);
+
       assert.strictEqual(calledWith[0], fn);
       assert.deepEqual(calledWith[1], [
         subject
       ]);
+      assert.strictEqual(calledWith[2], cb);
+    });
 
+    test('should call client.executeScript with element ' +
+      ' + args + callback', function(){
+      subject.scriptWith(fn, ['foo', 'bar'], cb);
+
+      assert.strictEqual(calledWith[0], fn);
+      assert.deepEqual(calledWith[1], [
+        subject, 'foo', 'bar'
+      ]);
       assert.strictEqual(calledWith[2], cb);
     });