Skip to content

Commit

Permalink
Downgrade karma version (fix ie9 capture)
Browse files Browse the repository at this point in the history
See more: karma-runner/karma#1564

Also, disable temporarily ie9
Also, test chrome/firefox on mac
  • Loading branch information
andersonba committed Jan 27, 2016
1 parent 7ff9189 commit d0f1b1d
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 13 deletions.
35 changes: 23 additions & 12 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
};

Expand All @@ -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)
Expand Down Expand Up @@ -141,6 +152,6 @@ module.exports = function(config) {

// Concurrency level
// how many browser should be started simultaneous
// concurrency: 2
concurrency: 2
})
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit d0f1b1d

Please sign in to comment.