fixed tests to run in the new directory structure

Ariadne-CMS · Jun 21, 2014 · 0762418 · 0762418
1 parent 0780b74
commit 0762418
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,6 +1,7 @@
 <?php
 
 	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');	
 

diff --git a/tests/test.hash.php b/tests/test.hash.php
@@ -10,7 +10,7 @@
 	 * file that was distributed with this source code.
 	 */
 
-	require_once( __DIR__ . 'bootstrap.php' );
+	require_once( __DIR__ . DIRECTORY_SEPARATOR . 'bootstrap.php' );
 
 	class TestHash extends UnitTestCase {
 

diff --git a/tests/test.lambda.php b/tests/test.lambda.php
@@ -9,7 +9,7 @@
      * file that was distributed with this source code.
      */
 
-    require_once( __DIR__.'bootstrap.php' );
+    require_once( __DIR__ . DIRECTORY_SEPARATOR . 'bootstrap.php' );
 
     class TestLambda extends UnitTestCase {
 

diff --git a/tests/test.path.php b/tests/test.path.php
@@ -9,7 +9,7 @@
 	 * file that was distributed with this source code.
 	 */
 
-	require_once( __DIR__ . 'bootstrap.php' );
+	require_once( __DIR__ . DIRECTORY_SEPARATOR . 'bootstrap.php' );
 
 	class TestPath extends UnitTestCase {
 

diff --git a/tests/test.template.php b/tests/test.template.php
@@ -9,7 +9,7 @@
 	 * file that was distributed with this source code.
 	 */
 
-	require_once( __DIR__.'bootstrap.php' );
+	require_once( __DIR__ . DIRECTORY_SEPARATOR .'bootstrap.php' );
 
 	class TestTemplate extends UnitTestCase {
 

diff --git a/tests/test.tree.php b/tests/test.tree.php
@@ -9,7 +9,7 @@
 	 * file that was distributed with this source code.
 	 */
 
-	require_once( __DIR__ . 'bootstrap.php' );
+	require_once( __DIR__ . DIRECTORY_SEPARATOR . 'bootstrap.php' );
 
 	class TestTree extends UnitTestCase {
 

diff --git a/tests/testall.php b/tests/testall.php
@@ -3,7 +3,7 @@
 
 	$files = scandir( __DIR__ );
 	foreach ( $files as $file ) {
-		if( is_file( __DIR__ . $file ) && preg_match( '/\btest\..*\.php/', basename( __DIR__ .  $file ) ) ) {
-			include( __DIR__ . $file );
+		if ( is_file( __DIR__ . DIRECTORY_SEPARATOR . $file ) && preg_match( '/^test\..*\.php$/i', $file ) ) {
+			include( __DIR__ . DIRECTORY_SEPARATOR . $file );
 		}
 	}