Test suite cleanups

Maxooo · Oct 29, 2013 · 769b435 · 769b435
1 parent ecc4fb9
commit 769b435
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/Tests/Fixtures/app/AppKernel.php b/Tests/Fixtures/app/AppKernel.php
@@ -11,9 +11,6 @@
 
 namespace Nelmio\ApiDocBundle\Tests\Functional;
 
-// get the autoload file
-require_once __DIR__.'/../../../vendor/autoload.php';
-
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\HttpKernel\Kernel;
 

diff --git a/Tests/WebTestCase.php b/Tests/WebTestCase.php
@@ -66,7 +66,13 @@ protected static function createKernel(array $options = array())
 
     public function setUp()
     {
+        $this->deleteTmpDir();
         parent::setUp();
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
         $this->deleteTmpDir();
     }
 }
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
@@ -16,3 +16,6 @@ function includeIfExists($file)
 if (class_exists('Doctrine\Common\Annotations\AnnotationRegistry')) {
     \Doctrine\Common\Annotations\AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
 }
+
+// force loading the ApiDoc annotation since the composer target-dir autoloader does not run through $loader::loadClass
+class_exists('Nelmio\ApiDocBundle\Annotation\ApiDoc');