refactor: use new 10.0.14 apis to deal with login

axonivy-market · Oct 31, 2023 · 6abcce3 · 6abcce3
1 parent b117221
commit 6abcce3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -11,5 +11,5 @@ jobs:
     uses: './.github/workflows/ci.yml'
     secrets: inherit
     with:
-      mvnArgs: '"-Divy.engine.download.url=https://dev.axonivy.com/permalink/dev/axonivy-engine.zip" "-Divy.engine.version=11.2.0" "-Dproject-build-plugin-version=11.2.0-SNAPSHOT" -Dmaven.deploy.skip=true'
+      mvnArgs: '"-Divy.engine.download.url=https://dev.axonivy.com/permalink/dev/axonivy-engine.zip" "-Divy.engine.version=11.2.0" "-Dproject-build-plugin-version=11.2.0-SNAPSHOT" "-Dweb-tester.version=11.2.0-SNAPSHOT" -Dmaven.deploy.skip=true'
 
diff --git a/doc-factory-demos-test/pom.xml b/doc-factory-demos-test/pom.xml
@@ -8,6 +8,7 @@
 
 	<properties>
 		<project-build-plugin-version>10.0.14</project-build-plugin-version>
+		<web-tester.version>10.0.14</web-tester.version>
 	</properties>
 
 	<dependencies>
@@ -20,7 +21,7 @@
 		<dependency>
 		    <groupId>com.axonivy.ivy.webtest</groupId>
 		    <artifactId>web-tester</artifactId>
-		    <version>10.0.0</version>
+		    <version>${web-tester.version}</version>
 		    <scope>test</scope>
  		</dependency>
  		<dependency>

diff --git a/doc-factory-demos-test/src_test/com/axon/docfactory/demos/WebTestApiExamplesIT.java b/doc-factory-demos-test/src_test/com/axon/docfactory/demos/WebTestApiExamplesIT.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.codeborne.selenide.Configuration;
 import com.codeborne.selenide.FileDownloadMode;
 import com.codeborne.selenide.Selenide;
@@ -41,8 +42,8 @@ void docWithCompositeObjPdf() throws Exception {
   @Test
   void docWithCompositeObjPdfA() throws Exception {
     assertDownload("start8.ivp", "DocWithCompositeObjectA.pdf");
-  }  
-  
+  }
+
   @Test
   void docWithNestedTablesPDF() throws Exception {
     assertDownload("start3.ivp", "DocWithFullNestedTables.pdf");
@@ -67,12 +68,9 @@ void zipMultipleDocuments() throws FileNotFoundException {
   }
 
   @Test
-  void ivyDocApi() {
+  void ivyDocApi(WebAppFixture fixture) {
     if (!EngineUrl.isDesigner()) {
-      open(EngineUrl.create().path("login").toUrl());
-      $(By.id("loginForm:userName")).shouldBe(visible).sendKeys("test");
-      $(By.id("loginForm:password")).shouldBe(visible).sendKeys("test");
-      $(By.id("loginForm:login")).click();
+      fixture.login("test", "test");
       $(By.id("sessionUserName")).shouldHave(exactText("test"));
     }
     open(EngineUrl.createProcessUrl("/DocFactoryDemos/16DFD8AB2E4BFFF9/start2.ivp"));