diff --git a/.gitignore b/.gitignore index 76c3e28..d6765bb 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ npm-debug.log releasenotes/build zun_ui/test/.secret_key_store .coverage* +.idea .jshintrc .project .pydevproject diff --git a/package.json b/package.json index e6028c7..6f0cb67 100644 --- a/package.json +++ b/package.json @@ -6,19 +6,19 @@ "repository": "none", "license": "Apache 2.0", "devDependencies": { - "eslint": "^1.10.3", - "eslint-config-openstack": "^1.2.4", - "eslint-plugin-angular": "1.0.1", - "jasmine-core": "2.4.1", - "karma": "1.1.2", - "karma-chrome-launcher": "1.0.1", - "karma-cli": "1.0.1", - "karma-coverage": "1.1.1", - "karma-jasmine": "1.0.2", - "karma-ng-html2js-preprocessor": "1.0.0", - "karma-phantomjs-launcher": "0.2.0", - "karma-threshold-reporter": "0.1.15", - "phantomjs": "1.9.17" + "eslint": "3.19.x", + "eslint-config-openstack": "^4.0.1", + "eslint-plugin-angular": "3.1.x", + "jasmine-core": "2.8.x", + "karma": "1.7.x", + "karma-chrome-launcher": "^2.2.0", + "karma-cli": "1.0.x", + "karma-coverage": "1.1.x", + "karma-jasmine": "1.1.x", + "karma-ng-html2js-preprocessor": "1.0.x", + "karma-phantomjs-launcher": "1.0.x", + "karma-threshold-reporter": "0.1.x", + "phantomjs-prebuilt": "2.1.x" }, "scripts": { "postinstall": "if [ ! -d .tox ] || [ ! -d .tox/py27 ]; then tox -epy27 --notest; fi", diff --git a/zun_ui/karma.conf.js b/zun_ui/karma.conf.js index 19c7cf0..b62b09e 100644 --- a/zun_ui/karma.conf.js +++ b/zun_ui/karma.conf.js @@ -21,6 +21,9 @@ module.exports = function (config) { // This tox venv is setup in the post-install npm step var toxPath = '../.tox/py27/lib/python2.7/site-packages/'; + process.env.PHANTOMJS_BIN = 'node_modules/phantomjs-prebuilt/bin/phantomjs'; + + config.set({ preprocessors: { // Used to collect templates for preprocessing.