restructure tests, use composer to autoload test requirements

Author: chrisboulton

.travis.yml

@@ -2,3 +2,5 @@ language: php
 php:
   - 5.3
   - 5.4
+before_script:
+  - composer install --dev

phpunit.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
+	bootstrap="test/bootstrap.php"
 	backupStaticAttributes="false"
-	colors="false"
+	colors="true"
 	convertErrorsToExceptions="true"
 	convertNoticesToExceptions="true"
 	convertWarningsToExceptions="true"

test/Resque/Tests/EventTest.php

@@ -1,6 +1,4 @@
 <?php
-require_once dirname(__FILE__) . '/bootstrap.php';
-
 /**
  * Resque_Event tests.
  *

test/Resque/Tests/JobStatusTest.php

@@ -1,6 +1,4 @@
 <?php
-require_once dirname(__FILE__) . '/bootstrap.php';
-
 /**
  * Resque_Job_Status tests.
  *

test/Resque/Tests/JobTest.php

@@ -1,5 +1,4 @@
 <?php
-require_once dirname(__FILE__) . '/bootstrap.php';
 
 /**
  * Resque_Job tests.

test/Resque/Tests/StatTest.php

@@ -1,6 +1,4 @@
 <?php
-require_once dirname(__FILE__) . '/bootstrap.php';
-
 /**
  * Resque_Stat tests.
  *

test/Resque/Tests/WorkerTest.php

@@ -1,6 +1,4 @@
 <?php
-require_once dirname(__FILE__) . '/bootstrap.php';
-
 /**
  * Resque_Worker tests.
  *

test/Resque/Tests/bootstrap.php renamed to test/bootstrap.php

@@ -6,21 +6,12 @@
  * @author		Chris Boulton <[email protected]>
  * @license		http://www.opensource.org/licenses/mit-license.php
  */
-define('CWD', dirname(__FILE__));
-define('RESQUE_LIB', CWD . '/../../../lib/');
 
-define('TEST_MISC', realpath(CWD . '/../../misc/'));
-define('REDIS_CONF', TEST_MISC . '/redis.conf');
-
-// Change to the directory this file lives in. This is important, due to
-// how we'll be running redis.
-
-require_once CWD . '/TestCase.php';
+$loader = require __DIR__ . '/../vendor/autoload.php';
+$loader->add('Resque_Tests', __DIR__);
 
-// Include Resque
-require_once RESQUE_LIB . 'Resque.php';
-require_once RESQUE_LIB . 'Resque/Worker.php';
-require_once RESQUE_LIB . 'Resque/Redis.php';
+define('TEST_MISC', realpath(__DIR__ . '/misc/'));
+define('REDIS_CONF', TEST_MISC . '/redis.conf');
 
 // Attempt to start our own redis instance for tesitng.
 exec('which redis-server', $output, $returnVar);
@@ -61,7 +52,7 @@ function killRedis($pid)
 	if (file_exists($pidFile)) {
 		$pid = trim(file_get_contents($pidFile));
 		posix_kill((int) $pid, 9);
-	
+
 		if(is_file($pidFile)) {
 			unlink($pidFile);
 		}