1
0
mirror of https://github.com/videojs/video.js.git synced 2024-12-25 02:42:10 +02:00

@forbesjo updated karma to use all installed browsers for unit tests. closes #2708

This commit is contained in:
jforbes 2015-10-26 17:06:16 -04:00 committed by Gary Katsevman
parent 93e079718e
commit 4598b38291
4 changed files with 16 additions and 4 deletions

View File

@ -4,6 +4,7 @@ CHANGELOG
## HEAD (Unreleased)
* @typcn bumped grunt-sass to ^1.0.0 to support node 4.x ([view](https://github.com/videojs/video.js/pull/2645))
* @gkatsev removed unhelpful isCrossOrigin test ([view](https://github.com/videojs/video.js/pull/2715))
* @forbesjo updated karma to use all installed browsers for unit tests ([view](https://github.com/videojs/video.js/pull/2708))
--------------------

View File

@ -131,7 +131,12 @@ module.exports = function(grunt) {
configFile: 'test/karma.conf.js'
},
defaults: {},
defaults: {
detectBrowsers: {
enabled: !process.env.TRAVIS,
usePhantomJS: false
}
},
watch: {
autoWatch: true,

View File

@ -73,6 +73,7 @@
"karma-browserstack-launcher": "^0.1.4",
"karma-chrome-launcher": "^0.1.3",
"karma-coverage": "^0.4.0",
"karma-detect-browsers": "^2.0.2",
"karma-firefox-launcher": "^0.1.3",
"karma-ie-launcher": "^0.1.5",
"karma-opera-launcher": "~0.1.0",

View File

@ -3,10 +3,9 @@ module.exports = function(config) {
var settings = {
basePath: '',
frameworks: ['browserify', 'qunit'],
frameworks: ['browserify', 'qunit', 'detectBrowsers'],
autoWatch: false,
singleRun: true,
browsers: ['Chrome'],
// Compling tests here
files: [
@ -46,9 +45,15 @@ module.exports = function(config) {
'karma-safari-launcher',
'karma-browserstack-launcher',
'karma-browserify',
'karma-coverage'
'karma-coverage',
'karma-detect-browsers',
],
detectBrowsers: {
enabled: false,
usePhantomJS: false
},
reporters: ['dots'],
// web server port