Browse Source

Fixing whitespace and yet again modifying phpunit's config so that the
test decorator is actually executed

Jose Lorenzo Rodriguez 12 years ago
parent
commit
226d1abce8

+ 1 - 0
Cake/Database/Dialect/PostgresDialectTrait.php

@@ -28,6 +28,7 @@ use Cake\Database\SqlDialectTrait;
 trait PostgresDialectTrait {
 
 	use SqlDialectTrait;
+
 /**
  *  String used to start a database identifier quoting to make it safe
  *

+ 1 - 0
Cake/ORM/Association/BelongsToMany.php

@@ -106,6 +106,7 @@ class BelongsToMany extends Association {
 		if (is_string($table)) {
 			$table = TableRegistry::get($table);
 		}
+
 		if (!$table->association($sAlias)) {
 			$table->belongsTo($sAlias)->target($this->source());
 		}

+ 7 - 3
phpunit.xml.dist

@@ -14,9 +14,13 @@
 
 	<testsuites>
 		<testsuite name="CakePHP Test Suite">
-			<directory>./Cake/Test/TestCase/</directory>
-			<exclude>./Cake/Test/TestCase/Model/</exclude>
-			<file>./Cake/Test/TestCase/DatabaseSuite.php</file>
+			<directory>./Test/TestCase/</directory>
+			<exclude>./Test/TestCase/Model/</exclude>
+			<exclude>./Test/TestCase/Database/</exclude>
+			<exclude>./Test/TestCase/ORM/</exclude>
+		</testsuite>
+		<testsuite name="Database Test Suite">
+			<file>./Test/TestCase/DatabaseSuite.php</file>
 		</testsuite>
 	</testsuites>
 	<listeners>