Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

use local nodejs for tests #2361

Merged
merged 2 commits into from
May 30, 2016
Merged

use local nodejs for tests #2361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d61a13
use local node for tests
May 30, 2016
a2d21dd
rm jsint test from travis config
May 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ install:
- "PATH=${TRAVIS_BUILD_DIR}/bin:${PATH} ./bin/buildout -c buildout-${BUILDOUT_TARGET}.cfg 2>/dev/null"
script:
- "./bin/ad_check_code -a"
- "./bin/polytester -v pyunit,pyfunc,jsunit,jsint"
- "./bin/polytester -v pyunit,pyfunc,jsunit"
- "PATH=${TRAVIS_BUILD_DIR}/bin:${PATH} ./bin/protractor etc/protractorConfSauce.js"
notifications:
email: false
Expand Down
4 changes: 2 additions & 2 deletions tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ pyunit:
pyfunc:
command: bin/py.test --timeout=60 -q -m"functional and not jasmine" src/adhocracy_*
jsunit:
command: bin/jasmine JASMINE_CONFIG_PATH=etc/jasmine.json
command: bin/node bin/jasmine JASMINE_CONFIG_PATH=etc/jasmine.json
acceptance:
command: bin/protractor etc/protractorConf.js
command: bin/node bin/protractor etc/protractorConf.js