Fixed tests thanks to travis-ci

jaugustin · Mar 10, 2012 · 091d954 · 091d954
1 parent 71070d7
commit 091d954
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,8 +5,9 @@ php:
     - 5.4
 
 env:
-    - SYMFONY_VERSION=symfony-1.4.15
+    - SYMFONY_VERSION=symfony-1.4.17
 
-before_script: ./prepare_tests.sh
+before_script:
+    - ./prepare_tests.sh
 
 script: php mockproject/plugins/sfPropelORMPlugin/test/bin/prove.php
diff --git a/lib/task/sfPhing.class.php b/lib/task/sfPhing.class.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once('phing/Phing.php');
+require_once 'phing/Phing.php';
 
 /**
  * @package    symfony

diff --git a/test/bootstrap/unit.php b/test/bootstrap/unit.php
@@ -14,9 +14,12 @@
 
 $autoload = sfSimpleAutoload::getInstance(sys_get_temp_dir().DIRECTORY_SEPARATOR.sprintf('sf_autoload_unit_propel_%s.data', md5(__FILE__)));
 $autoload->addDirectory(realpath(dirname(__FILE__).'/../../lib'));
-$autoload->addDirectory(realpath(dirname(__FILE__).'/../../../../lib/vendor/propel'));
+$autoload->addDirectory(realpath(dirname(__FILE__).'/../../lib/vendor/propel'));
+$autoload->addDirectory(realpath(dirname(__FILE__).'/../../lib/vendor/phing/classes'));
 $autoload->register();
 
 $_test_dir = realpath(dirname(__FILE__).'/..');
 
-sfToolkit::addIncludePath(dirname(__FILE__).'/../../../../lib/vendor');
+sfToolkit::addIncludePath(dirname(__FILE__).'/../../lib/vendor');
+sfToolkit::addIncludePath(dirname(__FILE__).'/../../lib/vendor/propel');
+sfToolkit::addIncludePath(dirname(__FILE__).'/../../lib/vendor/phing/classes');