Merge pull request #1 from mjrider/master

improve testing and testability
Ariadne-CMS · Jun 23, 2014 · 5a859ab · 5a859ab
2 parents cd178f0 + 1f68706
commit 5a859ab
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ php:
   - 5.4
 
 before_script:
+   - composer --quiet install
    - composer --quiet --working-dir=tests install
 
 script: php ./tests/testall.php

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,12 +1,14 @@
 <?php
 
+	if ( ! defined ('SIMPLETESTDIR' ) ) {
+		define('SIMPLETESTDIR', __DIR__);
+	}
+
 	error_reporting(E_ALL|E_STRICT);
-	include_once( __DIR__ . '/../../../autoload.php'); // arc/arc autoloader
-//	require_once( __DIR__ . '/../autoload.php');
-//	require_once( __DIR__ . '/vendor/autoload.php');	
+	include_once( SIMPLETESTDIR . '/../vendor/autoload.php');
 
-	require_once( __DIR__ . '/vendor/lastcraft/simpletest/autorun.php');
-	require_once( __DIR__ . '/vendor/lastcraft/simpletest/compatibility.php');
-	require_once( __DIR__ . '/vendor/lastcraft/simpletest/browser.php');
-	require_once( __DIR__ . '/vendor/lastcraft/simpletest/web_tester.php');
-	require_once( __DIR__ . '/vendor/lastcraft/simpletest/unit_tester.php');
+	require_once( SIMPLETESTDIR . '/vendor/lastcraft/simpletest/autorun.php');
+	require_once( SIMPLETESTDIR . '/vendor/lastcraft/simpletest/compatibility.php');
+	require_once( SIMPLETESTDIR . '/vendor/lastcraft/simpletest/browser.php');
+	require_once( SIMPLETESTDIR . '/vendor/lastcraft/simpletest/web_tester.php');
+	require_once( SIMPLETESTDIR . '/vendor/lastcraft/simpletest/unit_tester.php');