From 9043e1375c7cc96cb36059567957a63a2cfc12ca Mon Sep 17 00:00:00 2001 From: lotte Date: Thu, 19 Mar 2020 11:46:18 +0100 Subject: [PATCH] fixed e2e script that uses docker --- angular.json | 26 ++++++++++++++------------ package.json | 2 +- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/angular.json b/angular.json index 229eeb2292..96bbbc3219 100644 --- a/angular.json +++ b/angular.json @@ -71,6 +71,14 @@ "maximumError": "10kb" } ] + }, + "travis": { + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.travis.ts" + } + ] } } }, @@ -82,6 +90,9 @@ "configurations": { "production": { "browserTarget": "dspace-angular-cli:build:production" + }, + "travis": { + "browserTarget": "dspace-angular-cli:build:travis" } } }, @@ -141,18 +152,9 @@ "configurations": { "production": { "devServerTarget": "dspace-angular-cli:serve:production" - } - } - }, - "e2e:docker": { - "builder": "@angular-devkit/build-angular:protractor", - "options": { - "protractorConfig": "e2e/protractor.conf.js", - "devServerTarget": "dspace-angular-cli:serve" - }, - "configurations": { - "production": { - "devServerTarget": "dspace-angular-cli:serve:production" + }, + "travis": { + "devServerTarget": "dspace-angular-cli:serve:travis" } } }, diff --git a/package.json b/package.json index b8704c905d..bf5ec1b141 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "e2e": "ng e2e", "compile:server": "webpack --config webpack.server.config.js --progress --colors", "serve:ssr": "node dist/server", - "ci": "ng lint && yarn run build:prod && yarn test:headless && ng e2e:docker", + "ci": "ng lint && yarn run build:prod && yarn test:headless && ng e2e --configuration=travis", "clean:coverage": "rimraf coverage", "clean:dist": "rimraf dist", "clean:doc": "rimraf doc",