diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb845ab6..bd657fc7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,14 +22,18 @@ jobs: - name: Prepare Maven Wrapper run: chmod +x ./mvnw + # install is required so the install-browsers step finds all the other modules - name: Build with Maven - run: ./mvnw clean verify -U -B -ntp -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 + run: ./mvnw clean install -U -B -ntp -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 - name: Prepare I-Tests run: mkdir -p target/jgiven-reports/json + - name: Install Browsers for Playwright + run: ./mvnw exec:java -B -e -f scenarios/single-node-jpa -Dexec.classpathScope="test" -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install --with-deps" + - name: Run I-Tests with Maven - run: ./mvnw integration-test failsafe:verify -Pitest -DskipFrontend -B -ntp + run: ./mvnw integration-test failsafe:verify -Pitest -B -ntp - name: Upload coverage information uses: codecov/codecov-action@v3 diff --git a/components/approval/process-forms/src/app/tasks/approve-request/approve-task.component.html b/components/approval/process-forms/src/app/tasks/approve-request/approve-task.component.html index bf788527..2575d6a0 100644 --- a/components/approval/process-forms/src/app/tasks/approve-request/approve-task.component.html +++ b/components/approval/process-forms/src/app/tasks/approve-request/approve-task.component.html @@ -28,9 +28,11 @@
{{ task.description }}
-  Approve request
-  Reject request
-  Return request to originator
+
+
+
  diff --git a/components/tasklist-angular/src/app/app.component.html b/components/tasklist-angular/src/app/app.component.html index bcb87196..21265139 100755 --- a/components/tasklist-angular/src/app/app.component.html +++ b/components/tasklist-angular/src/app/app.component.html @@ -13,7 +13,7 @@
-
+
diff --git a/components/tasklist-angular/src/app/app.component.ts b/components/tasklist-angular/src/app/app.component.ts index f919f3b0..ee3a0f65 100755 --- a/components/tasklist-angular/src/app/app.component.ts +++ b/components/tasklist-angular/src/app/app.component.ts @@ -1,11 +1,10 @@ -import { Component, OnInit, inject } from '@angular/core'; -import {UserStoreService} from 'app/user/state/user.store-service'; -import { HeaderComponent } from './header/header.component'; -import { RouterLinkActive, RouterLink, RouterOutlet } from '@angular/router'; -import { ProcesslistComponent } from './process/process-list/process-list.component'; -import { SearchComponent } from './search/search.component'; -import { UserSelectionComponent } from './user/user-selection/user-selection.component'; -import { FooterComponent } from './footer/footer.component'; +import {Component} from '@angular/core'; +import {HeaderComponent} from './header/header.component'; +import {RouterLink, RouterLinkActive, RouterOutlet} from '@angular/router'; +import {ProcesslistComponent} from './process/process-list/process-list.component'; +import {SearchComponent} from './search/search.component'; +import {UserSelectionComponent} from './user/user-selection/user-selection.component'; +import {FooterComponent} from './footer/footer.component'; @Component({ selector: 'tasks-root', @@ -13,11 +12,5 @@ import { FooterComponent } from './footer/footer.component'; styleUrls: ['app.component.scss'], imports: [HeaderComponent, RouterLinkActive, RouterLink, ProcesslistComponent, SearchComponent, UserSelectionComponent, RouterOutlet, FooterComponent] }) -export class AppComponent implements OnInit { - private userStore = inject(UserStoreService); - - - ngOnInit(): void { - this.userStore.loadInitialUser(); - } +export class AppComponent { } diff --git a/components/tasklist-angular/src/app/process/process-list/process-list.component.html b/components/tasklist-angular/src/app/process/process-list/process-list.component.html index 06ec607f..62c0cd93 100644 --- a/components/tasklist-angular/src/app/process/process-list/process-list.component.html +++ b/components/tasklist-angular/src/app/process/process-list/process-list.component.html @@ -1,16 +1,16 @@
-
Start new...
+ -
+
    @for (process of (processes$ | async); track process.url) { - {{ process.name }} + >{{ process.name }} } -
+
diff --git a/components/tasklist-angular/src/app/search/search.component.html b/components/tasklist-angular/src/app/search/search.component.html index 748b4bac..41549b8f 100644 --- a/components/tasklist-angular/src/app/search/search.component.html +++ b/components/tasklist-angular/src/app/search/search.component.html @@ -1,4 +1,4 @@ - - - + + + diff --git a/components/tasklist-angular/src/app/task/state/task.effects.ts b/components/tasklist-angular/src/app/task/state/task.effects.ts index 21bdb6dc..8a61cef5 100644 --- a/components/tasklist-angular/src/app/task/state/task.effects.ts +++ b/components/tasklist-angular/src/app/task/state/task.effects.ts @@ -41,6 +41,7 @@ export class TaskEffects { loadTasks$ = createEffect(() => this.actions$.pipe( ofType(loadTasks), withLatestFrom(this.userStore.userId$), + filter(([, userId]) => !!userId), mergeMap(([, userId]) => this.taskService.getTasks$Response({ 'X-Current-User-ID': userId diff --git a/components/tasklist-angular/src/app/task/tasklist/tasklist.component.html b/components/tasklist-angular/src/app/task/tasklist/tasklist.component.html index b7ced1c0..4bc8fcad 100755 --- a/components/tasklist-angular/src/app/task/tasklist/tasklist.component.html +++ b/components/tasklist-angular/src/app/task/tasklist/tasklist.component.html @@ -3,7 +3,7 @@
- +
diff --git a/components/tasklist-angular/src/app/user/state/user.store-service.ts b/components/tasklist-angular/src/app/user/state/user.store-service.ts index eee9c15e..4588d71d 100644 --- a/components/tasklist-angular/src/app/user/state/user.store-service.ts +++ b/components/tasklist-angular/src/app/user/state/user.store-service.ts @@ -1,6 +1,5 @@ import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; -import { first } from 'rxjs/operators'; import { loadAvailableUsers, selectUser } from './user.actions'; import { availableUsers, currentUserId, currentUserProfile, StateWithUsers } from './user.selectors'; @@ -24,8 +23,4 @@ export class UserStoreService { selectUser(userId: string) { this.store.dispatch(selectUser({ userId })) } - - loadInitialUser(): void { - this.userId$.pipe(first()).subscribe(userId => this.selectUser(userId)); - } } diff --git a/components/tasklist-angular/src/app/user/user-selection/user-selection.component.html b/components/tasklist-angular/src/app/user/user-selection/user-selection.component.html index 74c04558..88923954 100644 --- a/components/tasklist-angular/src/app/user/user-selection/user-selection.component.html +++ b/components/tasklist-angular/src/app/user/user-selection/user-selection.component.html @@ -1,12 +1,15 @@ -
-
+
+ +
-
    + + +
      @for (user of (availableUsers$ | async); track user) {
      • diff --git a/components/tasklist-angular/src/main.ts b/components/tasklist-angular/src/main.ts index 2e268c9b..60174013 100644 --- a/components/tasklist-angular/src/main.ts +++ b/components/tasklist-angular/src/main.ts @@ -6,7 +6,7 @@ import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http'; import {bootstrapApplication} from '@angular/platform-browser'; import {provideAnimations} from '@angular/platform-browser/animations'; import {externalUrlProvider, externalUrlProviderActivateGuard, routes} from 'app/app-routing.module'; -import {provideState, provideStore} from '@ngrx/store'; +import {ActionReducer, provideState, provideStore} from '@ngrx/store'; import {storePersist} from 'app/store-persist'; import {provideEffects} from '@ngrx/effects'; import {provideStoreDevtools} from '@ngrx/store-devtools'; @@ -30,6 +30,16 @@ if (environment.production) { enableProdMode(); } +/** + * Helper for debugging dispatched actions during java-based integration tests + * */ +const logActions = (reducer: ActionReducer): ActionReducer => { + return (state, action) => { + console.log(action) + return reducer(state, action); + } +} + bootstrapApplication(AppComponent, { providers: [ importProvidersFrom( @@ -48,7 +58,7 @@ bootstrapApplication(AppComponent, { provideHttpClient(withInterceptorsFromDi()), // ngrx store provideStore({}, { - metaReducers: [storePersist], + metaReducers: [storePersist, logActions], runtimeChecks: { strictStateImmutability: true, strictActionImmutability: true } }), provideStoreDevtools({ maxAge: 25, logOnly: !isDevMode() }), diff --git a/scenarios/single-node-jpa/pom.xml b/scenarios/single-node-jpa/pom.xml index fbca7b4c..a844c0ab 100755 --- a/scenarios/single-node-jpa/pom.xml +++ b/scenarios/single-node-jpa/pom.xml @@ -71,6 +71,13 @@ io.holunda.polyflow polyflow-example-infrastructure + + + com.microsoft.playwright + playwright + 1.54.0 + test + diff --git a/scenarios/single-node-jpa/src/test/kotlin/io/holunda/polyflow/example/process/approval/AbstractIT.kt b/scenarios/single-node-jpa/src/test/kotlin/io/holunda/polyflow/example/process/approval/AbstractIT.kt new file mode 100644 index 00000000..333413b6 --- /dev/null +++ b/scenarios/single-node-jpa/src/test/kotlin/io/holunda/polyflow/example/process/approval/AbstractIT.kt @@ -0,0 +1,19 @@ +package io.holunda.polyflow.example.process.approval + +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration +import org.springframework.test.context.ActiveProfiles + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@ActiveProfiles("itest", "jpa") +abstract class AbstractIT { + + @Configuration + class TestConfiguration { + + @Bean + fun taskUrlResolver() = + TestingUrlResolver() + } +} diff --git a/scenarios/single-node-jpa/src/test/kotlin/io/holunda/polyflow/example/process/approval/FrontendIT.kt b/scenarios/single-node-jpa/src/test/kotlin/io/holunda/polyflow/example/process/approval/FrontendIT.kt new file mode 100644 index 00000000..029dc501 --- /dev/null +++ b/scenarios/single-node-jpa/src/test/kotlin/io/holunda/polyflow/example/process/approval/FrontendIT.kt @@ -0,0 +1,85 @@ +package io.holunda.polyflow.example.process.approval + +import com.microsoft.playwright.BrowserContext +import com.microsoft.playwright.Page +import com.microsoft.playwright.Tracing.StartOptions +import com.microsoft.playwright.Tracing.StopOptions +import com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat +import com.microsoft.playwright.junit.UsePlaywright +import com.microsoft.playwright.options.AriaRole +import org.junit.jupiter.api.AfterEach +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.springframework.boot.test.web.server.LocalServerPort +import java.nio.file.Paths + + +@UsePlaywright +class FrontendIT: AbstractIT() { + + @LocalServerPort + private var port: Int = 0 + + @BeforeEach + fun setUp(context: BrowserContext) { + // Start tracing before creating / navigating a page. + context.tracing().start( + StartOptions() + .setScreenshots(true) + .setSnapshots(true) + .setSources(true) + ) + } + + @AfterEach + fun tearDown(context: BrowserContext) { + // Stop tracing and export it into a zip archive. + context.tracing().stop( + StopOptions() + .setPath(Paths.get("trace.zip")) + ) + } + + @Test + fun `should start application`(page: Page) { + + page.navigate("http://localhost:${port}/polyflow") + + // Tasklist SPA is being served correctly + assertThat(page).hasTitle("POLYFLOW Process Platform") + + // process definitions are being shown + val startNewProcessButton = page.getByText("Start Process...") + assertThat(startNewProcessButton).hasRole(AriaRole.BUTTON) + startNewProcessButton.click() + val processList = page.getByLabel("Startable Processes Models") + assertThat(processList).isInViewport() + assertThat(processList.getByText("Request Approval")).isInViewport() + + // change user to see tasks on the default started process + page.getByText("Change User").click() + page.getByLabel("Available Users").getByText("fozzy").click() + assertThat(page.getByRole(AriaRole.BUTTON, Page.GetByRoleOptions().setName("current user:"))).hasText("Fozzy"); + + // there is a task in the list + assertThat(page.getByLabel("Open Tasks")).hasText("Please approve request .* from kermit on behalf of piggy".toPattern()) + + // go to task + val taskLink = page.getByRole(AriaRole.LINK, Page.GetByRoleOptions().setName("Approve Request")) + taskLink.click() + + // Example Process SPA is being served correctly + assertThat(page).hasTitle("Example process approval") + + assertThat(page.getByText("Approval Request")).isInViewport() + + // complete task + page.getByRole(AriaRole.RADIO, Page.GetByRoleOptions().setName("Approve request")).check() + page.getByRole(AriaRole.BUTTON, Page.GetByRoleOptions().setName("Complete")).click() + + // tasklist is shown again, now empty + val taskList = page.getByLabel("Open Tasks") + assertThat(taskList).isInViewport() + assertThat(taskList).containsText("No tasks"); + } +} diff --git a/scenarios/single-node-jpa/src/test/kotlin/io/holunda/polyflow/example/process/approval/SingleNodeScenarioContextStartIT.kt b/scenarios/single-node-jpa/src/test/kotlin/io/holunda/polyflow/example/process/approval/SingleNodeScenarioContextStartIT.kt index a9afb8ef..602ae82c 100644 --- a/scenarios/single-node-jpa/src/test/kotlin/io/holunda/polyflow/example/process/approval/SingleNodeScenarioContextStartIT.kt +++ b/scenarios/single-node-jpa/src/test/kotlin/io/holunda/polyflow/example/process/approval/SingleNodeScenarioContextStartIT.kt @@ -7,9 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest import org.springframework.test.context.ActiveProfiles -@SpringBootTest -@ActiveProfiles("itest", "jpa") -class SingleNodeScenarioContextStartIT { +class SingleNodeScenarioContextStartIT : AbstractIT() { @Autowired lateinit var userService: UserService diff --git a/scenarios/single-node-jpa/src/test/kotlin/io/holunda/polyflow/example/process/approval/TestingUrlResolver.kt b/scenarios/single-node-jpa/src/test/kotlin/io/holunda/polyflow/example/process/approval/TestingUrlResolver.kt new file mode 100644 index 00000000..a1526cae --- /dev/null +++ b/scenarios/single-node-jpa/src/test/kotlin/io/holunda/polyflow/example/process/approval/TestingUrlResolver.kt @@ -0,0 +1,42 @@ +package io.holunda.polyflow.example.process.approval + +import io.holunda.polyflow.urlresolver.TasklistUrlResolver +import io.holunda.polyflow.view.DataEntry +import io.holunda.polyflow.view.FormUrlResolver +import io.holunda.polyflow.view.ProcessDefinition +import io.holunda.polyflow.view.Task +import org.springframework.boot.web.servlet.context.ServletWebServerInitializedEvent +import org.springframework.context.event.EventListener + +/** + * Override config based url resolvers, because the WebEnvironment.RANDOM_PORT cannot be resolved inside configurations. + */ +class TestingUrlResolver : FormUrlResolver, TasklistUrlResolver { + + private var port: Int = 0 + + /** + * The only way to get the random port at runtime. + * See: https://www.baeldung.com/spring-boot-running-port#2-handling-servletwebserverinitializedevent + */ + @EventListener + fun onApplicationEvent(event: ServletWebServerInitializedEvent) { + port = event.webServer.port + } + + override fun resolveUrl(task: Task): String { + return "http://localhost:$port/example-process-approval/tasks/${task.formKey}/${task.id}?userId=%userId%" + } + + override fun resolveUrl(processDefinition: ProcessDefinition): String { + return "http://localhost:$port/example-process-approval/${processDefinition.formKey}?userId=%userId%" + } + + override fun resolveUrl(dataEntry: DataEntry): String { + return "http://localhost:$port/example-process-approval/approval-request/${dataEntry.entryId}?userId=%userId%" + } + + override fun getTasklistUrl(): String { + return "http://localhost:$port/polyflow/tasks" + } +}
Process