Merge "Cleanup the test settings"

.gitignore

@@ -1,17 +1,19 @@
 AUTHORS
 ChangeLog
 build
-coverage-karma
+cover
 doc/source/sourcecode
 magnum_ui/test/.secret_key_store
 node_modules
 npm-debug.log
-.venv
+.coverage*
+.jshintrc
+.project
+.pydevproject
+.settings
 .tox
-*.pyc
-*.lock
+.venv
 *.egg*
+*.lock
+*.pyc
 *.swp
-.coverage
-coverage.xml
-htmlcov

magnum_ui/karma.conf.js

@@ -141,7 +141,7 @@ module.exports = function (config) {
     // Places coverage report in HTML format in the subdirectory below.
     coverageReporter: {
       type: 'html',
-      dir: '../coverage-karma/'
+      dir: '../cover/karma/'
     },
 
     // Coverage threshold values.

package.json

@@ -28,6 +28,7 @@
   "scripts": {
     "postinstall": "if [ ! -d .tox ] || [ ! -d .tox/py27 ]; then tox -epy27 --notest; fi",
     "lint": "eslint --no-color magnum_ui/static",
+    "lintq": "eslint --quiet magnum_ui/static",
     "test": "karma start magnum_ui/karma.conf.js --single-run"
   }
 }

tox.ini

@@ -26,8 +26,8 @@ commands = {posargs}
 commands =
   coverage erase
   coverage run {toxinidir}/manage.py test magnum_ui --settings=magnum_ui.test.settings {posargs} --exclude-dir=magnum_ui/test/integration_tests {posargs}
-  coverage xml --omit '.tox/cover/*'
-  coverage html --omit '.tox/cover/*'
+  coverage xml --omit '.tox/cover/*' -o 'cover/coverage.xml'
+  coverage html --omit '.tox/cover/*' -d 'cover/htmlcov'
 
 [testenv:py27dj18]
 basepython = python2.7