Skip to content

Commit 356808a

Browse files
committed
Update selenium and related tests
1 parent cca665e commit 356808a

5 files changed

Lines changed: 21 additions & 9 deletions

File tree

msal4j-sdk/pom.xml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,19 @@
114114
<dependency>
115115
<groupId>org.seleniumhq.selenium</groupId>
116116
<artifactId>selenium-java</artifactId>
117-
<version>3.14.0</version>
117+
<version>4.13.0</version>
118+
<scope>test</scope>
119+
</dependency>
120+
<dependency>
121+
<groupId>com.squareup.okhttp3</groupId>
122+
<artifactId>okhttp</artifactId>
123+
<version>3.14.9</version>
124+
<scope>test</scope>
125+
</dependency>
126+
<dependency>
127+
<groupId>org.apache.httpcomponents</groupId>
128+
<artifactId>httpclient</artifactId>
129+
<version>4.5.14</version>
118130
<scope>test</scope>
119131
</dependency>
120132
<dependency>

msal4j-sdk/src/integrationtest/java/infrastructure/SeleniumExtensions.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ private SeleniumExtensions() {
2828

2929
public static WebDriver createDefaultWebDriver() {
3030
ChromeOptions options = new ChromeOptions();
31-
options.addArguments("--headless");
31+
options.addArguments("--headless=new");
3232
options.addArguments("--incognito");
3333

3434
return new ChromeDriver(options);
3535
}
3636

3737
public static WebElement waitForElementToBeVisibleAndEnabled(WebDriver driver, By by, Duration timeout) {
38-
WebDriverWait wait = new WebDriverWait(driver, timeout.getSeconds());
38+
WebDriverWait wait = new WebDriverWait(driver, timeout);
3939
return wait.until(ExpectedConditions.elementToBeClickable(by));
4040
}
4141

msal4j-sdk/src/integrationtest/java/infrastructure/pageobjects/ADFSLoginPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class ADFSLoginPage {
3232

3333
public ADFSLoginPage(WebDriver driver) {
3434
this.driver = driver;
35-
this.wait = new WebDriverWait(driver, DEFAULT_TIMEOUT.getSeconds());
35+
this.wait = new WebDriverWait(driver, DEFAULT_TIMEOUT);
3636
}
3737

3838
/**

msal4j-sdk/src/integrationtest/java/infrastructure/pageobjects/AzureADLoginPage.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class AzureADLoginPage {
4343

4444
public AzureADLoginPage(WebDriver driver) {
4545
this.driver = driver;
46-
this.wait = new WebDriverWait(driver, DEFAULT_TIMEOUT.getSeconds());
46+
this.wait = new WebDriverWait(driver, DEFAULT_TIMEOUT);
4747
}
4848

4949
/**
@@ -103,7 +103,7 @@ public AzureADLoginPage clickSubmit() {
103103
*/
104104
public boolean isAuthenticationComplete() {
105105
try {
106-
WebDriverWait shortWait = new WebDriverWait(driver, SHORT_TIMEOUT.getSeconds());
106+
WebDriverWait shortWait = new WebDriverWait(driver, SHORT_TIMEOUT);
107107
shortWait.until(ExpectedConditions.textToBePresentInElementLocated(
108108
AUTH_COMPLETE_BODY, AUTH_COMPLETE_TEXT));
109109
LOG.info("Authentication complete page detected");
@@ -150,7 +150,7 @@ private void handleOptionalPrompts() {
150150
private void handleAreYouTryingToSignInPrompt() {
151151
try {
152152
LOG.info("Checking for 'Are you trying to sign in' prompt");
153-
WebDriverWait shortWait = new WebDriverWait(driver, SHORT_TIMEOUT.getSeconds());
153+
WebDriverWait shortWait = new WebDriverWait(driver, SHORT_TIMEOUT);
154154
shortWait.until(ExpectedConditions.elementToBeClickable(ARE_YOU_TRYING_TO_SIGN_IN_BUTTON))
155155
.click();
156156
LOG.info("Clicked Continue on 'Are you trying to sign in' prompt");
@@ -165,7 +165,7 @@ private void handleAreYouTryingToSignInPrompt() {
165165
private void handleStaySignedInPrompt() {
166166
try {
167167
LOG.info("Checking for 'Stay signed in' prompt");
168-
WebDriverWait shortWait = new WebDriverWait(driver, SHORT_TIMEOUT.getSeconds());
168+
WebDriverWait shortWait = new WebDriverWait(driver, SHORT_TIMEOUT);
169169
shortWait.until(ExpectedConditions.elementToBeClickable(STAY_SIGNED_IN_NO_BUTTON))
170170
.click();
171171
LOG.info("Clicked No on 'Stay signed in' prompt");

msal4j-sdk/src/integrationtest/java/infrastructure/pageobjects/B2CLocalLoginPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class B2CLocalLoginPage {
3333

3434
public B2CLocalLoginPage(WebDriver driver) {
3535
this.driver = driver;
36-
this.wait = new WebDriverWait(driver, DEFAULT_TIMEOUT.getSeconds());
36+
this.wait = new WebDriverWait(driver, DEFAULT_TIMEOUT);
3737
}
3838

3939
/**

0 commit comments

Comments
 (0)