Fixed OdmAdapter unit tests

Author: dantleech

Doctrine/Phpcr/AutoRouteListener.php

@@ -26,6 +26,9 @@
  */
 class AutoRouteListener
 {
+    protected $inFlush = false;
+    protected $postFlushDone = false;
+
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
@@ -48,6 +51,10 @@ protected function getMetadataFactory()
 
     public function onFlush(ManagerEventArgs $args)
     {
+        if ($this->inFlush) {
+            return;
+        }
+
         /** @var $dm DocumentManager */
         $dm = $args->getObjectManager();
         $uow = $dm->getUnitOfWork();
@@ -91,11 +98,18 @@ public function onFlush(ManagerEventArgs $args)
         }
     }
 
-    public function postFlush(ManagerEventArgs $args)
+    public function endFlush(ManagerEventArgs $args)
     {
         $dm = $args->getObjectManager();
         $arm = $this->getAutoRouteManager();
         $arm->handleDefunctRoutes();
+
+        if (!$this->postFlushDone) {
+            $this->postFlushDone = true;
+            $dm->flush();
+        }
+
+        $this->postFlushDone = false;
     }
 
     private function isAutoRouteable($document)

Resources/config/auto_route.xml

@@ -59,7 +59,7 @@
         <service id="cmf_routing_auto.phpcrodm_auto_route_listener" class="%cmf_routing_auto.phpcrodm_auto_route_listener.class%">
             <argument type="service" id="service_container"/>
             <tag name="doctrine_phpcr.event_listener" event="onFlush"/>
-            <tag name="doctrine_phpcr.event_listener" event="postFlush"/>
+            <tag name="doctrine_phpcr.event_listener" event="endFlush"/>
         </service>
 
         <!-- Metadata -->

Tests/Spec/Symfony/Cmf/Bundle/RoutingAutoBundle/AutoRoute/DefunctRouteHandler/LeaveRedirectDefunctRouteHandlerSpec.php

@@ -8,6 +8,7 @@
 class PhpcrOdmAdapterTest extends BaseTestCase
 {
     protected $dm;
+    protected $baseRoutePath;
 
     public function setUp()
     {
@@ -18,8 +19,9 @@ public function setUp()
         $this->metadata = $this->prophet->prophesize('Doctrine\ODM\PHPCR\Mapping\ClassMetadata');
         $this->contentDocument = new \stdClass;
         $this->contentDocument2 = new \stdClass;
+        $this->baseNode = new \stdClass;
         $this->parentRoute = new \stdClass;
-        $this->route = $this->prophet->prophesize('Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route');
+        $this->route = $this->prophet->prophesize('Symfony\Cmf\Bundle\RoutingAutoBundle\Model\AutoRouteInterface');
 
         $this->phpcrSession = $this->prophet->prophesize('PHPCR\SessionInterface');
         $this->phpcrRootNode = $this->prophet->prophesize('PHPCR\NodeInterface');
@@ -84,17 +86,19 @@ public function testTranslateObject($className, $id, $locale)
     public function provideCreateRoute()
     {
         return array(
-            array('/foo/bar', '/foo', 'bar', true)
+            array('/foo/bar', '/test/foo', 'bar', true)
         );
     }
 
     /**
      * @dataProvider provideCreateRoute
      */
-    public function testCreateRoute($path, $expectedParentPath, $expectedName, $parentPathExists)
+    public function testCreateAutoRoute($path, $expectedParentPath, $expectedName, $parentPathExists)
     {
         $this->dm->getPhpcrSession()->willReturn($this->phpcrSession);
         $this->phpcrSession->getRootNode()->willReturn($this->phpcrRootNode);
+        $this->dm->find(null, $this->baseRoutePath)->willReturn($this->baseNode);
+
         if ($parentPathExists) {
             $this->dm->find(null, $expectedParentPath)
                 ->willReturn($this->parentRoute);
@@ -107,6 +111,7 @@ public function testCreateRoute($path, $expectedParentPath, $expectedName, $pare
         $this->assertNotNull($res);
         $this->assertInstanceOf('Symfony\Cmf\Bundle\RoutingAutoBundle\Model\AutoRoute', $res);
         $this->assertEquals($expectedName, $res->getName());
+
         $this->assertSame($this->parentRoute, $res->getParent());
         $this->assertSame($this->contentDocument, $res->getContent());
     }
@@ -138,7 +143,7 @@ public function testCompareRouteContent($isMatch)
 
     public function testGetReferringRoutes()
     {
-        $this->dm->getReferrers($this->contentDocument, null, null, null, 'Symfony\Cmf\Component\Routing\RouteObjectInterface')
+        $this->dm->getReferrers($this->contentDocument, null, null, null, 'Symfony\Cmf\Bundle\RoutingAutoBundle\Model\AutoRouteInterface')
             ->willReturn(array($this->route));
         $res = $this->adapter->getReferringAutoRoutes($this->contentDocument);