x
/
merlin
Code Issues Proposed changes

Added test execution in Chromium. 

This adds capturing and executing tests in the Chromium browser.
It is already supported in infra.

Change-Id: I4d18da18f9b93dc057cbe71667c5871e8210c50d
This commit is contained in:
Michael Krotscheck 2015-06-16 11:54:46 -07:00
parent 3148fc8903
commit fc2f3628e4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
karma-unit.conf.js
View File

@ -25,11 +25,12 @@ module.exports = function (config) {
frameworks: ['jasmine'], frameworks: ['jasmine'],
browsers: [ 'PhantomJS'], browsers: [ 'PhantomJS', 'Chrome'],
plugins: [ plugins: [
'karma-jasmine', 'karma-jasmine',
'karma-phantomjs-launcher', 'karma-phantomjs-launcher',
'karma-chrome-launcher',
'karma-ng-html2js-preprocessor' 'karma-ng-html2js-preprocessor'
], ],

4
package.json
View File

@ -13,7 +13,7 @@
"grunt-env": "0.4.1", "grunt-env": "0.4.1",
"grunt-eslint": "7.0.1", "grunt-eslint": "7.0.1",
"grunt-html2js": "0.2.9", "grunt-html2js": "0.2.9",
"grunt-karma": "0.9.0", "grunt-karma": "0.10.1",
"grunt-open": "0.2.3", "grunt-open": "0.2.3",
"grunt-protractor-runner": "1.1.4", "grunt-protractor-runner": "1.1.4",
"grunt-shell": "1.1.1", "grunt-shell": "1.1.1",
@ -24,7 +24,7 @@
"grunt-karma": "0.10.1", "grunt-karma": "0.10.1",
"jasmine-core": "^2.2.0", "jasmine-core": "^2.2.0",
"karma": "0.12.31", "karma": "0.12.31",
"karma-chrome-launcher": "0.1.7", "karma-chrome-launcher": "0.1.12",
"karma-cli": "0.0.4", "karma-cli": "0.0.4",
"karma-jasmine": "0.3.5", "karma-jasmine": "0.3.5",
"karma-phantomjs-launcher": "0.1.4", "karma-phantomjs-launcher": "0.1.4",