closes #43: executeScript doesn't return values of JS variables. bug.

Author: jsdevel

package.json

@@ -1,6 +1,6 @@
 {
   "name": "webdriver-sync",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "description": "Synchronous testing with Selenium and node.js!",
   "main": "src/webdriver-sync.js",
   "directories": {

src/classPaths.js

@@ -21,6 +21,7 @@ module.exports = {
   List: 'java.util.List',
   LocalFileDetector: 'org.openqa.selenium.remote.LocalFileDetector',
   Long: 'java.lang.Long',
+  Map: 'java.util.Map',
   OutputType: 'org.openqa.selenium.OutputType',
   Platform: 'org.openqa.selenium.Platform',
   Point: 'org.openqa.selenium.Point',

src/interfaces/JavascriptExecutor.js

@@ -1,5 +1,7 @@
-var addFinalProp = require('../utils').addFinalProp;
-var toArray = require('../utils').collectionToArray;
+var utils = require('../utils');
+var addFinalProp = utils.addFinalProp;
+var toArray = utils.collectionToArray;
+var toObject = utils.mapToObject;
 var classPaths = require('../classPaths');
 var wd = require('../webdriver-sync');
 var WebElement = wd.WebElement;
@@ -11,13 +13,15 @@ module.exports = JavascriptExecutor;
 function JavascriptExecutor(instance) {
   addFinalProp(this, "_instance", instance);
 }
+
 JavascriptExecutor.prototype.executeAsyncScript = function() {
   var result = this._instance.executeAsyncScriptSync.apply(
     this._instance,
     getArgs(arguments)
     );
   return coerce(result);
 };
+
 JavascriptExecutor.prototype.executeScript = function() {
   var result = this._instance.executeScriptSync.apply(
     this._instance,
@@ -27,8 +31,6 @@ JavascriptExecutor.prototype.executeScript = function() {
 };
 
 function coerce(result) {
-  var checked;
-  var isWebElementArray = false;
   if (result === void 0 || result === null)
     return null;
   if (typeof result !== 'object')
@@ -38,16 +40,12 @@ function coerce(result) {
   if (java.instanceOf(result, classPaths.Long))
     return result.longValue;
   if (java.instanceOf(result, classPaths.List)) {
-    return toArray(result, function(item) {
-      if (!checked) {
-        checked = true;
-        isWebElementArray = java.instanceOf(item, classPaths.WebElement);
-      }
-      if (isWebElementArray)
-        return new WebElement(item);
-      return item;
-    });
+    return toArray(result, coerce);
+  }
+  if (java.instanceOf(result, classPaths.Map)) {
+    return toObject(result, coerce);
   }
+  return result;
 }
 
 function getArgs(from) {

src/utils.js

@@ -3,6 +3,7 @@ var Map = require('./imports').helpers.Map;
 var addFinalProp = function(obj, prop, val) {
   obj[prop] = val;
 };
+
 var collectionToArray = function(collection, mapper) {
   var array = [];
   var _mapper = typeof mapper === 'function'
@@ -37,6 +38,7 @@ function extend(Child, Parent) {
   }
   Child.__extends[Parent.name] = true;
 }
+
 function extendAll() {
   var args = toArray(arguments);
   var Child = args.splice(0, 1)[0];
@@ -50,9 +52,10 @@ function extendAll() {
     extend(Child, args[i]);
   }
 }
+
 function mapToObject(map, mapper) {
-  var keys = map.keySetSync();
-  var len = keys.size();
+  var keys = map.keySetSync().toArraySync();
+  var len = keys.length;
   var i;
   var key;
   var obj = {};
@@ -62,11 +65,12 @@ function mapToObject(map, mapper) {
       return item;
     };
   for (i = 0; i < len; i++) {
-    key = keys.getSync(i);
+    key = keys[i];
     obj[key] = _mapper(map.getSync(key));
   }
   return obj;
 }
+
 function objectToMap(obj) {
   var key;
   var map = Map.createWithStringKeysSync();
@@ -92,11 +96,13 @@ function objectToMapStringString(obj) {
 function toArray(arr) {
   return Array.prototype.slice.call(arr);
 }
+
 function toStringArray(arr) {
   return toArray(arr).map(function(v) {
     return (new String(v)).toString();
   });
 }
+
 module.exports.addFinalProp = addFinalProp;
 module.exports.collectionToArray = collectionToArray;
 module.exports.extend = extend;

test/classes/ChromeDriver.js

@@ -11,6 +11,10 @@ describe("ChromeDriver", function() {
     driver.get('http://google.com');
   });
 
+  after(function(){
+    driver.quit();
+  });
+
   it("can execute javascript synchronously", function() {
     driver.executeScript('alert(5);');
     driver.switchTo().alert().accept();
@@ -20,24 +24,4 @@ describe("ChromeDriver", function() {
     driver.executeScript('alert(6);');
     driver.switchTo().alert().accept();
   });
-
-  it("can return a WebElement", function() {
-    var el = driver.executeScript('return document.querySelector("[name=q]");');
-    assert(el instanceof WebElement);
-  });
-
-  it("can return an array of WebElements", function() {
-    var divs = driver.executeScript('return document.querySelectorAll("div");');
-    divs.forEach(function(div) {
-      assert(div instanceof WebElement);
-    });
-  });
-
-  it("can return numbers", function() {
-    assert.equal(driver.executeScript("return 5;"), 5);
-  });
-
-  it("can return strings", function() {
-    assert.equal(driver.executeScript("return 'boo';"), 'boo');
-  });
 });

test/interfaces/JavascriptExecutor.js

@@ -0,0 +1,51 @@
+describe("ChromeDriver", function() {
+  var assert = require('assert');
+  var path = require('path');
+  var driver = require(path.resolve(__dirname, '..', 'lib', 'driver')).driver;
+  var WebElement = require(
+      path.resolve(__dirname, '..', '..', 'src', 'webdriver-sync')
+    ).WebElement;
+
+  beforeEach(function() {
+    driver.get('http://google.com');
+  });
+
+  after(function(){
+    driver.quit();
+  });
+
+  it("can return a WebElement", function() {
+    var el = driver.executeScript('return document.querySelector("[name=q]");');
+    assert(el instanceof WebElement);
+  });
+
+  it("can return an array of WebElements", function() {
+    var divs = driver.executeScript('return document.querySelectorAll("div");');
+    divs.forEach(function(div) {
+      assert(div instanceof WebElement);
+    });
+  });
+
+  it("can return numbers", function() {
+    assert.equal(driver.executeScript("return 5;"), 5);
+  });
+
+  it("can return strings", function() {
+    assert.equal(driver.executeScript("return 'boo';"), 'boo');
+  });
+
+  it("can return objects", function() {
+    var result = driver.executeScript("return {asdf:5};");
+    assert.equal(result.asdf, 5);
+  });
+
+  it("can return arrays", function() {
+    var result = driver.executeScript("return ['boo'];");
+    assert.equal(result[0], 'boo');
+  });
+
+  it("handles nested arrays and objects", function(){
+    var result = driver.executeScript("return {arr:['boo'],obj:{asdf:5}};");
+    assert.equal(result.arr[0]+result.obj.asdf, 'boo5');
+  });
+});