diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eb847f99469354f09be4a35d9a45fd850232d3d1..db92e7a053f0f228021f2870f632db4250556101 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,7 +36,7 @@ unit_tests: allow_failure: false dependencies: [] variables: - CHROME_BIN: /usr/bin/chromium-browser + CHROME_BIN: /usr/bin/google-chrome script: - npm install - npm test diff --git a/karma.conf.js b/karma.conf.js index 123819772b3e0a87936c5a80662c3f2e949800bb..99b6fe48b3e26a5c06d6e48a7b556a861ac30602 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,6 +1,8 @@ // Karma configuration file, see link for more information // https://karma-runner.github.io/1.0/config/configuration-file.html +const isDocker = require('is-docker')(); + module.exports = function (config) { config.set({ basePath: '', @@ -8,7 +10,7 @@ module.exports = function (config) { customLaunchers: { ChromeHeadlessCustom: { base: 'ChromeHeadless', - flags: ['--no-sandbox'] + flags: isDocker ? ['--no-sandbox'] : [] } }, frameworks: ['jasmine', '@angular-devkit/build-angular'], diff --git a/package.json b/package.json index dfd552448922485b1ae689f0ab584e98c612dc7d..f93b789e025ec2a2545904d8bb2d4a7fecdd4a8c 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "chart.js": "^2.7.3", "core-js": "^2.5.7", "hammerjs": "^2.0.8", + "is-docker": "^1.1.0", "ng2-charts": "^1.6.0", "ngx-markdown": "^1.6.0", "rxjs": "^6.3.3",