717 test production mode in integration test

.github/workflows/main.yml

@@ -203,6 +203,16 @@ jobs:
             org.opencontainers.image.vendor=RADAR-base
             org.opencontainers.image.licenses=Apache-2.0
 
+#      # placeholder for testing
+#      - name: End to end tests (docker image)
+#        id: e2e-prod-docker
+#        run: |
+#          cp src/test/resources/config/keystore.p12 src/main/docker/etc/config
+#          ./gradlew -Pprod buildDocker -x test -x javadocJar
+#          docker-compose -f src/main/docker/app.yml up -d
+#          yarn run e2e-prod
+#          docker-compose -f src/main/docker/app.yml down -v
+
       # Temp fix
       # https://github.com/docker/build-push-action/issues/252
       # https://github.com/moby/buildkit/issues/1896

.github/workflows/pre-release.yml

@@ -51,14 +51,12 @@ jobs:
         run: |
           yarn install
 
-      - name: Run full end to end tests
+      - name: Run full production end to end tests
         run: |
-          cp src/test/resources/config/keystore.p12 src/main/resources/config/keystore.p12
+          docker-compose -f src/main/docker/postgresql.yml up -d
           ./gradlew bootRun &>mp.log </dev/null &
-          yarn run wait-for-managementportal
-          ./gradlew generateOpenApiSpec
-          yarn e2e
-          ./gradlew --stop
+          yarn run e2e-prod
+          docker-compose -f src/main/docker/postgresql.yml down -v
 
       - name: Upload screenshots of failed e2e tests
         if: always()

README.md

@@ -21,7 +21,7 @@ Management Portal is an application which is used to manage clinical studies for
 - [Testing](#testing)
   * [Client tests](#client-tests)
   * [Other tests](#other-tests)
-- [Using Docker to simplify development (optional)](#using-docker-to-simplify-development--optional-)
+- [Using Docker to simplify development (optional)](#using-docker-to-simplify-development-optional)
 - [Documentation](#documentation)
 - [Client libraries](#client-libraries)
 
@@ -49,7 +49,7 @@ docker-compose files.
 3. Now, we can start the stack with `docker-compose -f src/main/docker/management-portal.yml up -d`.
 
 This will start a Postgres database and ManagementPortal. The default password for the `admin`
-account is `admin`.
+account is `admin`. An angular live development server to access the managementportal can be started using the `yarn start` command (see [Development](#development)).
 
 ### Build from source
 
@@ -68,15 +68,14 @@ You must install and configure the following dependencies on your machine to run
 main differences between the profiles. Configure the application using the property file at `src/main/resources/config/application-<profile>.yml`.Read more about configurations [here](#configuration)
 
 5. Run ManagementPortal by running `./gradlew bootRun -Pprod` or `./gradlew bootRun -Pdev`. Development mode will start an in
-memory database and ManagementPortal. 
+memory database and ManagementPortal. An angular live development server to access the managementportal can be started using the `yarn start` command (see [Development](#development)).
 6. You can log in to the application using `admin:admin`. Please don't forgot to change the password of `admin`, if you are using the application on production environment.
 
 
 |                                  | Development     | Production                        |
 |----------------------------------|-----------------|-----------------------------------|
 | Database type                    | In-memory       | Postgres                          |
 | Demo data loaded                 | Yes             | No                                |
-| Context path of the application  | `/`             | `/managementportal`               |
 
 
 
@@ -249,6 +248,8 @@ auto-refreshes when files change on your hard drive.
 
 Then open <http://localhost:8081/> to start the interface and sign in with admin/admin.
 
+### Managing dependencies
+
 [Yarn][] is also used to manage CSS and JavaScript dependencies used in this application. You can upgrade dependencies by
 specifying a newer version in [package.json](package.json). You can also run `yarn update` and `yarn install` to manage dependencies.
 Add the `help` flag on any command to see how you can use it. For example, `yarn help update`.
@@ -294,15 +295,15 @@ To launch your application's tests, run:
 
 ### Client tests
 
-Unit tests are run by [Karma][] and written with [Jasmine][]. They're located in [src/test/javascript/](src/test/javascript/) and can be run with:
+Unit tests are run by [Karma][] and written with [Jasmine][]. They're located in `src/test/javascript/` and can be run with:
 
     yarn test
 
 UI end-to-end tests are powered by [Cypress][], which is built on top of WebDriverJS. They're located in [src/test/javascript/e2e](src/test/javascript/e2e)
 and can be run by starting Spring Boot in one terminal (`./gradlew bootRun`) and running the tests (`yarn run e2e`) in a second one.
 ### Other tests
 
-Performance tests are run by [Gatling][] and written in Scala. They're located in [src/test/gatling](src/test/gatling) and can be run with:
+Performance tests are run by [Gatling][] and written in Scala. They're located in `src/test/gatling` and can be run with:
 
     ./gradlew gatlingRunAll
 

angular.json

@@ -136,9 +136,7 @@
           },
           "configurations": {
             "production": {
-              "devServerTarget": "management-portal:serve:production",
-              "watch": false,
-              "headless": true
+              "devServerTarget": "management-portal:serve:production"
             }
           }
         }

cypress.json

@@ -7,5 +7,5 @@
   "screenshotsFolder": "src/test/javascript/e2e/cypress/screenshots",
   "pluginsFile": false,
   "fixturesFolder": false,
-  "baseUrl": "http://localhost:9000"
+  "baseUrl": "http://localhost:8081"
 }

gradle/docker.gradle

@@ -12,9 +12,5 @@ task buildDocker(type: Exec, dependsOn: bootWar) {
             include "*.war*"
         }
     }
-    if (OperatingSystem.current().isWindows()) {
-        commandLine 'cmd', '/c', 'docker', 'image', 'build', '-f', 'build/docker/Dockerfile', '-t', 'managementportal', 'build/docker/'
-    } else {
-        commandLine 'docker', 'image', 'build', '-f', 'build/docker/Dockerfile', '-t', 'managementportal', 'build/docker/'
-    }
+    commandLine 'docker', 'image', 'build', '-f', 'build/docker/Dockerfile', '-t', 'managementportal', 'build/docker/'
 }

src/main/docker/app.yml

@@ -7,6 +7,7 @@ services:
             - SPRING_DATASOURCE_URL=jdbc:postgresql://managementportal-postgresql:5432/managementportal
             - SPRING_DATASOURCE_USERNAME=radarbase
             - SPRING_DATASOURCE_PASSWORD=radarbase
+            - SPRING_LIQUIBASE_CONTEXTS=dev #includes testing_data, remove for production builds
             - MANAGEMENTPORTAL_FRONTEND_CLIENT_SECRET=secret
             - JHIPSTER_SLEEP=10 # gives time for the database to boot before the application
             - JAVA_OPTS=-Xmx512m  # maximum heap size for the JVM running ManagementPortal, increase this as necessary

src/main/resources/config/application-e2e-prod-test.yml

@@ -0,0 +1,23 @@
+# ===================================================================
+# Spring Boot configuration for the "dev" profile.
+#
+# This configuration overrides the application.yml file.
+#
+# More information on profiles: https://jhipster.github.io/profiles/
+# More information on configuration properties: https://jhipster.github.io/common-application-properties/
+# ===================================================================
+
+# ===================================================================
+# Standard Spring Boot properties.
+# Full reference is available at:
+# http://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html
+# ===================================================================
+
+spring:
+    profiles:
+        active: prod,api-docs,e2e-prod-test
+    datasource:
+        username: radarbase
+        password: radarbase
+    liquibase:
+        contexts: dev

src/main/resources/config/application-prod.yml

@@ -19,12 +19,12 @@ spring:
         livereload:
             enabled: false
     datasource:
-        type: com.zaxxer.hikari.HikariDataSource
-        driverClassName: org.postgresql.Driver
-        url: jdbc:postgresql://localhost:5432/managementportal
-#        name: managementportal
-        username: <username>
-        password: <password>
+      type: com.zaxxer.hikari.HikariDataSource
+      driverClassName: org.postgresql.Driver
+      url: jdbc:postgresql://localhost:5432/managementportal
+  #        name: managementportal
+  #        username: radarbase
+  #        password: radarbase
 #        hikari:
 #            data-source-properties:
 #                cachePrepStmts: true
@@ -53,8 +53,6 @@ spring:
             starttls.enable: false
     thymeleaf:
         cache: true
-    liquibase:
-        contexts: prod
 
 # ===================================================================
 # To enable SSL, generate a certificate using:

src/main/resources/config/application.yml

@@ -80,6 +80,9 @@ spring:
         basename: i18n/messages
     thymeleaf:
         mode: HTML
+    liquibase:
+        contexts: prod
+
 
 springdoc:
     api-docs:

src/test/bash/run-prod-e2e.sh

@@ -1,38 +1,22 @@
 #!/bin/bash
 
-# For testing production mode e2e tests we need some tweaks:
-# 1) The angular app needs to run in dev mode for protractor to work
-# 2) We update the basehref of the angular app to the context path of the backend
-# 3) We update the protractor configuration to the new path
-#
-# Then we start up a docker stack with a postgres server since production mode is configured for a
+# For testing production mode e2e tests we start up a docker postgres server since production mode is configured for a
 # postgres database instead of in-memory database.
 
 set -e
-
-# only run on the release branch and master branch if it's not a tag build
 echo "Running production e2e tests"
 cp src/test/resources/config/keystore.p12 src/main/docker/etc/config
 cp src/test/resources/config/keystore.p12 src/main/resources/config
 
-# set liquibase context to dev so it loads demo data
-sed -i "s|contexts: prod|contexts: dev|" src/main/resources/config/application-prod.yml
-./gradlew -Pprod buildDocker -x test -x javadocJar
-# recover the prod liquibase context
-git checkout src/main/resources/config/application-prod.yml
-
-docker-compose -f src/main/docker/app.yml up -d # spin up production mode application
+./gradlew bootrun -Pe2e-prod-test -x test -x javadocJar &
+docker-compose -f src/main/docker/postgresql.yml up -d # spin up production mode application
 set +e
 
-# wait for app to be up
-yarn run wait-for-managementportal
-# run e2e tests against production mode
-if ./gradlew generateOpenApiSpec && yarn run e2e; then
+if ./gradlew generateOpenApiSpec && yarn run e2e-prod; then
   EXIT_STATUS=0
 else
   EXIT_STATUS=1
 fi
-docker-compose -f src/main/docker/app.yml logs # show output of app startup
-docker-compose -f src/main/docker/app.yml down -v # clean up containers and volumes
 
+docker-compose -f src/main/docker/postgresql.yml down -v # clean up containers and volumes
 exit $EXIT_STATUS