Fix ElementIsOnScreen js in order to resolve #57 (#122)

* Fix ElementIsOnScreen js in order to resolve #57

* #57 Refactor GetElementXPath.js

Author: paveliam

Aquality.Selenium/src/Aquality.Selenium/Resources/JavaScripts/AutoAcceptAlerts.js

@@ -6,4 +6,4 @@ window.alert = function (message) {
 };
 window.prompt = function (message) {
     return true;
-}
+};

Aquality.Selenium/src/Aquality.Selenium/Resources/JavaScripts/ElementIsOnScreen.js

@@ -1,5 +1,6 @@
-var rect = arguments[0].getBoundingClientRect();
-return (
-    rect.top >= 0 && rect.left >= 0 && rect.bottom <= (
-        window.innerHeight || document.documentElement.clientHeight) && rect.right <= (window.innerWidth || document.documentElement.clientWidth)
-);
+return (function (element) {
+    let rect = element.getBoundingClientRect();
+    return rect.top >= 0 && rect.left >= 0
+        && (rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) && rect.bottom !== 0)
+        && (rect.right <= (window.innerWidth || document.documentElement.clientWidth) && rect.right !== 0);
+})(arguments[0]);

Aquality.Selenium/src/Aquality.Selenium/Resources/JavaScripts/GetComboBoxTexts.js

@@ -1,7 +1,6 @@
 return (function(element) {
     var array = new Array();
-    for(i = 0; i < element.length; i++)
-    {
+    for(i = 0; i < element.length; i++) {
         array.push(element[i].text);
     }
     return array;

Aquality.Selenium/src/Aquality.Selenium/Resources/JavaScripts/GetElementXPath.js

@@ -1,25 +1,25 @@
-function WebElement_XPath(element) {
+function getXpath(element) {
     if (element.tagName === 'HTML') {
         return '/html';
     }
     if (element === document.body) {
         return '/html/body';
     }
     // calculate position among siblings
-    var position = 0;
+    let position = 0;
     // Gets all siblings of that element.
-    var siblings = element.parentNode.childNodes;
-    for (var i = 0; i < siblings.length; i++) {
-        var sibling = siblings[i];
+    let siblings = element.parentNode.childNodes;
+    for (let i = 0; i < siblings.length; i++) {
+        let sibling = siblings[i];
         // Check sibling with our element if match then recursively call for its parent element.
         if (sibling === element) {
-            return WebElement_XPath(element.parentNode) + '/' + element.tagName + '[' + (position + 1) + ']';
+            return `${getXpath(element.parentNode)}/${element.tagName}[${position + 1}]`;
         }
         // if it is a sibling & element-node then only increments position.
-        var type = sibling.nodeType;
+        let type = sibling.nodeType;
         if (type === 1 && sibling.tagName === element.tagName) {
             position++;
         }
     }
-};
-return WebElement_XPath(arguments[0]);
+}
+return getXpath(arguments[0]);

Aquality.Selenium/src/Aquality.Selenium/Resources/JavaScripts/GetViewPortCoordinates.js

@@ -1,2 +1,4 @@
-let clientRect = arguments[0].getBoundingClientRect();
-return [clientRect.left, clientRect.top];
+return (function (element) {
+    let rect = element.getBoundingClientRect();
+    return [rect.left, rect.top];
+})(arguments[0]);

Aquality.Selenium/src/Aquality.Selenium/Resources/JavaScripts/SelectComboBoxValueByText.js

@@ -1,13 +1,15 @@
-var select = arguments[0];
-for (var i = 0; i < select.options.length; i++) {
-    if (select.options[i].text == arguments[1]) {
-        select.options[i].selected = true;
+function selectValue(element, text) {
+    for (var i = 0; i < element.options.length; i++) {
+        if (element.options[i].text == text) {
+            element.options[i].selected = true;
+        }
+    }
+    if ("createEvent" in document) {
+        var evt = document.createEvent("HTMLEvents");
+        evt.initEvent("change", false, true);
+        element.dispatchEvent(evt);
+    } else {
+        element.fireEvent("onchange");
     }
 }
-if ("createEvent" in document) {
-    var evt = document.createEvent("HTMLEvents");
-    evt.initEvent("change", false, true);
-    arguments[0].dispatchEvent(evt);
-} else {
-    arguments[0].fireEvent("onchange");
-}
+selectValue(arguments[0], arguments[1]);

Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/Actions/JsActionsTests.cs

@@ -68,7 +68,6 @@ public void Should_BePossibleTo_SetFocus()
             Assert.AreEqual(expectedText, product.TxtQuantity.Value, $"One character should be removed from '{currentText}'");
         }
 
-        [Ignore("should be updated")]
         [Test]
         public void Should_BePossibleTo_CheckIsElementOnScreen()
         {

Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/TestApp/TheInternet/Forms/HoversForm.cs

@@ -17,14 +17,12 @@ public HoversForm() : base(By.XPath("//h3[contains(.,'Hovers')]"), "Hovers")
 
         public ILabel GetHiddenElement(HoverExample example, ElementState state = ElementState.Displayed)
         {
-            var xpath = string.Format(HiddenElementTmpLoc, ((int)example).ToString());
-            return ElementFactory.GetLabel(By.XPath(xpath), $"Hidden element for {example} example", state);
+            return ElementFactory.GetLabel(By.XPath(string.Format(HiddenElementTmpLoc, (int)example)), $"Hidden element for {example} example", state);
         }
 
         public ILabel GetExample(HoverExample example)
         {
-            var xpath = string.Format(ExampleTmpLoc, ((int) example).ToString());
-            return ElementFactory.GetLabel(By.XPath(xpath), $"{example} example");
+            return ElementFactory.GetLabel(By.XPath(string.Format(ExampleTmpLoc, (int)example)), $"{example} example");
         }
     }