Merge pull request #865 from braydonf/feature/browser-tests

Added Chrome Browser Test if Available.
This commit is contained in:
Esteban Ordano 2015-01-07 09:28:14 -05:00
commit 3b217382a8
3 changed files with 28 additions and 3 deletions

View File

@ -65,7 +65,7 @@ var testMocha = function() {
};
var testKarma = shell.task([
'./node_modules/karma/bin/karma start --single-run --browsers Firefox'
'./node_modules/karma/bin/karma start'
]);
/**

View File

@ -2,12 +2,35 @@
// karma.conf.js
module.exports = function(config) {
config.set({
frameworks: ['mocha'],
browsers: ['Chrome', 'Firefox'],
browsers: ['Firefox'],
frameworks: ['mocha', 'detectBrowsers'],
detectBrowsers: {
enabled: true,
usePhantomJS: false,
postDetection: function(availableBrowser) {
// modify to enable additional browsers if available
var runBrowsers = ['Firefox', 'Chrome'];
var browsers = [];
for(var i = 0; i < runBrowsers.length; i++) {
if(~availableBrowser.indexOf(runBrowsers[i])) {
browsers.push(runBrowsers[i]);
}
}
return browsers;
}
},
singleRun: true,
files: [
'browser/tests.js'
],
plugins: [
'karma-mocha',
'karma-chrome-launcher',
'karma-firefox-launcher',
'karma-detect-browsers'
]
});
};

View File

@ -109,6 +109,8 @@
"jsdoc": "^3.3.0-alpha11",
"jsdoc-to-markdown": "=0.5.9",
"karma": "^0.12.28",
"karma-chrome-launcher": "^0.1.7",
"karma-detect-browsers": "^0.1.3",
"karma-firefox-launcher": "^0.1.3",
"karma-mocha": "^0.1.9",
"mocha": "~2.0.1",