Merge pull request #55 from GrahamCampbell/testing

Test Updates
ircmaxell · Mar 21, 2014 · c91b116 · c91b116 · 55silvar · May 12, 2014
2 parents 7642ced + 3cf1d82
commit c91b116
Show file tree

Hide file tree

Showing 3 changed files with 281 additions and 56 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,12 @@ php:
   - hhvm
 
 before_script:
-  - composer install --dev
+  - composer self-update
+  - composer install --no-interaction --prefer-source --dev
 
-script: vendor/bin/phpunit --configuration phpunit.xml.dist
+script: vendor/bin/phpunit --configuration phpunit.xml.dist --colors
+
+matrix:
+  allow_failures:
+    - php: hhvm
+  fast_finish: true
diff --git a/composer.json b/composer.json
@@ -13,9 +13,9 @@
 		}
 	],
     "require-dev": {
-        "phpunit/phpunit": "3.7"
+        "phpunit/phpunit": "4.*"
     },
 	"autoload": {
 		"files": ["lib/password.php"]
 	}
-}
+}