Synced galenjs scripts

galenframework · Jun 1, 2014 · f06ff44 · f06ff44
1 parent 76193d8
commit f06ff44
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 6 deletions.
diff --git a/src/main/resources/js/GalenApi.js b/src/main/resources/js/GalenApi.js
@@ -108,6 +108,14 @@ var session = {
     }
 };
 
+var galenConsole = {
+    log: function (object) {
+        if (typeof object == "string") {
+            System.out.println(object);
+        }
+        else System.out.println(JSON.stringify(object));
+    }
+};
 
 (function (exports) {
     exports.createDriver = createDriver;
@@ -120,4 +128,5 @@ var session = {
     exports.cookie = cookie;
     exports.inject = inject;
     exports.readFile = readFile;
+    exports.console = galenConsole;
 })(this);
diff --git a/src/main/resources/js/GalenCore.js b/src/main/resources/js/GalenCore.js
@@ -321,13 +321,13 @@ function afterTest(callback) {
 function retry(times, callback) {
     if (times > 0) {
         try {
-            return callback();
+            return callback(times);
         }
         catch (ex) {
             return retry(times - 1, callback);
         }
     }
-    else return callback();
+    else return callback(times);
 }
 
 function createTestDataProvider(varName) {

diff --git a/src/main/resources/js/GalenPages.js b/src/main/resources/js/GalenPages.js
@@ -17,11 +17,17 @@
 
 String.prototype.trim=function(){return this.replace(/^\s+|\s+$/g, '');};
 
+function listToArray(list) {
+    return GalenUtils.listToArray(list);
+}
 
 var GalenPages = {
-    allowReporting: true,
+    settings: {
+        cacheWebElements: true,
+        allowReporting: true,
+    },
     report: function (name, details) {
-        if (GalenPages.allowReporting) {
+        if (GalenPages.settings.allowReporting) {
             var testSession = TestSession.current();
             if (testSession != null) {
                 var node = testSession.getReport().info(name);
@@ -108,7 +114,8 @@ var GalenPages = {
                 return this.parent.findChildren(locator);
             }
             else {
-                return this.driver.findElements(GalenPages.convertLocator(locator));
+                var list = this.driver.findElements(GalenPages.convertLocator(locator));
+                return listToArray(list);
             }
         };
         this.set = function (props) {
@@ -205,7 +212,7 @@ var GalenPages = {
             this.getWebElement().clear();
         };
         this.getWebElement = function () {
-            if (this.cachedWebElement == null) {
+            if (GalenPages.settings.cacheWebElements && this.cachedWebElement == null) {
                 this.cachedWebElement = this.parent.findChild(this.locator);
             }
             return this.cachedWebElement;
@@ -269,6 +276,40 @@ var GalenPages = {
             }
             return true;
         };
+        this.findChild = function (locator) {
+            if (typeof locator == "string") {
+                locator = GalenPages.parseLocator(locator);
+            }
+
+            if (this.parent != undefined ) {
+                return this.parent.findChild(locator);
+            }
+            else {
+                try {
+                    var element = this.driver.findElement(GalenPages.convertLocator(locator));
+                    if (element == null) {
+                        throw new Error("No such element: " + locator.type + " " + locator.value);
+                    }
+                    return element;
+                }
+                catch(error) {
+                    throw new Error("No such element: " + locator.type + " " + locator.value);
+                }
+            }
+        };
+        this.findChildren = function (locator) {
+            if (typeof locator == "string") {
+                locator = GalenPages.parseLocator(locator);
+            }
+
+            if (this.parent != undefined ) {
+                return this.parent.findChildren(locator);
+            }
+            else {
+                var list = this.driver.findElements(GalenPages.convertLocator(locator));
+                return listToArray(list);
+            }
+        };
     },
     create: function (driver) {
         return new GalenPages.Driver(driver);