diff --git a/src/main/java/testUI/SelenideConfiguration.java b/src/main/java/testUI/SelenideConfiguration.java index 1f4dd19..34aa3de 100644 --- a/src/main/java/testUI/SelenideConfiguration.java +++ b/src/main/java/testUI/SelenideConfiguration.java @@ -1,6 +1,8 @@ package testUI; import com.codeborne.selenide.AssertionMode; +import org.openqa.selenium.chrome.ChromeOptions; +import org.openqa.selenium.firefox.FirefoxOptions; import org.openqa.selenium.remote.DesiredCapabilities; public class SelenideConfiguration { @@ -34,5 +36,7 @@ public class SelenideConfiguration { // public static boolean driverManagerEnabled; public static boolean headless = false; public static String browserBinary = ""; + public static ChromeOptions chromeOptions; + public static FirefoxOptions firefoxOptions; } diff --git a/src/main/java/testUI/UIUtils.java b/src/main/java/testUI/UIUtils.java index af8af01..64f4293 100644 --- a/src/main/java/testUI/UIUtils.java +++ b/src/main/java/testUI/UIUtils.java @@ -5,6 +5,8 @@ import io.appium.java_client.service.local.AppiumDriverLocalService; import io.qameta.allure.Allure; import org.openqa.selenium.JavascriptExecutor; +import org.openqa.selenium.chrome.ChromeDriver; +import org.openqa.selenium.firefox.FirefoxDriver; import testUI.Utils.TestUIException; import java.util.ArrayList; @@ -188,8 +190,28 @@ private static void setUpSelenideVariables() { ? defaults.browserPosition() : Configuration.browserPosition; } + private static void setChromeDriver() { + if (Configuration.chromeOptions != null && Configuration.browser.toLowerCase().equals( + "chrome")) { + ChromeDriver driver = new ChromeDriver(Configuration.chromeOptions); + setDriver(driver); + Runtime.getRuntime().addShutdownHook(new Thread(driver::close)); + } + } + + private static void setFirefoxDriver() { + if (Configuration.firefoxOptions != null && Configuration.browser.toLowerCase().equals( + "firefox")) { + FirefoxDriver driver = new FirefoxDriver(Configuration.firefoxOptions); + setDriver(driver); + Runtime.getRuntime().addShutdownHook(new Thread(driver::close)); + } + } + protected static void startSelenideDriver(String urlOrRelativeUrl) { setUpSelenideVariables(); + setChromeDriver(); + setFirefoxDriver(); open(urlOrRelativeUrl); } diff --git a/src/main/java/testUI/elements/Element.java b/src/main/java/testUI/elements/Element.java index cbd219b..97c3282 100644 --- a/src/main/java/testUI/elements/Element.java +++ b/src/main/java/testUI/elements/Element.java @@ -399,7 +399,7 @@ public UIElement sendKeys(CharSequence charSequence) { } long finalTime = System.currentTimeMillis() - t; putLogDebug("Send keys '" + charSequence + "' to element '" + stringElement + - " after " + finalTime + " ms"); + "' after " + finalTime + " ms"); return getElementObject(); } diff --git a/src/test/java/TestRunners/TestBrowser.java b/src/test/java/TestRunners/TestBrowser.java index 4a85a40..e7cfd0a 100644 --- a/src/test/java/TestRunners/TestBrowser.java +++ b/src/test/java/TestRunners/TestBrowser.java @@ -5,7 +5,6 @@ import org.junit.Test; import org.openqa.selenium.chrome.ChromeDriver; import org.openqa.selenium.chrome.ChromeOptions; -import org.openqa.selenium.remote.DesiredCapabilities; import pages.GoogleLandingPage; import testUI.Configuration; import testUI.Utils.GridTestUI;