From a976c9dd6d35727b89589f54926906838716bd90 Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Tue, 31 Jul 2018 18:07:15 +0200 Subject: [PATCH] Upgrade samples to Spring Boot 2.1.0.M1 Closes gh-1139 --- gradle.properties | 2 +- .../src/integration-test/java/sample/pages/LoginPage.java | 6 +++--- .../src/integration-test/java/sample/pages/LoginPage.java | 6 +++--- samples/gradle/dependency-management.gradle | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1ef691d6..022ebcc6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -springBootVersion=2.0.3.RELEASE +springBootVersion=2.1.0.M1 version=2.1.0.BUILD-SNAPSHOT diff --git a/samples/boot/jdbc/src/integration-test/java/sample/pages/LoginPage.java b/samples/boot/jdbc/src/integration-test/java/sample/pages/LoginPage.java index e3e89f36..78dd7be7 100644 --- a/samples/boot/jdbc/src/integration-test/java/sample/pages/LoginPage.java +++ b/samples/boot/jdbc/src/integration-test/java/sample/pages/LoginPage.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2017 the original author or authors. + * Copyright 2014-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ public class LoginPage extends BasePage { } public void assertAt() { - assertThat(getDriver().getTitle()).isEqualTo("Login Page"); + assertThat(getDriver().getTitle()).isEqualTo("Please sign in"); } public Form form() { @@ -51,7 +51,7 @@ public class LoginPage extends BasePage { @FindBy(name = "password") private WebElement password; - @FindBy(name = "submit") + @FindBy(tagName = "button") private WebElement button; public Form(SearchContext context) { diff --git a/samples/boot/redis/src/integration-test/java/sample/pages/LoginPage.java b/samples/boot/redis/src/integration-test/java/sample/pages/LoginPage.java index e3e89f36..78dd7be7 100644 --- a/samples/boot/redis/src/integration-test/java/sample/pages/LoginPage.java +++ b/samples/boot/redis/src/integration-test/java/sample/pages/LoginPage.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2017 the original author or authors. + * Copyright 2014-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ public class LoginPage extends BasePage { } public void assertAt() { - assertThat(getDriver().getTitle()).isEqualTo("Login Page"); + assertThat(getDriver().getTitle()).isEqualTo("Please sign in"); } public Form form() { @@ -51,7 +51,7 @@ public class LoginPage extends BasePage { @FindBy(name = "password") private WebElement password; - @FindBy(name = "submit") + @FindBy(tagName = "button") private WebElement button; public Form(SearchContext context) { diff --git a/samples/gradle/dependency-management.gradle b/samples/gradle/dependency-management.gradle index bd4a6d15..9c48e1b0 100644 --- a/samples/gradle/dependency-management.gradle +++ b/samples/gradle/dependency-management.gradle @@ -5,7 +5,7 @@ dependencyManagement { dependency 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1' dependency 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02' dependency 'org.apache.taglibs:taglibs-standard-jstlel:1.2.5' - dependency 'org.seleniumhq.selenium:htmlunit-driver:2.29.3' + dependency 'org.seleniumhq.selenium:htmlunit-driver:2.32.0' dependency 'org.slf4j:jcl-over-slf4j:1.7.25' dependency 'org.slf4j:log4j-over-slf4j:1.7.25' dependency 'org.webjars:bootstrap:2.3.2'