Skip to content

Commit cf2f368

Browse files
committed
Url: add constant for Togglz Console url.
No functional changes.
1 parent e989ec6 commit cf2f368

File tree

5 files changed

+12
-4
lines changed

5 files changed

+12
-4
lines changed

src/main/java/ru/mystamps/web/Url.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ public final class Url {
7676
public static final String JQUERY_JS = "/public/jquery/jquery.min.js";
7777
public static final String CATALOG_UTILS_JS = "/public/js/CatalogUtils.js";
7878

79+
public static final String TOGGLZ_CONSOLE_PAGE = "/togglz";
80+
7981
private Url() {
8082
}
8183

src/main/java/ru/mystamps/web/support/spring/security/SecurityConfig.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,9 @@ protected void configure(HttpSecurity http) throws Exception {
9696
// Allow unsecured requests to Togglz and H2 consoles.
9797
// See also: https://github.com/togglz/togglz/issues/119
9898
// See also: src/main/config/test-override-web.xml
99-
.requireCsrfProtectionMatcher(new AllExceptUrlsStartedWith("/togglz", "/console"))
99+
.requireCsrfProtectionMatcher(
100+
new AllExceptUrlsStartedWith(Url.TOGGLZ_CONSOLE_PAGE, "/console")
101+
)
100102
.and()
101103
.rememberMe()
102104
// TODO: GH #27

src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserOpenTogglzConsole.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.testng.annotations.BeforeClass;
2323
import org.testng.annotations.Test;
2424

25+
import ru.mystamps.web.Url;
2526
import ru.mystamps.web.tests.page.ForbiddenErrorPage;
2627

2728
import static ru.mystamps.web.tests.TranslationUtils.tr;
@@ -38,7 +39,7 @@ public WhenAnonymousUserOpenTogglzConsole() {
3839

3940
@BeforeClass
4041
public void setUp() {
41-
page.open("/togglz");
42+
page.open(Url.TOGGLZ_CONSOLE_PAGE);
4243
}
4344

4445
@Test(groups = "std")

src/test/java/ru/mystamps/web/tests/cases/WhenUserOpenTogglzConsole.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
import org.springframework.beans.factory.annotation.Value;
2727

28+
import ru.mystamps.web.Url;
2829
import ru.mystamps.web.tests.page.ForbiddenErrorPage;
2930

3031
import static ru.mystamps.web.tests.TranslationUtils.tr;
@@ -48,7 +49,7 @@ public WhenUserOpenTogglzConsole() {
4849
@BeforeClass
4950
public void setUp() {
5051
page.login(validUserLogin, validUserPassword);
51-
page.open("/togglz");
52+
page.open(Url.TOGGLZ_CONSOLE_PAGE);
5253
}
5354

5455
@AfterClass(alwaysRun = true)

src/test/java/ru/mystamps/web/tests/page/ForbiddenErrorPage.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@
1919

2020
import org.openqa.selenium.WebDriver;
2121

22+
import ru.mystamps.web.Url;
23+
2224
public class ForbiddenErrorPage extends AbstractPage {
2325

2426
public ForbiddenErrorPage(WebDriver driver) {
25-
super(driver, "/togglz");
27+
super(driver, Url.TOGGLZ_CONSOLE_PAGE);
2628
}
2729

2830
public String getErrorMessage() {

0 commit comments

Comments
 (0)