Merge pull request #84 from sbtqa/ie-capabilities

#83 IE capabilities
sbtqa · Oct 31, 2017 · 92b05ea · 92b05ea
2 parents af0b009 + 1d1ad1b
commit 92b05ea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/ru/sbtqa/tag/pagefactory/drivers/TagWebDriver.java b/src/main/java/ru/sbtqa/tag/pagefactory/drivers/TagWebDriver.java
@@ -49,7 +49,7 @@ public class TagWebDriver {
     private static final boolean WEBDRIVER_BROWSER_IE_KILL_ON_DISPOSE = Boolean.parseBoolean(Props.get("webdriver.browser.ie.killOnDispose", "false"));
     private static final String WEBDRIVER_BROWSER_NAME = Props.get("webdriver.browser.name").toLowerCase().equals("ie")
             // Normalize it for ie shorten name (ie)
-            ? BrowserType.IE : Props.get("webdriver.browser.name").toLowerCase();
+            ? BrowserType.IEXPLORE : Props.get("webdriver.browser.name").toLowerCase();
     private static final boolean IS_IE = WEBDRIVER_BROWSER_NAME.equals(BrowserType.IE.toLowerCase())
             || WEBDRIVER_BROWSER_NAME.equals(BrowserType.IE_HTA.toLowerCase())
             || WEBDRIVER_BROWSER_NAME.equals(BrowserType.IEXPLORE.toLowerCase());

diff --git a/src/main/java/ru/sbtqa/tag/pagefactory/support/DesiredCapabilitiesParser.java b/src/main/java/ru/sbtqa/tag/pagefactory/support/DesiredCapabilitiesParser.java
@@ -9,7 +9,6 @@
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.DesiredCapabilities;
-import ru.sbtqa.tag.pagefactory.PageFactory;
 import ru.sbtqa.tag.pagefactory.drivers.TagWebDriver;
 import ru.sbtqa.tag.qautils.properties.Props;
 
@@ -90,7 +89,12 @@ public DesiredCapabilities parse() {
                     capabilities.setCapability(ChromeOptions.CAPABILITY, options);
                 }
             } else {
-                capabilities.setCapability(capability, Props.get(rawCapabilityKey));
+                if ("true".equals(Props.get(rawCapabilityKey).toLowerCase().trim())
+                        || "false".equals(Props.get(rawCapabilityKey).toLowerCase().trim())) {
+                    capabilities.setCapability(capability, Boolean.parseBoolean(Props.get(rawCapabilityKey)));
+                } else {
+                    capabilities.setCapability(capability, Props.get(rawCapabilityKey));
+                }
             }
         }
         return capabilities;