Permalink
Browse files

Add composer file for phpunit, track new module changes

  • Loading branch information...
1 parent 42f284e commit 985df659481eedcf534b1b5eb81f04343d2368d5 @zombor zombor committed Oct 23, 2012
Showing with 12 additions and 3 deletions.
  1. +3 −0 .gitignore
  2. +1 −0 .travis.yml
  3. +1 −1 build.xml
  4. +5 −0 composer.json
  5. +1 −1 modules/cache
  6. +1 −1 modules/unittest
View
@@ -8,3 +8,6 @@ coverage
kohana_release
nbproject
build
+composer.lock
+composer.phar
+vendor/*
View
@@ -11,6 +11,7 @@ before_script:
- "pear channel-discover pear.phing.info"
- "pear install phing/phing"
- "phpenv rehash"
+ - "composer install"
script: "phing test"
View
@@ -167,7 +167,7 @@
<!-- Run unit tests -->
<target name="test">
- <exec command="phpunit --bootstrap=modules/unittest/bootstrap_all_modules.php modules/unittest/tests.php" checkreturn="true" passthru="true"/>
+ <exec command="./vendor/phpunit/phpunit/composer/bin/phpunit --bootstrap=modules/unittest/bootstrap_all_modules.php modules/unittest/tests.php" checkreturn="true" passthru="true"/>
</target>
View
@@ -0,0 +1,5 @@
+{
+ "require": {
+ "phpunit/phpunit": "3.7.*"
+ }
+}

0 comments on commit 985df65

Please sign in to comment.