diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 23a45bf..87d78f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,4 +9,4 @@ on: jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v3 + uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4 diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index aa62e7c..b0097df 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -8,5 +8,5 @@ on: jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v3 + uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 128a183..ab5b0d7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,4 +4,4 @@ on: workflow_dispatch jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/release.yml@v2 + uses: axonivy-market/github-workflows/.github/workflows/release.yml@v4 diff --git a/salesforce-connector-demo/pom.xml b/salesforce-connector-demo/pom.xml index 2fa8383..18c8176 100644 --- a/salesforce-connector-demo/pom.xml +++ b/salesforce-connector-demo/pom.xml @@ -9,7 +9,6 @@ 10.0.16 - sonatype https://oss.sonatype.org/content/repositories/snapshots diff --git a/salesforce-connector-test/pom.xml b/salesforce-connector-test/pom.xml index bb65566..88eca7e 100644 --- a/salesforce-connector-test/pom.xml +++ b/salesforce-connector-test/pom.xml @@ -10,7 +10,6 @@ 10.0.16 - sonatype https://oss.sonatype.org/content/repositories/snapshots @@ -41,12 +40,6 @@ ${tester.version} test - - com.axonivy.ivy.webtest - web-tester - ${tester.version} - test - src_test diff --git a/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/AddOppServiceAPITest.java b/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/AddOppServiceAPITest.java index f2e23bf..0cce519 100644 --- a/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/AddOppServiceAPITest.java +++ b/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/AddOppServiceAPITest.java @@ -18,7 +18,7 @@ import ch.ivyteam.ivy.bpm.engine.client.element.BpmProcess; import ch.ivyteam.ivy.bpm.exec.client.IvyProcessTest; -@IvyProcessTest +@IvyProcessTest(enableWebServer = true) public class AddOppServiceAPITest extends BaseTest { private static final BpmProcess ADDOPPSERVICE_PROCESS = BpmProcess.path("AddOppService"); diff --git a/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/BaseTest.java b/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/BaseTest.java index 5667eba..1e93d0c 100644 --- a/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/BaseTest.java +++ b/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/BaseTest.java @@ -5,12 +5,13 @@ import ch.ivyteam.ivy.bpm.exec.client.IvyProcessTest; import ch.ivyteam.ivy.environment.AppFixture; -@IvyProcessTest +@IvyProcessTest(enableWebServer = true) public class BaseTest { + @BeforeEach void beforeEach(AppFixture fixture) { // Disable OAuth feature for mock rest service fixture.config("RestClients.SalesforceAPI.Features", "ch.ivyteam.ivy.rest.client.mapper.JsonFeature"); - fixture.var("salesforce-connector.auth.url", "http://localhost:8081/designer/api/salesforceMock"); + fixture.var("salesforce-connector.auth.url", "{ivy.app.baseurl}/api/salesforceMock"); } } diff --git a/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/DeleteOppServiceAPITest.java b/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/DeleteOppServiceAPITest.java index a55c3ad..ff2cdd5 100644 --- a/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/DeleteOppServiceAPITest.java +++ b/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/DeleteOppServiceAPITest.java @@ -15,7 +15,7 @@ import ch.ivyteam.ivy.bpm.engine.client.element.BpmProcess; import ch.ivyteam.ivy.bpm.exec.client.IvyProcessTest; -@IvyProcessTest +@IvyProcessTest(enableWebServer = true) public class DeleteOppServiceAPITest extends BaseTest { private static final BpmProcess DELETEOPPSERVICE_PROCESS = BpmProcess.path("DeleteOppService"); diff --git a/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/GetAccServiceAPITest.java b/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/GetAccServiceAPITest.java index aba8859..7bed93d 100644 --- a/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/GetAccServiceAPITest.java +++ b/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/GetAccServiceAPITest.java @@ -16,7 +16,7 @@ import ch.ivyteam.ivy.bpm.engine.client.element.BpmProcess; import ch.ivyteam.ivy.bpm.exec.client.IvyProcessTest; -@IvyProcessTest +@IvyProcessTest(enableWebServer = true) public class GetAccServiceAPITest extends BaseTest { private static final BpmProcess GETACCSERVICE_PROCESS = BpmProcess.path("GetAccService"); diff --git a/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/GetOppServiceAPITest.java b/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/GetOppServiceAPITest.java index 0969f6e..75a46b9 100644 --- a/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/GetOppServiceAPITest.java +++ b/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/GetOppServiceAPITest.java @@ -16,7 +16,7 @@ import ch.ivyteam.ivy.bpm.engine.client.element.BpmProcess; import ch.ivyteam.ivy.bpm.exec.client.IvyProcessTest; -@IvyProcessTest +@IvyProcessTest(enableWebServer = true) public class GetOppServiceAPITest extends BaseTest { private static final BpmProcess GETOPPSERVICE_PROCESS = BpmProcess.path("GetOppService"); diff --git a/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/QueryServiceAPITest.java b/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/QueryServiceAPITest.java index 70153a6..b0ee4d6 100644 --- a/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/QueryServiceAPITest.java +++ b/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/QueryServiceAPITest.java @@ -19,7 +19,7 @@ import ch.ivyteam.ivy.bpm.engine.client.element.BpmProcess; import ch.ivyteam.ivy.bpm.exec.client.IvyProcessTest; -@IvyProcessTest +@IvyProcessTest(enableWebServer = true) public class QueryServiceAPITest extends BaseTest { private static final BpmProcess QUERYSERVICE_PROCESS = BpmProcess.path("QueryService"); diff --git a/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/UpdateOppServiceAPITest.java b/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/UpdateOppServiceAPITest.java index 212014c..633ad40 100644 --- a/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/UpdateOppServiceAPITest.java +++ b/salesforce-connector-test/src_test/com/axonivy/connector/salesforce/test/UpdateOppServiceAPITest.java @@ -17,7 +17,7 @@ import ch.ivyteam.ivy.bpm.engine.client.element.BpmProcess; import ch.ivyteam.ivy.bpm.exec.client.IvyProcessTest; -@IvyProcessTest +@IvyProcessTest(enableWebServer = true) public class UpdateOppServiceAPITest extends BaseTest { private static final BpmProcess UPPDATEOPPSERVICE_PROCESS = BpmProcess.path("UpdateOppService"); diff --git a/salesforce-connector/pom.xml b/salesforce-connector/pom.xml index a3408e0..ff73cd3 100644 --- a/salesforce-connector/pom.xml +++ b/salesforce-connector/pom.xml @@ -9,7 +9,6 @@ 10.0.16 - sonatype https://oss.sonatype.org/content/repositories/snapshots