fixed e2e script that uses docker

This commit is contained in:
lotte
2020-03-19 11:46:18 +01:00
parent 02c67f4ec0
commit 9043e1375c
2 changed files with 15 additions and 13 deletions

View File

@@ -71,6 +71,14 @@
"maximumError": "10kb" "maximumError": "10kb"
} }
] ]
},
"travis": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.travis.ts"
}
]
} }
} }
}, },
@@ -82,6 +90,9 @@
"configurations": { "configurations": {
"production": { "production": {
"browserTarget": "dspace-angular-cli:build:production" "browserTarget": "dspace-angular-cli:build:production"
},
"travis": {
"browserTarget": "dspace-angular-cli:build:travis"
} }
} }
}, },
@@ -141,18 +152,9 @@
"configurations": { "configurations": {
"production": { "production": {
"devServerTarget": "dspace-angular-cli:serve:production" "devServerTarget": "dspace-angular-cli:serve:production"
} },
} "travis": {
}, "devServerTarget": "dspace-angular-cli:serve:travis"
"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"
} }
} }
}, },

View File

@@ -16,7 +16,7 @@
"e2e": "ng e2e", "e2e": "ng e2e",
"compile:server": "webpack --config webpack.server.config.js --progress --colors", "compile:server": "webpack --config webpack.server.config.js --progress --colors",
"serve:ssr": "node dist/server", "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:coverage": "rimraf coverage",
"clean:dist": "rimraf dist", "clean:dist": "rimraf dist",
"clean:doc": "rimraf doc", "clean:doc": "rimraf doc",