summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Krotscheck <krotscheck@gmail.com>2015-06-16 11:54:46 -0700
committerMichael Krotscheck <krotscheck@gmail.com>2015-06-16 12:06:36 -0700
commitfc2f3628e4db11cad2f3dfd8cb75486c0d10bc49 (patch)
treec6d160149b23e5cc865121bacbdcadf88fba9f16
parent3148fc8903a92c68904bb3827e10245036b7267a (diff)
Added test execution in Chromium.
This adds capturing and executing tests in the Chromium browser. It is already supported in infra. Change-Id: I4d18da18f9b93dc057cbe71667c5871e8210c50d
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: Timur Sufiev <tsufiev@mirantis.com> Workflow+1: Timur Sufiev <tsufiev@mirantis.com> Submitted-by: Jenkins Submitted-at: Mon, 22 Jun 2015 14:31:13 +0000 Reviewed-on: https://review.openstack.org/192365 Project: stackforge/merlin Branch: refs/heads/master
-rw-r--r--karma-unit.conf.js3
-rw-r--r--package.json4
2 files changed, 4 insertions, 3 deletions
diff --git a/karma-unit.conf.js b/karma-unit.conf.js
index 2a13388..2a2d800 100644
--- a/karma-unit.conf.js
+++ b/karma-unit.conf.js
@@ -25,11 +25,12 @@ module.exports = function (config) {
25 25
26 frameworks: ['jasmine'], 26 frameworks: ['jasmine'],
27 27
28 browsers: [ 'PhantomJS'], 28 browsers: [ 'PhantomJS', 'Chrome'],
29 29
30 plugins: [ 30 plugins: [
31 'karma-jasmine', 31 'karma-jasmine',
32 'karma-phantomjs-launcher', 32 'karma-phantomjs-launcher',
33 'karma-chrome-launcher',
33 'karma-ng-html2js-preprocessor' 34 'karma-ng-html2js-preprocessor'
34 ], 35 ],
35 36
diff --git a/package.json b/package.json
index 6086e4b..0569628 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
13 "grunt-env": "0.4.1", 13 "grunt-env": "0.4.1",
14 "grunt-eslint": "7.0.1", 14 "grunt-eslint": "7.0.1",
15 "grunt-html2js": "0.2.9", 15 "grunt-html2js": "0.2.9",
16 "grunt-karma": "0.9.0", 16 "grunt-karma": "0.10.1",
17 "grunt-open": "0.2.3", 17 "grunt-open": "0.2.3",
18 "grunt-protractor-runner": "1.1.4", 18 "grunt-protractor-runner": "1.1.4",
19 "grunt-shell": "1.1.1", 19 "grunt-shell": "1.1.1",
@@ -24,7 +24,7 @@
24 "grunt-karma": "0.10.1", 24 "grunt-karma": "0.10.1",
25 "jasmine-core": "^2.2.0", 25 "jasmine-core": "^2.2.0",
26 "karma": "0.12.31", 26 "karma": "0.12.31",
27 "karma-chrome-launcher": "0.1.7", 27 "karma-chrome-launcher": "0.1.12",
28 "karma-cli": "0.0.4", 28 "karma-cli": "0.0.4",
29 "karma-jasmine": "0.3.5", 29 "karma-jasmine": "0.3.5",
30 "karma-phantomjs-launcher": "0.1.4", 30 "karma-phantomjs-launcher": "0.1.4",