hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 02:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adressed @romainneutron's comments

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-08-09 11:48:46 +02:00
parent f6e9e227f8
commit fb640b0113
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@@ -5,6 +5,7 @@
"bower-canary": "latest", "bower-canary": "latest",
"mocha-phantomjs": ">=2.0 <3.0", "mocha-phantomjs": ">=2.0 <3.0",
"recess": ">=1.1.0 <1.1.7", "recess": ">=1.1.0 <1.1.7",
"uglify-js": "latest" "uglify-js": "latest",
"phantomjs": "latest"
} }
} }

8
tests/js/run.sh
View File

@@ -5,15 +5,11 @@ ROOTDIR="$BASEDIR/../.."
PHANTOMJS_BIN="" PHANTOMJS_BIN=""
MOCHA_PHANTOMJS_BIN="" MOCHA_PHANTOMJS_BIN=""
if type "phantomjs" > /dev/null; then if type "$ROOTDIR/node_modules/.bin/phantomjs" > /dev/null; then
PHANTOMJS_BIN="phantomjs"
elif type "$ROOTDIR/node_modules/.bin/phantomjs" > /dev/null; then
PHANTOMJS_BIN="$ROOTDIR/node_modules/.bin/phantomjs" PHANTOMJS_BIN="$ROOTDIR/node_modules/.bin/phantomjs"
fi fi
if type "mocha-phantomjs" > /dev/null; then if type "$ROOTDIR/node_modules/.bin/mocha-phantomjs" > /dev/null; then
MOCHA_PHANTOMJS_BIN="mocha-phantomjs"
elif type "$ROOTDIR/node_modules/.bin/mocha-phantomjs" > /dev/null; then
MOCHA_PHANTOMJS_BIN="$ROOTDIR/node_modules/.bin/mocha-phantomjs" MOCHA_PHANTOMJS_BIN="$ROOTDIR/node_modules/.bin/mocha-phantomjs"
fi fi