Merge pull request #1012 from silverstripe/pulls/2.4-travis

Update travis configuration to use composer phpunit
This commit is contained in:
Ingo Schommer 2014-05-05 22:49:00 +12:00
commit 00a791666d
2 changed files with 4 additions and 1 deletions

View File

@ -12,7 +12,7 @@ before_script:
- cd ~/builds/ss
script:
- phpunit cms/tests
- vendor/bin/phpunit cms/tests
branches:
except:

View File

@ -19,5 +19,8 @@
"php": ">=5.2.4",
"composer/installers": "*",
"silverstripe/framework": "2.4.*"
},
"require-dev": {
"phpunit/PHPUnit": "~3.7"
}
}