Integrated icecave/testing (fixes #1)

icecave · Jan 14, 2013 · a1cd26b · a1cd26b
1 parent 9a78b2b
commit a1cd26b
Show file tree

Hide file tree

Showing 7 changed files with 240 additions and 92 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,6 +1,4 @@
 .gitattributes export-ignore
 .gitignore export-ignore
 .travis.yml export-ignore
-phpunit.xml export-ignore
-phpunit.reports.xml export-ignore
 test export-ignore
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: php
 before_script:
     - composer install --dev
-script: phpunit
+script: ./vendor/bin/phpunit
 php:
     - 5.3.3
     - 5.3

diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         "php": ">=5.3.0"
     },
     "require-dev": {
-        "phake/phake": "1.*"
+        "icecave/testing": "1.*"
     },
     "autoload": {
         "psr-0": {

diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.reports.xml b/phpunit.reports.xml
diff --git a/phpunit.xml b/phpunit.xml
diff --git a/test/bootstrap.php b/test/bootstrap.php