Skip to content

Commit

Permalink
Merge pull request #12210 from avdev4j/add-cypress
Browse files Browse the repository at this point in the history 
Add cypress as e2e tests framework
  • Loading branch information
@avdev4j
avdev4j committed Aug 24, 2020
2 parents e657bf6 + 776da07 commit 6df18ad
Show file tree
Hide file tree
Showing 152 changed files with 2,192 additions and 368 deletions.
28 changes: 17 additions & 11 deletions .github/workflows/angular.yml
View file
Expand Up @@ -77,68 +77,68 @@ jobs:
entity: sql
profile: prod
war: 0
protractor: 1
e2e: 1
testcontainers: 1
- app-type: ngx-psql-es-noi18n-mapsid
entity: sqlfull
profile: prod
war: 0
protractor: 1
e2e: 1
testcontainers: 0
- app-type: ngx-mariadb-oauth2-infinispan
entity: sqlfull
profile: prod
war: 0
protractor: 1
e2e: 1
testcontainers: 0
- app-type: ngx-mongodb-kafka-cucumber
entity: mongodb
profile: dev,webpack
war: 0
protractor: 1
e2e: 1
testcontainers: 0
- app-type: ngx-h2mem-ws-nol2
entity: sql
profile: dev,webpack
war: 0 # TODO: need change to 1, when maven+war is fixed
protractor: 1
e2e: 1
testcontainers: 0
- app-type: ngx-gradle-fr
entity: sql
profile: prod
war: 0
protractor: 1
e2e: 1
testcontainers: 0
- app-type: ngx-gradle-psql-es-noi18n-mapsid
entity: sqlfull
profile: prod
war: 0
protractor: 1
e2e: 1
testcontainers: 1
- app-type: ngx-gradle-mariadb-oauth2-infinispan
entity: sql
profile: dev,webpack
war: 0
protractor: 1
e2e: 1
testcontainers: 1
- app-type: ngx-gradle-mongodb-kafka-cucumber
entity: mongodb
profile: prod
war: 0
protractor: 1
e2e: 1
testcontainers: 0
- app-type: ngx-gradle-h2disk-ws-nocache
entity: sql
profile: dev,webpack
war: 1
protractor: 1
e2e: 1
testcontainers: 0
env:
JHI_ENTITY: ${{ matrix.entity }}
JHI_APP: ${{ matrix.app-type }}
JHI_PROFILE: ${{ matrix.profile }}
JHI_WAR: ${{ matrix.war }}
JHI_PROTRACTOR: ${{ matrix.protractor }}
JHI_E2E: ${{ matrix.e2e }}
JHI_TESTCONTAINERS: ${{ matrix.testcontainers }}
steps:
#----------------------------------------------------------------------
Expand Down Expand Up @@ -190,7 +190,13 @@ jobs:
run: npm run e2e:update-webdriver --versions.chrome ${{ steps.chromedriver-version.outputs.version }}
working-directory: /home/runner/app
- name: 'TESTS: End-to-End'
id: e2e
run: $JHI_SCRIPTS/24-tests-e2e.sh
- uses: actions/upload-artifact@v2
if: ${{ always() && steps.e2e.outcome == 'failure'}}
with:
name: screenshots-${{ matrix.app-type }}
path: /home/runner/app/target/cypress/screenshots
- name: 'TESTS: Sonar analysis'
run: $JHI_SCRIPTS/25-sonar-analyze.sh
env:
Expand Down
26 changes: 16 additions & 10 deletions .github/workflows/react.yml
View file
Expand Up @@ -76,62 +76,62 @@ jobs:
entity: sql
profile: prod
war: 0
protractor: 1
e2e: 1
testcontainers: 0
- app-type: react-maven-psql-es-noi18n-mapsid
entity: sqlfull
profile: prod
war: 0
protractor: 1
e2e: 1
testcontainers: 1
- app-type: react-maven-h2mem-memcached
entity: sql
profile: dev,webpack
war: 0 # TODO: need change to 1, when maven+war is fixed
protractor: 1
e2e: 1
testcontainers: 0
- app-type: react-maven-cassandra-session-redis
entity: cassandra
profile: prod
war: 0
protractor: 1
e2e: 1
testcontainers: 0
- app-type: react-maven-couchbase-caffeine
entity: couchbase
profile: prod
war: 0
protractor: 0
e2e: 0
testcontainers: 0
- app-type: react-gradle-psql-es-noi18n-mapsid
entity: sqlfull
profile: prod
war: 0
protractor: 1
e2e: 1
testcontainers: 0
- app-type: react-gradle-h2mem-memcached
entity: sql
profile: dev,webpack
war: 1
protractor: 1
e2e: 1
testcontainers: 0
- app-type: react-gradle-cassandra-session-redis
entity: cassandra
profile: prod
war: 0
protractor: 1
e2e: 1
testcontainers: 0
- app-type: react-gradle-couchbase-caffeine
entity: couchbase
profile: prod
war: 0
protractor: 1
e2e: 1
testcontainers: 0
env:
JHI_ENTITY: ${{ matrix.entity }}
JHI_APP: ${{ matrix.app-type }}
JHI_PROFILE: ${{ matrix.profile }}
JHI_WAR: ${{ matrix.war }}
JHI_PROTRACTOR: ${{ matrix.protractor }}
JHI_E2E: ${{ matrix.e2e }}
JHI_TESTCONTAINERS: ${{ matrix.testcontainers }}
steps:
#----------------------------------------------------------------------
Expand Down Expand Up @@ -183,7 +183,13 @@ jobs:
run: npm run e2e:update-webdriver --versions.chrome ${{ steps.chromedriver-version.outputs.version }}
working-directory: /home/runner/app
- name: 'TESTS: End-to-End'
id: e2e
run: $JHI_SCRIPTS/24-tests-e2e.sh
- uses: actions/upload-artifact@v2
if: ${{ always() && steps.e2e.outcome == 'failure'}}
with:
name: screenshots-${{ matrix.app-type }}
path: /home/runner/app/target/cypress/screenshots
- name: 'TESTS: Sonar analysis'
run: $JHI_SCRIPTS/25-sonar-analyze.sh
env:
Expand Down
30 changes: 18 additions & 12 deletions .github/workflows/vue.yml
View file
Expand Up @@ -77,58 +77,58 @@ jobs:
entity: sqlfull
profile: prod
war: 0
protractor: 1
e2e: 1
- app-type: vue-noi18n
entity: sqlfull
profile: prod
war: 0
protractor: 1
e2e: 1
- app-type: vue-fulli18n-es
entity: sql
profile: prod
war: 0
protractor: 1
e2e: 1
- app-type: vue-gateway
entity: sql
profile: dev,webpack
war: 0
protractor: 1
e2e: 1
- app-type: vue-gradle-session
entity: sql
profile: dev,webpack
war: 0
protractor: 1
e2e: 1
- app-type: vue-ws-theme
entity: sql
profile: dev,webpack
war: 0
protractor: 1
e2e: 1
- app-type: vue-oauth2
entity: sql
profile: prod
war: 0
protractor: 1
e2e: 1
- app-type: vue-couchbase
entity: couchbase
profile: dev,webpack
war: 0
protractor: 1
e2e: 1
- app-type: vue-mongodb-kafka-cucumber
entity: mongodb
profile: dev,webpack
war: 0
protractor: 1
e2e: 1
- app-type: vue-session-cassandra-fr
entity: cassandra
profile: dev,webpack
war: 0
protractor: 1
e2e: 1
env:
JHI_ENTITY: ${{ matrix.entity }}
JHI_APP: ${{ matrix.app-type }}
JHI_PROFILE: ${{ matrix.profile }}
JHI_WAR: ${{ matrix.war }}
JHI_PROTRACTOR: ${{ matrix.protractor }}
JHI_E2E: ${{ matrix.e2e }}
steps:
#----------------------------------------------------------------------
# Install all tools and check configuration
Expand Down Expand Up @@ -175,8 +175,14 @@ jobs:
- name: 'TESTS: packaging'
run: $JHI_SCRIPTS/23-package.sh
- name: 'Synchronize chromedriver version'
if: ${{ matrix.protractor == 1 }}
if: ${{ matrix.e2e == 1 }}
run: npm run e2e:update-webdriver --versions.chrome ${{ steps.chromedriver-version.outputs.version }}
working-directory: /home/runner/app
- name: 'TESTS: End-to-End'
id: e2e
run: $JHI_SCRIPTS/24-tests-e2e.sh
- uses: actions/upload-artifact@v2
if: ${{ always() && steps.e2e.outcome == 'failure'}}
with:
name: screenshots-${{ matrix.app-type }}
path: /home/runner/app/target/cypress/screenshots
20 changes: 10 additions & 10 deletions .github/workflows/webflux.yml
View file
Expand Up @@ -72,48 +72,48 @@ jobs:
entity: mongodb
profile: prod
war: 0
protractor: 1
e2e: 1
- app-type: webflux-mongodb-es-session
entity: mongodb
profile: prod
war: 0
protractor: 1
e2e: 1
- app-type: webflux-mongodb-oauth2
entity: mongodb
profile: prod
war: 0
protractor: 1
e2e: 1
- app-type: webflux-gateway-jwt
entity: none
profile: prod
war: 0
protractor: 1
e2e: 1
- app-type: webflux-gateway-oauth2
entity: none
profile: prod
war: 0
protractor: 1
e2e: 1
- app-type: webflux-couchbase
entity: couchbase
profile: prod
war: 0
protractor: 1
e2e: 1
- app-type: webflux-couchbase-es-oauth2
entity: couchbase
profile: prod
war: 0
protractor: 1
e2e: 1
- app-type: webflux-psql
entity: none
profile: prod
war: 0
protractor: 1
e2e: 1
env:
JHI_ENTITY: ${{ matrix.entity }}
JHI_APP: ${{ matrix.app-type }}
JHI_PROFILE: ${{ matrix.profile }}
JHI_WAR: ${{ matrix.war }}
JHI_PROTRACTOR: ${{ matrix.protractor }}
JHI_E2E: ${{ matrix.e2e }}
steps:
#----------------------------------------------------------------------
# Install all tools and check configuration
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
run: npm run e2e:update-webdriver --versions.chrome ${{ steps.chromedriver-version.outputs.version }}
working-directory: /home/runner/app
- name: 'TESTS: End-to-End'
run: $JHI_SCRIPTS/24-tests-e2e.sh
run: $JHI_SCRIPTS/24-tests-cypress.sh
- name: 'TESTS: Sonar analysis'
run: $JHI_SCRIPTS/25-sonar-analyze.sh
env:
Expand Down
12 changes: 6 additions & 6 deletions azure-pipelines.yml
View file
Expand Up @@ -28,7 +28,7 @@ jobs:
variables:
JHI_PROFILE: dev,webpack
JHI_RUN_APP: 1
JHI_PROTRACTOR: 0
JHI_CYPRESS: 0
JHI_JDK: 11
# if JHI_LIB_BRANCH value is release, use the release from Maven
JHI_LIB_REPO: https://github.com/jhipster/jhipster.git
Expand All @@ -50,12 +50,12 @@ jobs:
JHI_APP: ms-ngx-gateway-eureka-jwt
JHI_ENTITY: sqllight
JHI_PROFILE: prod
JHI_PROTRACTOR: 1
JHI_CYPRESS: 1
ms-ngx-gateway-eureka-oauth2:
JHI_APP: ms-ngx-gateway-eureka-oauth2
JHI_ENTITY: sqllight
JHI_PROFILE: prod
JHI_PROTRACTOR: 1
JHI_CYPRESS: 1
ms-ngx-gateway-eureka-uaa:
JHI_APP: ms-ngx-gateway-eureka-uaa
JHI_ENTITY: uaa
Expand All @@ -69,17 +69,17 @@ jobs:
JHI_APP: ms-react-gateway-consul-jwt
JHI_ENTITY: sqllight
JHI_PROFILE: prod
JHI_PROTRACTOR: 1
JHI_CYPRESS: 1
ms-react-gateway-consul-oauth2:
JHI_APP: ms-react-gateway-consul-oauth2
JHI_ENTITY: sqllight
JHI_PROFILE: prod
JHI_PROTRACTOR: 1
JHI_CYPRESS: 1
jdl-default:
JHI_APP: jdl-default
JHI_ENTITY: jdl
JHI_PROFILE: prod
JHI_PROTRACTOR: 1
JHI_CYPRESS: 1
JHI_TESTCONTAINERS: 1
steps:
#----------------------------------------------------------------------
Expand Down
3 changes: 2 additions & 1 deletion generators/app/prompts.js
View file
Expand Up @@ -99,7 +99,8 @@ async function askForTestOpts() {
}
if (!this.skipClient) {
// all client side test frameworks should be added here
choices.push({ name: 'Protractor', value: 'protractor' });
choices.push({ name: 'Protractor **Deprecated**', value: 'protractor' });
choices.push({ name: 'Cypress', value: 'cypress' });
}
const PROMPT = {
type: 'checkbox',
Expand Down
1 change: 0 additions & 1 deletion generators/client/files-angular.js
View file
Expand Up @@ -39,7 +39,6 @@ const files = {
'tsconfig.app.json',
'tslint.json',
'.eslintrc.json',
'.eslintignore',
'angular.json',
'webpack/utils.js',
'webpack/webpack.common.js',
Expand Down

0 comments on commit 6df18ad

Please sign in to comment.