diff options
author | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-05-29 12:14:02 +0800 |
---|---|---|
committer | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-05-29 12:14:02 +0800 |
commit | 4cf0e213544f3fe5fbaa91827d54c3a9a583dacd (patch) | |
tree | b09718ed9e6fde042ab8747b720f4ec4fe71012a | |
parent | 54dbaba577ad28645e71080698abee55fd2797ab (diff) | |
download | gitlab-ce-set-karma-concurrency.tar.gz |
Revert timeout set in karma specset-karma-concurrency
Set karma concurrency to 2 for CI
-rw-r--r-- | config/karma.config.js | 1 | ||||
-rw-r--r-- | spec/javascripts/notes/components/note_app_spec.js | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config/karma.config.js b/config/karma.config.js index 2a5bf3581e0..7fba69fd28d 100644 --- a/config/karma.config.js +++ b/config/karma.config.js @@ -112,6 +112,7 @@ module.exports = function(config) { const karmaConfig = { basePath: ROOT_PATH, browsers: ['ChromeHeadlessCustom'], + concurrency: process.env.CI ? 2 : Infinity, client: { color: !process.env.CI, }, diff --git a/spec/javascripts/notes/components/note_app_spec.js b/spec/javascripts/notes/components/note_app_spec.js index f04af04f852..ef876dc2941 100644 --- a/spec/javascripts/notes/components/note_app_spec.js +++ b/spec/javascripts/notes/components/note_app_spec.js @@ -195,7 +195,7 @@ describe('note_app', () => { setTimeout(() => { done(); }); - }, 2000); + }); }); describe('discussion note', () => { @@ -230,7 +230,7 @@ describe('note_app', () => { setTimeout(() => { done(); }); - }, 2000); + }); }); }); |