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 cf9317221a858183f293f602fedb3affd9bc8000 Author: Juan Pablo Santos RodrÃguez <[email protected]> AuthorDate: Mon Jan 4 19:39:57 2021 +0100 Replace deprecated code --- .../src/main/java/org/apache/wiki/pages/haddock/EditWikiPage.java | 4 +++- .../src/main/java/org/apache/wiki/pages/haddock/ViewWikiPage.java | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages/haddock/EditWikiPage.java b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages/haddock/EditWikiPage.java index e17a16d..e63c888 100644 --- a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages/haddock/EditWikiPage.java +++ b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages/haddock/EditWikiPage.java @@ -23,6 +23,8 @@ import com.codeborne.selenide.Selenide; import org.apache.wiki.pages.Page; import org.openqa.selenium.By; +import java.time.Duration; + /** * Actions available on the Edit page. */ @@ -70,7 +72,7 @@ public class EditWikiPage implements HaddockPage { public ViewWikiPage saveText(final String text, final String preview ) { Selenide.$( By.cssSelector( EDIT_TEXTAREA ) ).clear(); Selenide.$( By.cssSelector( EDIT_TEXTAREA ) ).val( text ); - Selenide.$( By.className( "ajaxpreview" ) ).waitUntil( Condition.text( preview ), 1_000L ); + Selenide.$( By.className( "ajaxpreview" ) ).shouldBe( Condition.text( preview ), Duration.ofSeconds( 1L ) ); Selenide.$( By.name( "ok" ) ).click(); return new ViewWikiPage(); } 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 f321325..1d2dda2 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 @@ -25,6 +25,8 @@ import com.codeborne.selenide.Condition; import com.codeborne.selenide.Selenide; import com.codeborne.selenide.SelenideElement; +import java.time.Duration; + /** * Actions available on the View page. */ @@ -96,7 +98,7 @@ public class ViewWikiPage implements HaddockPage { * @return {@link EditWikiPage} instance, to allow chaining of actions. */ public EditWikiPage editPage() { - Selenide.$( By.cssSelector( "li#edit a" ) ).waitUntil( Condition.visible, 1_000L ).click(); + Selenide.$( By.cssSelector( "li#edit a" ) ).shouldBe( Condition.visible, Duration.ofSeconds( 1L ) ).click(); return new EditWikiPage(); } @@ -122,7 +124,7 @@ public class ViewWikiPage implements HaddockPage { public ViewWikiPage clickOnLogout() { hoverLoginArea(); Selenide.$( By.linkText( "Log out" ) ).click(); - Selenide.$( By.className( "btn-success" ) ).waitUntil( Condition.visible, 1_000L ).click(); + Selenide.$( By.className( "btn-success" ) ).shouldBe( Condition.visible, Duration.ofSeconds( 1L ) ).click(); return this; }
