diff options
| author | Thomas Steur <thomas.steur@googlemail.com> | 2014-03-31 00:13:53 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-03-31 00:13:53 +0400 |
| commit | 1b7e42b45a1e8c1c7f0b1e4cc86ef1cd4e53f78c (patch) | |
| tree | df16bcbdac3e4b8d7b174507449095b14b26be27 /tests/angularjs | |
| parent | 9164d29b2b2f8e22fb012817dbde9ae58f3447ed (diff) | |
refs #4691 should make sure we have latest node version
Diffstat (limited to 'tests/angularjs')
| -rw-r--r-- | tests/angularjs/.gitignore | 11 | ||||
| -rwxr-xr-x | tests/angularjs/install-ubuntu.sh | 6 | ||||
| -rwxr-xr-x | tests/angularjs/travis.sh | 3 |
3 files changed, 17 insertions, 3 deletions
diff --git a/tests/angularjs/.gitignore b/tests/angularjs/.gitignore index b512c09d47..99eea24927 100644 --- a/tests/angularjs/.gitignore +++ b/tests/angularjs/.gitignore @@ -1 +1,10 @@ -node_modules
\ No newline at end of file +node_modules +npm-debug.log +coverage +.grunt +build/Release +pids +*.pid +*.seed +*.log +logs
\ No newline at end of file diff --git a/tests/angularjs/install-ubuntu.sh b/tests/angularjs/install-ubuntu.sh new file mode 100755 index 0000000000..581cd81e09 --- /dev/null +++ b/tests/angularjs/install-ubuntu.sh @@ -0,0 +1,6 @@ +sudo apt-get install python-software-properties +sudo apt-add-repository ppa:chris-lea/node.js +sudo apt-get update +sudo apt-get install nodejs +sudo apt-get install npm +sudo npm install .
\ No newline at end of file diff --git a/tests/angularjs/travis.sh b/tests/angularjs/travis.sh index bdbb8c4d2e..4909caa517 100755 --- a/tests/angularjs/travis.sh +++ b/tests/angularjs/travis.sh @@ -1,5 +1,4 @@ -sudo apt-get install npm DIR=`dirname $0` cd $DIR -sudo npm install . +./install-ubuntu.sh ./node_modules/karma/bin/karma start --browsers PhantomJS --single-run karma.conf.js
\ No newline at end of file |