Adjusting travis config to use composer

carlos-mora · Nov 3, 2012 · 425b67f · 425b67f
1 parent 190d117
commit 425b67f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,4 +2,9 @@ language: php
 php:
   - 5.3
   - 5.4
-script: phpunit tests/MY_Model_test.php
+
+before_script:
+  - curl -s https://getcomposer.org/installer | php
+  - php composer.phar install --dev
+
+script: vendor/bin/phpunit tests/MY_Model_test.php
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
 	"require": {
 		"phpunit/phpunit": "3.7.*",
-		"mockery/mockery": "*"
+		"mockery/mockery": ">=0.7.2"
 	},
 	"autoload": {
 		"classmap": [ "core", "tests/support/models" ]

diff --git a/tests/MY_Model_test.php b/tests/MY_Model_test.php
@@ -512,7 +512,7 @@ protected function _validatable_model($validate_pass_or_fail = TRUE)
         $model->form_validation = m::mock('form validation class');
         $model->form_validation->shouldIgnoreMissing();
         $model->form_validation->shouldReceive('run')
-                                     ->andReturn($validate_pass_or_fail);
+                               ->andReturn($validate_pass_or_fail);
 
         return $model;
     }