Merge branch 'master' into testerra2

# Conflicts:
#	driver-ui/src/main/java/eu/tsystems/mms/tic/testframework/utils/WebDriverUtils.java

Author: Mike Reiche

driver-ui/src/main/java/eu/tsystems/mms/tic/testframework/utils/WebDriverUtils.java

@@ -32,9 +32,10 @@
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Proxy;
 import java.util.ArrayList;
-import java.util.Optional;
+import java.util.List;
 import java.util.Set;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 import org.openqa.selenium.Cookie;
 import org.openqa.selenium.Rectangle;
 import org.openqa.selenium.WebDriver;
@@ -297,9 +298,14 @@ public static String getSessionId(WebDriver driver) {
      * @return Rectangle
      */
     public static Rectangle getViewport(WebDriver driver) {
-
-        final ArrayList<String> list = (ArrayList<String>) JSUtils.executeScript(driver, "return [window.pageXOffset.toString(), window.pageYOffset.toString(), window.innerWidth.toString(), window.innerHeight.toString()];");
-        return new Rectangle(Integer.valueOf(list.get(0)), Integer.valueOf(list.get(1)), Integer.valueOf(list.get(3)), Integer.valueOf(list.get(2)));
+        Object result = JSUtils.executeScript(driver, "return [window.pageXOffset.toString(), window.pageYOffset.toString(), window.innerWidth.toString(), window.innerHeight.toString()];");
+        if (result != null) {
+            final ArrayList<String> list = (ArrayList<String>)result;
+            List<Double> numbers = list.stream().map(Double::valueOf).collect(Collectors.toList());
+            return new Rectangle(numbers.get(0).intValue(), numbers.get(1).intValue(), numbers.get(3).intValue(), numbers.get(2).intValue());
+        } else {
+            return new Rectangle(-1,-1,-1,-1);
+        }
     }
 
 

integration-tests/src/test/java/eu/tsystems/mms/tic/testframework/test/layoutcheck/LayoutCheckTest.java

@@ -74,7 +74,7 @@ public void testCheckElementLayoutDistance_fails() {
         guiElement.asserts().assertScreenshot("TestArticleFailed", 1);
     }
 
-    @Test()
+    @Test(expectedExceptions = TimeoutException.class)
     public void testCheckElementLayoutSize_fails() {
         GuiElement guiElement = getGuiElementQa("section/layoutTestArticle");
         guiElement.asserts().assertScreenshot("TestArticle-90-percent-width", 1);

integration-tests/src/test/resources/layout-references/chromeHeadless/InvisibleTestArticle.png

@@ -1,13 +1,7 @@
-@font-face {
-    src:local("fonts/OpenSans-Light.ttf");
-    font-family: 'OpenSans Light';
-    font-style: normal;
-    font-weight: 400;
-}
-
 body {
-    font-family: 'OpenSans Light', sans-serif;
+    font-family: sans-serif;
 }
+
 section {
     width: 700px;
 }