diff --git a/.travis.yml b/.travis.yml index f3c019d99..fa76e65bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,6 @@ dist: xenial sudo: required services: - xvfb -addons: - chrome: stable before_script: - export DISPLAY=:99.0 install: diff --git a/angular.json b/angular.json index ceda86d98..5ce38154b 100644 --- a/angular.json +++ b/angular.json @@ -130,7 +130,7 @@ ], "customWebpackConfig": { "path": "./angular.webpack.js", - "target": "web" + "target": "electron-renderer" } } }, diff --git a/package.json b/package.json index e2bdae233..e4f0de47f 100644 --- a/package.json +++ b/package.json @@ -70,8 +70,8 @@ "jasmine-core": "3.4.0", "jasmine-spec-reporter": "4.2.1", "karma": "4.2.0", - "karma-chrome-launcher": "3.0.0", "karma-coverage-istanbul-reporter": "2.1.0", + "karma-electron": "^6.3.0", "karma-jasmine": "2.0.1", "karma-jasmine-html-reporter": "1.4.2", "mocha": "6.2.0", diff --git a/src/karma.conf.js b/src/karma.conf.js index 886ca1b0c..bd57a1075 100644 --- a/src/karma.conf.js +++ b/src/karma.conf.js @@ -7,7 +7,7 @@ module.exports = function (config) { frameworks: ['jasmine', '@angular-devkit/build-angular'], plugins: [ require('karma-jasmine'), - require('karma-chrome-launcher'), + require('karma-electron'), require('karma-jasmine-html-reporter'), require('karma-coverage-istanbul-reporter'), require('@angular-devkit/build-angular/plugins/karma') @@ -25,7 +25,21 @@ module.exports = function (config) { colors: true, logLevel: config.LOG_INFO, autoWatch: true, - browsers: ['Chrome'], - singleRun: true + browsers: ['AngularElectron'], + singleRun: true, + customLaunchers: { + AngularElectron: { + base: 'Electron', + browserWindowOptions: { + webPreferences: { + nodeIntegration: true, + allowRunningInsecureContent: true + } + } + } + }, + client: { + useIframe: false + } }); };