Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/main/java/testUI/SelenideConfiguration.java
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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;

}
22 changes: 22 additions & 0 deletions src/main/java/testUI/UIUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/testUI/elements/Element.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
1 change: 0 additions & 1 deletion src/test/java/TestRunners/TestBrowser.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down