From d0f1b1da7e6d9627a6a9d280e94d007d7867073f Mon Sep 17 00:00:00 2001 From: Anderson de Oliveira Date: Wed, 27 Jan 2016 14:08:09 -0300 Subject: [PATCH] Downgrade karma version (fix ie9 capture) See more: https://github.com/karma-runner/karma/issues/1564 Also, disable temporarily ie9 Also, test chrome/firefox on mac --- karma.conf.js | 35 +++++++++++++++++++++++------------ package.json | 2 +- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index b64c07f..fcf029f 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -38,19 +38,33 @@ module.exports = function(config) { os: 'Windows', os_version: '8' }, - ie9_win: { - base: 'BrowserStack', - browser: 'ie', - browser_version: '9.0', - os: 'Windows', - os_version: '7' - }, + // ie9_win: { + // base: 'BrowserStack', + // browser: 'ie', + // browser_version: '9.0', + // os: 'Windows', + // os_version: '7' + // }, safari_mac: { base: 'BrowserStack', browser: 'safari', browser_version: '9.0', os: 'OS X', os_version: 'El Capitan' + }, + firefox_mac: { + base: 'BrowserStack', + browser: 'firefox', + browser_version: '38.0', + os: 'OS X', + os_version: 'Yosemite' + }, + chrome_mac: { + base: 'BrowserStack', + browser: 'chrome', + browser_version: '44.0', + os: 'OS X', + os_version: 'Mavericks' } }; @@ -71,10 +85,7 @@ module.exports = function(config) { customLaunchers: customLaunchers, - browserNoActivityTimeout: 60000, - - - captureTimeout: 90000, + browserNoActivityTimeout: 70000, // base path that will be used to resolve all patterns (eg. files, exclude) @@ -141,6 +152,6 @@ module.exports = function(config) { // Concurrency level // how many browser should be started simultaneous - // concurrency: 2 + concurrency: 2 }) } diff --git a/package.json b/package.json index fc033ca..5d6d489 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "browser-sync-webpack-plugin": "^1.0.1", "chai": "^3.4.1", "eslint": "^1.10.3", - "karma": "^0.13.19", + "karma": "0.12.24", "karma-babel-preprocessor": "^6.0.1", "karma-browserstack-launcher": "^0.1.9", "karma-chai": "^0.1.0",