Skip to content

Commit fc6c613

Browse files
authored
set the browser language to pass the playwright tests if default lang of browser is not en (WebGoat#2108)
1 parent f45bf61 commit fc6c613

File tree

4 files changed

+19
-13
lines changed

4 files changed

+19
-13
lines changed

pom.xml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,24 +63,24 @@
6363
<properties>
6464
<!-- Shared properties with plugins and version numbers across submodules-->
6565
<asciidoctorj.version>3.0.0</asciidoctorj.version>
66-
<bootstrap.version>5.3.3</bootstrap.version>
66+
<bootstrap.version>5.3.5</bootstrap.version>
6767
<cglib.version>3.3.0</cglib.version>
6868
<!-- do not update necessary for lesson -->
6969
<checkstyle.version>3.6.0</checkstyle.version>
7070
<commons-collections.version>3.2.1</commons-collections.version>
7171
<commons-compress.version>1.27.1</commons-compress.version>
72-
<commons-io.version>2.18.0</commons-io.version>
72+
<commons-io.version>2.19.0</commons-io.version>
7373
<commons-lang3.version>3.14.0</commons-lang3.version>
7474
<commons-text.version>1.13.0</commons-text.version>
75-
<guava.version>33.4.6-jre</guava.version>
75+
<guava.version>33.4.7-jre</guava.version>
7676
<jacoco.version>0.8.11</jacoco.version>
7777
<java.version>23</java.version>
7878
<jaxb.version>2.3.1</jaxb.version>
7979
<jjwt.version>0.9.1</jjwt.version>
8080
<jose4j.version>0.9.3</jose4j.version>
8181
<jquery.version>3.7.1</jquery.version>
8282
<jsoup.version>1.19.1</jsoup.version>
83-
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
83+
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
8484
<maven-failsafe-plugin.version>3.5.2</maven-failsafe-plugin.version>
8585
<maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
8686
<maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
@@ -96,7 +96,7 @@
9696
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
9797
<thymeleaf.version>3.1.2.RELEASE</thymeleaf.version>
9898
<waittimeForServerStart>60</waittimeForServerStart>
99-
<webdriver.version>6.0.0</webdriver.version>
99+
<webdriver.version>6.0.1</webdriver.version>
100100
<webgoat.context>/WebGoat</webgoat.context>
101101
<webgoat.port>8080</webgoat.port>
102102
<webgoat.sslenabled>false</webgoat.sslenabled>
@@ -238,7 +238,7 @@
238238
<dependency>
239239
<groupId>org.projectlombok</groupId>
240240
<artifactId>lombok</artifactId>
241-
<version>1.18.36</version>
241+
<version>1.18.38</version>
242242
<scope>provided</scope>
243243
<optional>true</optional>
244244
</dependency>
@@ -510,7 +510,7 @@
510510
<configuration>
511511
<forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
512512
<!-- Necessary for vulnerable components lesson -->
513-
<argLine>--add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
513+
<argLine>--enable-native-access=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
514514
--add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
515515
--add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED
516516
--add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED
@@ -694,6 +694,7 @@
694694
<argument>-Dwebgoat.server.directory=${java.io.tmpdir}/webgoat_${webgoat.port}</argument>
695695
<argument>-Dwebgoat.user.directory=${java.io.tmpdir}/webgoat_${webgoat.port}</argument>
696696
<argument>-Dspring.main.banner-mode=off</argument>
697+
<argument>--enable-native-access=ALL-UNNAMED</argument>
697698
<argument>--add-opens</argument>
698699
<argument>java.base/java.lang=ALL-UNNAMED</argument>
699700
<argument>--add-opens</argument>

src/it/java/org/owasp/webgoat/playwright/webgoat/PlaywrightTest.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,17 @@ public class PlaywrightTest {
1919
public static class WebGoatOptions implements OptionsFactory {
2020
@Override
2121
public Options getOptions() {
22-
return new Options().setHeadless(true).setContextOptions(getContextOptions());
22+
return new Options()
23+
.setHeadless(true)
24+
.setContextOptions(getContextOptions());
2325
}
26+
2427
}
2528

2629
protected static Browser.NewContextOptions getContextOptions() {
27-
return new Browser.NewContextOptions().setBaseURL(webGoatUrlConfig.getBaseUrl());
30+
return new Browser.NewContextOptions()
31+
.setLocale("en-US")
32+
.setBaseURL(webGoatUrlConfig.getBaseUrl());
2833
}
2934

3035
public static String webGoatUrl(String path) {

src/it/java/org/owasp/webgoat/playwright/webgoat/RegistrationUITest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void registerWhileLoggedIn(Browser browser) {
3535
@Test
3636
@DisplayName("Should register a new user")
3737
void registerNewUser(Browser browser) {
38-
var page = browser.newContext().newPage();
38+
var page = browser.newContext(new Browser.NewContextOptions().setLocale("en-US")).newPage();
3939
var registrationPage = new RegistrationPage(page);
4040
registrationPage.open();
4141

src/it/java/org/owasp/webgoat/playwright/webgoat/helpers/Authentication.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,19 @@ boolean loggedIn() {
3333

3434
public static Page sylvester(Browser browser) {
3535
User user = login(browser, sylvester);
36-
return browser.newContext(new Browser.NewContextOptions().setStorageState(user.auth)).newPage();
36+
return browser.newContext(new Browser.NewContextOptions().setLocale("en-US").setStorageState(user.auth)).newPage();
3737
}
3838

3939
public static Page tweety(Browser browser) {
4040
User user = login(browser, tweety);
41-
return browser.newContext(new Browser.NewContextOptions().setStorageState(user.auth)).newPage();
41+
return browser.newContext(new Browser.NewContextOptions().setLocale("en-US").setStorageState(user.auth)).newPage();
4242
}
4343

4444
private static User login(Browser browser, User user) {
4545
if (user.loggedIn()) {
4646
return user;
4747
}
48-
var page = browser.newContext().newPage();
48+
var page = browser.newContext(new Browser.NewContextOptions().setLocale("en-US")).newPage();
4949
RegistrationPage registrationPage = new RegistrationPage(page);
5050
registrationPage.open();
5151
registrationPage.register(user.name, user.password);

0 commit comments

Comments
 (0)