openstack/zun-ui
Code Issues Proposed changes

Update packages for JavaScript tests

Browse Source 
This patch updates packages for JavaScript tests.
Also, adds '.idea' directory for PyCharm into .gitignore.

Change-Id: I83c3a5474a38b14aa0e6f73fd7ee91216717a4a4
This commit is contained in:
Shu Muto 2017-12-06 12:11:30 +09:00
parent 830ff17072
commit 20c1196e2c
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -8,6 +8,7 @@ npm-debug.log
releasenotes/build releasenotes/build
zun_ui/test/.secret_key_store zun_ui/test/.secret_key_store
.coverage* .coverage*
.idea
.jshintrc .jshintrc
.project .project
.pydevproject .pydevproject

26
package.json
View File

@ -6,19 +6,19 @@
"repository": "none", "repository": "none",
"license": "Apache 2.0", "license": "Apache 2.0",
"devDependencies": { "devDependencies": {
"eslint": "^1.10.3", "eslint": "3.19.x",
"eslint-config-openstack": "^1.2.4", "eslint-config-openstack": "^4.0.1",
"eslint-plugin-angular": "1.0.1", "eslint-plugin-angular": "3.1.x",
"jasmine-core": "2.4.1", "jasmine-core": "2.8.x",
"karma": "1.1.2", "karma": "1.7.x",
"karma-chrome-launcher": "1.0.1", "karma-chrome-launcher": "^2.2.0",
"karma-cli": "1.0.1", "karma-cli": "1.0.x",
"karma-coverage": "1.1.1", "karma-coverage": "1.1.x",
"karma-jasmine": "1.0.2", "karma-jasmine": "1.1.x",
"karma-ng-html2js-preprocessor": "1.0.0", "karma-ng-html2js-preprocessor": "1.0.x",
"karma-phantomjs-launcher": "0.2.0", "karma-phantomjs-launcher": "1.0.x",
"karma-threshold-reporter": "0.1.15", "karma-threshold-reporter": "0.1.x",
"phantomjs": "1.9.17" "phantomjs-prebuilt": "2.1.x"
}, },
"scripts": { "scripts": {
"postinstall": "if [ ! -d .tox ] || [ ! -d .tox/py27 ]; then tox -epy27 --notest; fi", "postinstall": "if [ ! -d .tox ] || [ ! -d .tox/py27 ]; then tox -epy27 --notest; fi",

3
zun_ui/karma.conf.js
View File

@ -21,6 +21,9 @@ module.exports = function (config) {
// This tox venv is setup in the post-install npm step // This tox venv is setup in the post-install npm step
var toxPath = '../.tox/py27/lib/python2.7/site-packages/'; var toxPath = '../.tox/py27/lib/python2.7/site-packages/';
process.env.PHANTOMJS_BIN = 'node_modules/phantomjs-prebuilt/bin/phantomjs';
config.set({ config.set({
preprocessors: { preprocessors: {
// Used to collect templates for preprocessing. // Used to collect templates for preprocessing.