Merge pull request #181 from healenium/feature/EPMHLM-218

Feature/epmhlm 218

pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.epam.healenium</groupId>
     <artifactId>healenium-web</artifactId>
-    <version>3.2.3</version>
+    <version>3.2.4</version>
     <packaging>jar</packaging>
     <name>healenium-web</name>
     <description>healenium web client</description>

src/main/java/com/epam/healenium/handlers/proxy/BaseHandler.java

@@ -103,7 +103,7 @@ protected PageAwareBy awareBy(By by) {
         return (by instanceof PageAwareBy) ? (PageAwareBy) by : PageAwareBy.by(driver.getTitle(), by);
     }
 
-    protected WebElement wrapElement(WebElement element, ClassLoader loader) {
+    public WebElement wrapElement(WebElement element, ClassLoader loader) {
         WebElementProxyHandler elementProxyHandler = new WebElementProxyHandler(element, engine);
         return ProxyFactory.createWebElementProxy(loader, elementProxyHandler);
     }

src/main/java/com/epam/healenium/handlers/proxy/WebElementProxyHandler.java

@@ -43,11 +43,15 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
             ClassLoader loader = driver.getClass().getClassLoader();
             if ("findElement".equals(method.getName())) {
                 WebElement element = findElement((By) args[0]);
-                return Optional.ofNullable(element).map(it -> wrapElement(it, loader)).orElse(null);
+                return engine.isProxy()
+                        ? element
+                        : Optional.ofNullable(element).map(it -> wrapElement(it, loader)).orElse(null);
             }
             if ("findElements".equals(method.getName())) {
                 List<WebElement> elements = findElements((By) args[0]);
-                return elements.stream().map(it -> wrapElement(it, loader)).collect(Collectors.toList());
+                return engine.isProxy()
+                        ? elements
+                        : elements.stream().map(it -> wrapElement(it, loader)).collect(Collectors.toList());
             }
             if ("getWrappedElement".equals(method.getName())) {
                 return delegate;

src/main/resources/application.conf

@@ -1,4 +1,4 @@
-recovery-tries = 3
+recovery-tries = 1
 score-cap = .6
 heal-enabled = true
 serverHost = localhost