stackforge-attic/tuskar-ui-extras
Code Issues Proposed changes

Use the pluggable eslint instead of jshint

Browse Source 
We likely have to write some plugins, or configure it better,
but that will be a different patch.

Change-Id: I71eb341af45dc529a3d84467d7252b3d64b1e56d
This commit is contained in:
Lennart Regebro 2014-12-02 14:27:07 +01:00
parent b3c49ab78a
commit 6ee771a4e2
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
run_tests.sh
View File

@ -27,7 +27,7 @@ function usage {
echo " -p, --pep8 Just run pep8" echo " -p, --pep8 Just run pep8"
echo " -t, --tabs Check for tab characters in files." echo " -t, --tabs Check for tab characters in files."
echo " -y, --pylint Just run pylint" echo " -y, --pylint Just run pylint"
echo " -j, --jshint Just run jshint" echo " -j, --jshint --eslint Just run eslint"
echo " -q, --quiet Run non-interactively. (Relatively) quiet." echo " -q, --quiet Run non-interactively. (Relatively) quiet."
echo " Implies -V if -N is not set." echo " Implies -V if -N is not set."
echo " --only-selenium Run only the Selenium unit tests" echo " --only-selenium Run only the Selenium unit tests"
@ -65,7 +65,7 @@ just_pep8=0
just_pylint=0 just_pylint=0
just_docs=0 just_docs=0
just_tabs=0 just_tabs=0
just_jshint=0 just_eslint=0
never_venv=0 never_venv=0
quiet=0 quiet=0
restore_env=0 restore_env=0
@ -98,7 +98,7 @@ function process_option {
-N|--no-virtual-env) always_venv=0; never_venv=1;; -N|--no-virtual-env) always_venv=0; never_venv=1;;
-p|--pep8) just_pep8=1;; -p|--pep8) just_pep8=1;;
-y|--pylint) just_pylint=1;; -y|--pylint) just_pylint=1;;
-j|--jshint) just_jshint=1;; -j|--jshint|--eslint) just_eslint=1;;
-f|--force) force=1;; -f|--force) force=1;;
-t|--tabs) just_tabs=1;; -t|--tabs) just_tabs=1;;
-q|--quiet) quiet=1;; -q|--quiet) quiet=1;;
@ -143,10 +143,10 @@ function run_pylint {
fi fi
} }
function run_jshint { function run_eslint {
echo "Running jshint ..." echo "Running eslint ..."
jshint tuskar_boxes eslint tuskar_boxes
jshint tuskar_sat_ui eslint tuskar_sat_ui
} }
function run_pep8 { function run_pep8 {
@ -454,9 +454,9 @@ if [ $just_tabs -eq 1 ]; then
exit $? exit $?
fi fi
# Jshint # Linting JS
if [ $just_jshint -eq 1 ]; then if [ $just_eslint -eq 1 ]; then
run_jshint run_eslint
exit $? exit $?
fi fi

8
tox.ini
View File

@ -1,5 +1,5 @@
[tox] [tox]
envlist = py26,py27,py27dj14,py27dj15,py27dj16,pep8,selenium,jshint envlist = py26,py27,py27dj14,py27dj15,py27dj16,pep8,selenium,eslint
[testenv] [testenv]
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
@ -39,10 +39,10 @@ commands = pip install django>=1.6,<1.7
[testenv:selenium] [testenv:selenium]
commands = /bin/bash run_tests.sh -N --only-selenium commands = /bin/bash run_tests.sh -N --only-selenium
[testenv:jshint] [testenv:eslint]
commands = nodeenv -p commands = nodeenv -p
npm install jshint -g npm install eslint -g
/bin/bash run_tests.sh -N --jshint /bin/bash run_tests.sh -N --eslint
[tox:jenkins] [tox:jenkins]
downloadcache = ~/cache/pip downloadcache = ~/cache/pip