Merge pull request #44 from testdevlab/Remote

fix locators

Author: alvarolaserna

src/main/java/testUI/TestUIServer.java

@@ -377,8 +377,10 @@ public static void stop() {
             }
             getDrivers().get(driver - 1).quit();
             removeDriver(driver - 1);
-            getAppiumServices().get(driver - 1).stop();
-            getAppiumServices().remove(driver - 1);
+            if (getAppiumServices() != null && getAppiumServices().size() >= driver) {
+                getAppiumServices().get(driver - 1).stop();
+                getAppiumServices().remove(driver - 1);
+            }
             if (getDevices().size() != 0) {
                 iOSDevices = driver - getDevices().size();
                 adbUtils.stopEmulator(getDevices().get(driver - iOSDevices - 1));

src/main/java/testUI/UIUtils.java

@@ -9,7 +9,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.logging.Logger;
 
 import static com.codeborne.selenide.Selenide.*;
 import static testUI.TestUIDriver.*;

src/main/java/testUI/Utils/By.java

@@ -3,47 +3,38 @@
 import com.codeborne.selenide.Selectors;
 import testUI.Configuration;
 
+import static testUI.TestUIDriver.getDriver;
+
 public class By {
 
     public static org.openqa.selenium.By byText(String text) {
         if (!Configuration.automationType.equals(Configuration.DESKTOP_PLATFORM))
-            return org.openqa.selenium.By.xpath("//*[contains(@text,'" + text + "')]");
+            if (!getDriver().isBrowser())
+                return org.openqa.selenium.By.xpath("//*[contains(@text,'" + text + "')]");
         return Selectors.byText(text);
     }
 
     public static org.openqa.selenium.By byId(String id) {
-        if (!Configuration.automationType.equals(Configuration.DESKTOP_PLATFORM))
-            return org.openqa.selenium.By.id(id);
         return Selectors.byId(id);
     }
 
     public static org.openqa.selenium.By byXpath(String xpath) {
-        if (!Configuration.automationType.equals(Configuration.DESKTOP_PLATFORM))
-            return org.openqa.selenium.By.xpath(xpath);
         return Selectors.byXpath(xpath);
     }
 
     public static org.openqa.selenium.By byCssSelector(String cssSelector) {
-        if (!Configuration.automationType.equals(Configuration.DESKTOP_PLATFORM))
-            return org.openqa.selenium.By.cssSelector(cssSelector);
         return Selectors.byCssSelector(cssSelector);
     }
 
     public static org.openqa.selenium.By byName(String name) {
-        if (!Configuration.automationType.equals(Configuration.DESKTOP_PLATFORM))
-            return org.openqa.selenium.By.name(name);
         return Selectors.byName(name);
     }
 
     public static org.openqa.selenium.By byAttribute(String attribute, String value) {
-        if (!Configuration.automationType.equals(Configuration.DESKTOP_PLATFORM))
-            return org.openqa.selenium.By.xpath("//*[contains(@" + attribute + ",'" + value + "']");
         return Selectors.byAttribute(attribute, value);
     }
 
     public static org.openqa.selenium.By byValue(String value) {
-        if (!Configuration.automationType.equals(Configuration.DESKTOP_PLATFORM))
-            return org.openqa.selenium.By.xpath("//*[contains(@value,'" + value + "']");
         return Selectors.byValue(value);
     }
 

src/main/java/testUI/Utils/GridTestUI.java

@@ -1,6 +1,5 @@
 package testUI.Utils;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
@@ -16,7 +15,6 @@
 
 import java.io.IOException;
 
-import static testUI.Configuration.browser;
 import static testUI.UIUtils.putAllureParameter;
 
 public class GridTestUI {
@@ -277,7 +275,6 @@ private void setDesktopConfiguration(JSONObject json) {
         try {
             Configuration.remote = json.getString("proxyURL");
             if (getPlatform(json) != null) {
-                System.out.println( getPlatform(json));
                 Configuration.selenideBrowserCapabilities.setCapability(
                         CapabilityType.PLATFORM_NAME, getPlatform(json));
             }