Merge pull request #1009 from tractorcow/pulls/3.0-travis

Update travis configuration to use composer phpunit
This commit is contained in:
Will Rossiter 2014-07-02 09:31:05 +12:00
commit 405c3d314f
2 changed files with 4 additions and 1 deletions

View File

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

View File

@ -20,6 +20,9 @@
"composer/installers": "*", "composer/installers": "*",
"silverstripe/framework": "3.0.*" "silverstripe/framework": "3.0.*"
}, },
"require-dev": {
"phpunit/PHPUnit": "~3.7"
},
"autoload": { "autoload": {
"classmap": ["tests/behat/"] "classmap": ["tests/behat/"]
} }