summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-06-16 07:06:39 +0000
committerTim Zallmann <tzallmann@gitlab.com>2017-06-16 07:06:39 +0000
commit446f37872f6b493f1f27055f26abb66fcf8d435a (patch)
tree2271275f1ad2c20534261fcc96a9fc5b4575f2bc /config
parentc676e79e6f5344e8a45d9cd262055729939a54b9 (diff)
parent132be812d1c4ecf185f8839432f6bcafa13880e5 (diff)
downloadgitlab-ce-446f37872f6b493f1f27055f26abb66fcf8d435a.tar.gz
Merge branch 'karma-headless-chrome-redux' into 'master'33592-pipeline-schedules-callout-has-no-top-margin
Replace PhantomJS with Chrome in Karma test runner (2nd attempt) Closes #33633 See merge request !12144
Diffstat (limited to 'config')
-rw-r--r--config/karma.config.js22
1 files changed, 21 insertions, 1 deletions
diff --git a/config/karma.config.js b/config/karma.config.js
index 40c58e7771d..978850e5d70 100644
--- a/config/karma.config.js
+++ b/config/karma.config.js
@@ -21,7 +21,18 @@ module.exports = function(config) {
var karmaConfig = {
basePath: ROOT_PATH,
- browsers: ['PhantomJS'],
+ browsers: ['ChromeHeadlessCustom'],
+ customLaunchers: {
+ ChromeHeadlessCustom: {
+ base: 'ChromeHeadless',
+ displayName: 'Chrome',
+ flags: [
+ // chrome cannot run in sandboxed mode inside a docker container unless it is run with
+ // escalated kernel privileges (e.g. docker run --cap-add=CAP_SYS_ADMIN)
+ '--no-sandbox',
+ ],
+ }
+ },
frameworks: ['jasmine'],
files: [
{ pattern: 'spec/javascripts/test_bundle.js', watched: false },
@@ -45,5 +56,14 @@ module.exports = function(config) {
};
}
+ if (process.env.DEBUG) {
+ karmaConfig.logLevel = config.LOG_DEBUG;
+ process.env.CHROME_LOG_FILE = process.env.CHROME_LOG_FILE || 'chrome_debug.log';
+ }
+
+ if (process.env.CHROME_LOG_FILE) {
+ karmaConfig.customLaunchers.ChromeHeadlessCustom.flags.push('--enable-logging', '--v=1');
+ }
+
config.set(karmaConfig);
};