Merge "Added PhantomJS test execution"

This commit is contained in:
Jenkins 2015-06-12 16:18:59 +00:00 committed by Gerrit Code Review
commit b642f351b2
2 changed files with 4 additions and 1 deletions

View File

@ -13,6 +13,8 @@
"karma-cli": "0.0.4", "karma-cli": "0.0.4",
"karma-firefox-launcher": "^0.1.3", "karma-firefox-launcher": "^0.1.3",
"karma-jasmine": "^0.2.2", "karma-jasmine": "^0.2.2",
"karma-phantomjs-launcher": "0.2.0",
"phantomjs": "1.9.17",
"protractor": "~1.0.0", "protractor": "~1.0.0",
"shelljs": "^0.2.6", "shelljs": "^0.2.6",
"tmp": "0.0.23" "tmp": "0.0.23"

View File

@ -29,11 +29,12 @@ module.exports = function (config) {
frameworks: ['jasmine'], frameworks: ['jasmine'],
browsers: ['Firefox'], browsers: ['Firefox', 'PhantomJS'],
plugins: [ plugins: [
'karma-chrome-launcher', 'karma-chrome-launcher',
'karma-firefox-launcher', 'karma-firefox-launcher',
'karma-phantomjs-launcher',
'karma-jasmine' 'karma-jasmine'
], ],