.

joscha · Aug 22, 2018 · 43ad16f · 43ad16f
1 parent 8ab1b37
commit 43ad16f
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 17 deletions.
diff --git a/samples/java/play-authenticate-usage/app/views/account/ask_link.scala.html b/samples/java/play-authenticate-usage/app/views/account/ask_link.scala.html
@@ -16,7 +16,7 @@ <h1>@Messages("playauthenticate.link.account.title")</h1>
 
             @if(acceptForm.hasGlobalErrors) {
 		        <p class="alert alert-danger">
-		          @acceptForm.globalError.message
+		          @acceptForm.getGlobalError.get.message
 		     	</p>
             }
 

diff --git a/samples/java/play-authenticate-usage/app/views/account/ask_merge.scala.html b/samples/java/play-authenticate-usage/app/views/account/ask_merge.scala.html
@@ -16,7 +16,7 @@ <h1>@Messages("playauthenticate.merge.accounts.title")</h1>
 
             @if(acceptForm.hasGlobalErrors) {
 		        <p class="alert alert-danger">
-		          @acceptForm.globalError.message
+		          @acceptForm.getGlobalError.get.message
 		     	</p>
             }
 

diff --git a/samples/java/play-authenticate-usage/app/views/account/password_change.scala.html b/samples/java/play-authenticate-usage/app/views/account/password_change.scala.html
@@ -12,7 +12,7 @@ <h1>@Messages("playauthenticate.change.password.title")</h1>
 
        @if(changeForm.hasGlobalErrors) {
         <p class="alert alert-danger">
-          @changeForm.globalError.message
+          @changeForm.getGlobalError.get.message
      	</p>
        }
 

diff --git a/samples/java/play-authenticate-usage/app/views/account/signup/password_forgot.scala.html b/samples/java/play-authenticate-usage/app/views/account/signup/password_forgot.scala.html
@@ -12,7 +12,7 @@ <h1>@Messages("playauthenticate.password.forgot.title")</h1>
 
             @if(emailForm.hasGlobalErrors) {
 		        <p class="alert alert-danger">
-		          @emailForm.globalError.message
+		          @emailForm.getGlobalError.get.message
 		     	</p>
             }
 

diff --git a/samples/java/play-authenticate-usage/app/views/account/signup/password_reset.scala.html b/samples/java/play-authenticate-usage/app/views/account/signup/password_reset.scala.html
@@ -13,7 +13,7 @@ <h1>@Messages("playauthenticate.password.reset.title")</h1>
        @if(resetForm.hasGlobalErrors) {
 
      	<p class="alert alert-danger">
-          @resetForm.globalError.message
+          @resetForm.getGlobalError.get.message
      	</p>
        }
 

diff --git a/samples/java/play-authenticate-usage/app/views/login.scala.html b/samples/java/play-authenticate-usage/app/views/login.scala.html
@@ -21,7 +21,7 @@ <h1>@Messages("playauthenticate.login.title")</h1>
         @helper.CSRF.formField
         @if(loginForm.hasGlobalErrors) {
           	<p class="alert alert-danger">
-	          @loginForm.globalError.message
+	          @loginForm.getGlobalError.get.message
 	     	</p>
         }
 

diff --git a/samples/java/play-authenticate-usage/app/views/signup.scala.html b/samples/java/play-authenticate-usage/app/views/signup.scala.html
@@ -20,7 +20,7 @@ <h1>@Messages("playauthenticate.signup.title")</h1>
             @helper.CSRF.formField
             @if(signupForm.hasGlobalErrors) {
 		        <p class="alert alert-danger">
-		          @signupForm.globalError.message
+		          @signupForm.getGlobalError.get.message
 		     	</p>
             }
 

diff --git a/samples/java/play-authenticate-usage/build.sbt b/samples/java/play-authenticate-usage/build.sbt
@@ -22,11 +22,11 @@ val appDependencies = Seq(
   javaJdbc,
   "org.webjars" % "bootstrap" % "3.2.0",
   "org.easytesting" % "fest-assert" % "1.4" % "test",
-  "org.fluentlenium" % "fluentlenium-core" % "3.1.1" % "test",
-  "org.seleniumhq.selenium" % "selenium-java" % "3.13.0" % "test",
-  "org.seleniumhq.selenium" % "selenium-api" % "3.13.0" % "test",
-  "org.seleniumhq.selenium" % "selenium-firefox-driver" % "3.13.0" % "test",
-  "org.seleniumhq.selenium" % "selenium-support" % "3.13.0" % "test"
+  "org.fluentlenium" % "fluentlenium-core" % "3.6.1" % "test",
+  "org.seleniumhq.selenium" % "selenium-java" % "3.14.0" % "test",
+  "org.seleniumhq.selenium" % "selenium-api" % "3.14.0" % "test",
+  "org.seleniumhq.selenium" % "selenium-firefox-driver" % "3.14.0" % "test",
+  "org.seleniumhq.selenium" % "selenium-support" % "3.14.0" % "test"
 )
 
 // add resolver for deadbolt and easymail snapshots

diff --git a/samples/java/play-authenticate-usage/test/test/FacebookOAuth2Test.java b/samples/java/play-authenticate-usage/test/test/FacebookOAuth2Test.java
@@ -122,9 +122,9 @@ public void shutdown() throws Exception {
         WSClient wsClient = app.injector().instanceOf(WSClient.class);
         wsClient
                 .url(url)
-                .setQueryParameter(OAuth2AuthProvider.Constants.ACCESS_TOKEN, authUser.getOAuth2AuthInfo().getAccessToken())
-                .setQueryParameter("format", "json")
-                .setQueryParameter("method", "delete")
+                .addQueryParameter(OAuth2AuthProvider.Constants.ACCESS_TOKEN, authUser.getOAuth2AuthInfo().getAccessToken())
+                .addQueryParameter("format", "json")
+                .addQueryParameter("method", "delete")
                 .get().toCompletableFuture().get(10, TimeUnit.SECONDS);
     }
 

diff --git a/test-app/app/views/login.scala.html b/test-app/app/views/login.scala.html
@@ -7,10 +7,10 @@ <h1>Login</h1>
   @helper.form(action = routes.ApplicationController.doLogin()) {
       @helper.CSRF.formField
       @if(loginForm.hasGlobalErrors) {
-        <p class="error">@loginForm.globalError.message</p>
+        <p class="error">@loginForm.getGlobalError.get.message</p>
       }
       @helper.inputText(loginForm("email"))
       @helper.inputPassword(loginForm("password"))
       <button type="submit">Login</button>
   }
-}
+}