fix test to remove entities beforehand

as we are testing on acceptance, we have the update schema util already working
webforge-labs · Oct 29, 2013 · de3e53c · de3e53c
1 parent 06e1091
commit de3e53c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 18 deletions.
diff --git a/etc/config.php b/etc/config.php
@@ -9,7 +9,7 @@
 
 if (getenv('TRAVIS') === 'true') {
   $conf['db']['default']['user'] = 'root';
-  $conf['db']['default']['database'] = '';
+  $conf['db']['default']['password'] = '';
 }
 
 $conf['db']['tests'] = $conf['db']['default'];

diff --git a/tests/Webforge/Doctrine/ContainerEntitiesTest.php b/tests/Webforge/Doctrine/ContainerEntitiesTest.php
@@ -16,7 +16,15 @@ public function setUp() {
   }
 
   public function testEntityManagerFIndsTheEntyLoadedFromTestFiles() {
-    $this->assertNull($this->em->find('Doctrine\Tests\Models\Company\CompanyCar', 1));
+    $repo = $this->em->getRepository('Doctrine\Tests\Models\Company\CompanyCar');
+
+    foreach ($repo->findAll() as $car) {
+      $this->em->remove($car);
+    }
+    $this->em->flush();
+    $this->em->clear();
+
+    $this->assertNull($repo->find(1));
 
     $car = new CompanyCar('Ford');
     $this->em->persist($car);
@@ -25,7 +33,7 @@ public function testEntityManagerFIndsTheEntyLoadedFromTestFiles() {
 
     $this->assertInstanceOf(
       'Doctrine\Tests\Models\Company\CompanyCar', 
-      $this->em->find('Doctrine\Tests\Models\Company\CompanyCar', 1)
+      $repo->find($car->getId())
     );
   }
 }
diff --git a/tests/Webforge/Doctrine/UtilTest.php b/tests/Webforge/Doctrine/UtilTest.php