diff --git a/e2e/protractor-ci.conf.js b/e2e/protractor-ci.conf.js new file mode 100644 index 0000000000..63173e44e3 --- /dev/null +++ b/e2e/protractor-ci.conf.js @@ -0,0 +1,10 @@ +const config = require('./protractor.conf').config; + +config.capabilities = { + browserName: 'chrome', + chromeOptions: { + args: ['--headless', '--no-sandbox', '--disable-gpu'] + } +}; + +exports.config = config; diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js index 2432b98909..32a30239de 100644 --- a/e2e/protractor.conf.js +++ b/e2e/protractor.conf.js @@ -33,7 +33,7 @@ exports.config = { 'version': '', 'platform': 'ANY', 'chromeOptions': { - 'args': [ '--headless', '--disable-gpu' ] + args: ['--headless', '--no-sandbox', '--disable-gpu'] } }, // ----------------------------------------------------------------- diff --git a/package.json b/package.json index f6a79a441b..490ad1caeb 100644 --- a/package.json +++ b/package.json @@ -25,9 +25,10 @@ "test:headless": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng test --watch=false --sourceMap=true --browsers=ChromeHeadless --code-coverage", "lint": "ng lint", "e2e": "ng e2e", + "e2e:ci": "ng e2e --protractor-config=./e2e/protractor-ci.conf.js", "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 && yarn run e2e", + "ci": "yarn run e2e:ci", "clean:coverage": "rimraf coverage", "clean:dist": "rimraf dist", "clean:doc": "rimraf doc", diff --git a/src/environments/environment.travis.ts b/src/environments/environment.travis.ts deleted file mode 100644 index 9ba1746ada..0000000000 --- a/src/environments/environment.travis.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { GlobalConfig } from '../config/global-config.interface'; - -export const environment: Partial = { - rest: { - ssl: false, - host: 'localhost', - port: 8080, - // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript - nameSpace: '/server/api' - } -};