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

Update testacular to karma

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-05-31 14:15:08 +02:00
parent cbd8236e91
commit 538a4740c7
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -8,7 +8,7 @@ before_script:
- rm -f config/services.yml config/connexions.yml config/config.yml config/config.inc config/connexion.inc config/_GV.php config/_GV.php.old
- cp -f hudson/connexion.inc config/
- cp -f hudson/_GV.php config/
- npm install bower mocha-phantomjs testacular -g
- npm install bower mocha-phantomjs karma -g
- echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
- sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
- sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then pecl install redis; fi;'

2
tests/js/scripts/run.bat
View File

@@ -8,4 +8,4 @@ REM - NodeJS (http://nodejs.org/)
REM - Testacular (npm install -g testacular)
set BASE_DIR=%~dp0
testacular start "%BASE_DIR%\..\login\config\testacular.conf.js" %*
karma start "%BASE_DIR%\..\login\config\testacular.conf.js" %*

2
tests/js/scripts/run.sh
View File

@@ -6,4 +6,4 @@ echo ""
echo "Starting Testacular Server (http://vojtajina.github.com/testacular)"
echo "-------------------------------------------------------------------"
testacular start $BASE_DIR/../login/config/testacular.conf.js $*
karma start $BASE_DIR/../login/config/testacular.conf.js $*