From 30240435250a04e928ac72b15514ab49eee849c5 Mon Sep 17 00:00:00 2001 From: Angelo Manganiello Date: Mon, 18 May 2020 17:36:43 +0200 Subject: [PATCH] add new jdl --- .github/workflows/test-integration.yml | 8 ++++---- .../microservice-oauth2-sql-jdl.jdl | 1 + .../monolith-react-jwt-sql-jdl.jdl | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index 2c9313c9b..2f735ddcb 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -42,10 +42,10 @@ jobs: run: sudo sh test-integration/01-generate-app-sample.sh $JHI_APP $JHI_ARG - name: 'INSTALL DEPENDENCIES of generated app' run: sudo sh test-integration/02-install-dependencies-app-sample.sh $JHI_APP - - name: 'GENERATE bar SERVER SERVICE' - run: sudo sh test-integration/03-generate-component-sample.sh $JHI_APP service bar - - name: 'GENERATE foo SERVER CONTROLLER' - run: sudo sh test-integration/03-generate-component-sample.sh $JHI_APP controller foo + # - name: 'GENERATE bar SERVER SERVICE' + # run: sudo sh test-integration/03-generate-component-sample.sh $JHI_APP service bar + # - name: 'GENERATE foo SERVER CONTROLLER' + # run: sudo sh test-integration/03-generate-component-sample.sh $JHI_APP controller foo - name: 'RUN UNIT TESTS of generated app' run: sudo sh test-integration/04-run-generated-unit-tests-of-sample.sh $JHI_APP - name: 'RUN E2E TESTS of generated app' diff --git a/test-integration/samples/microservice-oauth2-sql-jdl/microservice-oauth2-sql-jdl.jdl b/test-integration/samples/microservice-oauth2-sql-jdl/microservice-oauth2-sql-jdl.jdl index c8668c46a..aba26cfb8 100644 --- a/test-integration/samples/microservice-oauth2-sql-jdl/microservice-oauth2-sql-jdl.jdl +++ b/test-integration/samples/microservice-oauth2-sql-jdl/microservice-oauth2-sql-jdl.jdl @@ -65,6 +65,7 @@ relationship ManyToMany { Category{product(title)} to Product{category} } + paginate Customer, Product, Category with pagination paginate Address with pagination paginate Product with infinite-scroll diff --git a/test-integration/samples/monolith-react-jwt-sql-jdl/monolith-react-jwt-sql-jdl.jdl b/test-integration/samples/monolith-react-jwt-sql-jdl/monolith-react-jwt-sql-jdl.jdl index 5071aa659..fc0418921 100644 --- a/test-integration/samples/monolith-react-jwt-sql-jdl/monolith-react-jwt-sql-jdl.jdl +++ b/test-integration/samples/monolith-react-jwt-sql-jdl/monolith-react-jwt-sql-jdl.jdl @@ -74,7 +74,6 @@ relationship ManyToOne { Activity {demetrauser} to DemetraUser } - relationship ManyToMany { DemetraUser { @@ -85,6 +84,7 @@ relationship ManyToMany { }, } + relationship OneToMany { DemetraUser {