diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index a27a639..51aff8a 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -9,3 +9,5 @@ on:
jobs:
build:
uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v2
+ with:
+ mvnArgs: -Dwebtester.version=11.2.0-SNAPSHOT
diff --git a/persistence-utils-demo-test/pom.xml b/persistence-utils-demo-test/pom.xml
index 1af4f48..98c8178 100644
--- a/persistence-utils-demo-test/pom.xml
+++ b/persistence-utils-demo-test/pom.xml
@@ -16,7 +16,7 @@
com.axonivy.ivy.test
unit-tester
- 10.0.0
+ 10.0.14
test
@@ -44,7 +44,7 @@
com.axonivy.ivy.ci
project-build-plugin
- 10.0.6
+ 10.0.14
true
diff --git a/persistence-utils-demo-tool/pom.xml b/persistence-utils-demo-tool/pom.xml
index f753053..bdc8757 100644
--- a/persistence-utils-demo-tool/pom.xml
+++ b/persistence-utils-demo-tool/pom.xml
@@ -23,7 +23,7 @@
com.axonivy.ivy.ci
project-build-plugin
- 10.0.6
+ 10.0.14
true
diff --git a/persistence-utils-demo-webtest/pom.xml b/persistence-utils-demo-webtest/pom.xml
index a69ae18..1dc58d2 100644
--- a/persistence-utils-demo-webtest/pom.xml
+++ b/persistence-utils-demo-webtest/pom.xml
@@ -6,6 +6,18 @@
10.0.5-SNAPSHOT
iar-integration-test
Web Test project of the persistence utils demo project.
+
+ 10.0.14
+
+
+
+ sonatype
+ https://oss.sonatype.org/content/repositories/snapshots
+
+ always
+
+
+
com.axonivy.utils.persistence
@@ -16,7 +28,7 @@
com.axonivy.ivy.webtest
web-tester
- 10.0.0
+ ${webtester.version}
test
@@ -26,7 +38,7 @@
com.axonivy.ivy.ci
project-build-plugin
- 10.0.6
+ 10.0.14
true
diff --git a/persistence-utils-demo-webtest/src_test/com/axonivy/utils/persistence/webtest/WebTestDemoIT.java b/persistence-utils-demo-webtest/src_test/com/axonivy/utils/persistence/webtest/WebTestDemoIT.java
index e401b3d..fcbe102 100644
--- a/persistence-utils-demo-webtest/src_test/com/axonivy/utils/persistence/webtest/WebTestDemoIT.java
+++ b/persistence-utils-demo-webtest/src_test/com/axonivy/utils/persistence/webtest/WebTestDemoIT.java
@@ -17,6 +17,7 @@
import com.axonivy.ivy.webtest.IvyWebTest;
import com.axonivy.ivy.webtest.engine.EngineUrl;
+import com.axonivy.ivy.webtest.engine.WebAppFixture;
import com.axonivy.ivy.webtest.primeui.PrimeUi;
import com.axonivy.ivy.webtest.primeui.widget.InputNumber;
import com.codeborne.selenide.ElementsCollection;
@@ -47,15 +48,13 @@ public static void setup() {
firstName = "Peter" + randomNumber;
lastName = "S" + randomNumber;
ivyUserName = firstName.toLowerCase() + "." + lastName.toLowerCase();
-
- startLoginAsAdmin();
}
@Test
@Order(1)
- public void testAddNewDepartment() {
- startLoginAsAdmin(); //re-login
+ public void testAddNewDepartment(WebAppFixture fixture) {
+ startLoginAsAdmin(fixture); //re-login
addNewDepartment(marketingDepartmentName);
$(By.id("mainForm:departmentTable_data")).shouldHave(text(marketingDepartmentName));
@@ -183,12 +182,8 @@ private void startProcessPersonSearch() {
open(EngineUrl.createProcessUrl("persistence-utils-demo/173A4BC5D38BAD52/personSearch.ivp"));
}
- private static void startLoginAsAdmin() {
- open(EngineUrl.base() + "default-workflow/faces/login.xhtml");
-
- $(By.id("loginForm:userName")).shouldBe(enabled).sendKeys("jpa_admin");
- $(By.id("loginForm:password")).shouldBe(enabled).sendKeys("jpa_admin");
- $(By.id("loginForm:login")).shouldBe(enabled).click();
+ private static void startLoginAsAdmin(WebAppFixture fixture) {
+ fixture.login("jpa_admin", "jpa_admin");
open(EngineUrl.base() + "default-workflow/faces/profile.xhtml");
SelenideElement lang = $(By.name("profileForm:contentLanguage_editableInput")).shouldBe(enabled);
diff --git a/persistence-utils-demo/pom.xml b/persistence-utils-demo/pom.xml
index 8fa9e0c..f7a6e3f 100644
--- a/persistence-utils-demo/pom.xml
+++ b/persistence-utils-demo/pom.xml
@@ -32,7 +32,7 @@
com.axonivy.ivy.ci
project-build-plugin
- 10.0.6
+ 10.0.14
true
diff --git a/persistence-utils/pom.xml b/persistence-utils/pom.xml
index 347ccc0..0b081c1 100644
--- a/persistence-utils/pom.xml
+++ b/persistence-utils/pom.xml
@@ -19,7 +19,7 @@
com.axonivy.ivy.ci
project-build-plugin
- 10.0.6
+ 10.0.14
true