[jspwiki] 20/23: simplify View page actions in order to make the tests a bit more readable

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit 8896a01d891dec094decfd553acded553c0fdbe6
Author: juanpablo <ju...@apache.org>
AuthorDate: Sat Nov 7 21:02:12 2020 +0100

    simplify View page actions in order to make the tests a bit more readable
---
 .../src/main/java/org/apache/wiki/its/EditIT.java                   | 4 ++--
 .../src/main/java/org/apache/wiki/its/LoginIT.java                  | 6 +++---
 .../src/main/java/org/apache/wiki/pages/haddock/ViewWikiPage.java   | 4 +++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/EditIT.java b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/EditIT.java
index a8d5f6c..0630b2d 100644
--- a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/EditIT.java
+++ b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/EditIT.java
@@ -40,12 +40,12 @@ public class EditIT {
         Assertions.assertEquals( pageName, randomPage.wikiTitle() );
         Assertions.assertEquals( "random page", randomPage.wikiPageContent() );
 
-        final ViewWikiPage requiresJannesAccess = randomPage.hoverLoginArea().clickOnLogin().performLogin();
+        final ViewWikiPage requiresJannesAccess = randomPage.clickOnLogin().performLogin();
         requiresJannesAccess.editPage().saveText( "random page [{ALLOW edit janne}]", "random page" );
         Assertions.assertEquals( pageName, requiresJannesAccess.wikiTitle() );
         Assertions.assertEquals( "random page", requiresJannesAccess.wikiPageContent() );
 
-        requiresJannesAccess.hoverLoginArea().logout();
+        requiresJannesAccess.clickOnLogout();
         Assertions.assertEquals( "Main", requiresJannesAccess.wikiTitle() ); // no access for anonymous user, so redirected to main
         Assertions.assertNotEquals( "random page", randomPage.wikiPageContent() );
     }
diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/LoginIT.java b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/LoginIT.java
index 72b5685..77521b9 100644
--- a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/LoginIT.java
+++ b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/LoginIT.java
@@ -39,7 +39,7 @@ public class LoginIT {
         Assertions.assertEquals( "Main", main.wikiTitle() );
         Assertions.assertEquals( "G’day (anonymous guest)", main.hoverLoginArea().authenticatedText() );
         
-        final LoginPage login = main.hoverLoginArea().clickOnLogin();
+        final LoginPage login = main.clickOnLogin();
         Assertions.assertEquals( "JSPWiki: Login", login.title() );
         Assertions.assertEquals( "Login", login.wikiTitle() );
         
@@ -47,7 +47,7 @@ public class LoginIT {
         Assertions.assertEquals( "JSPWiki: Main", main.title() );
         Assertions.assertEquals( "G’day, Janne Jalkanen (authenticated)", main.hoverLoginArea().authenticatedText() );
         
-        main.hoverLoginArea().logout();
+        main.clickOnLogout();
         Assertions.assertEquals( "G’day (anonymous guest)", main.hoverLoginArea().authenticatedText() );
     }
     
@@ -58,7 +58,7 @@ public class LoginIT {
         Assertions.assertEquals( "Main", main.wikiTitle() );
         Assertions.assertEquals( "G’day (anonymous guest)", main.hoverLoginArea().authenticatedText() );
         
-        final LoginPage login = main.hoverLoginArea().clickOnLogin();
+        final LoginPage login = main.clickOnLogin();
         Assertions.assertEquals( "JSPWiki: Login", login.title() );
         Assertions.assertEquals( "Login", login.wikiTitle() );
         
diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages/haddock/ViewWikiPage.java b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages/haddock/ViewWikiPage.java
index 1de53ef..f321325 100644
--- a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages/haddock/ViewWikiPage.java
+++ b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages/haddock/ViewWikiPage.java
@@ -55,6 +55,7 @@ public class ViewWikiPage implements HaddockPage {
      * @return {@link LoginPage} instance, to allow chaining of actions.
      */
     public LoginPage clickOnLogin() {
+        hoverLoginArea();
         Selenide.$( By.className( "icon-signin" ) ).click(); 
         return new LoginPage();
     }
@@ -118,7 +119,8 @@ public class ViewWikiPage implements HaddockPage {
      *
      * @return {@link ViewWikiPage} instance, to allow chaining of actions.
      */
-    public ViewWikiPage logout() {
+    public ViewWikiPage clickOnLogout() {
+        hoverLoginArea();
         Selenide.$( By.linkText( "Log out" ) ).click();
         Selenide.$( By.className( "btn-success" ) ).waitUntil( Condition.visible, 1_000L ).click();
         return this;