All tests pass

Author: dantleech

AutoRoute/AutoRouteMaker.php

@@ -19,13 +19,14 @@ public function __construct(DocumentManager $dm)
 
     public function createOrUpdateAutoRoute(AutoRouteStack $autoRouteStack)
     {
-        $content = $autoRouteStack->getContext()->getContent();
+        $context = $autoRouteStack->getContext();
+        $content = $context->getContent();
 
         $autoRoute = $this->getAutoRouteForDocument($content);
 
         if (null === $autoRoute) {
             $autoRoute = new AutoRoute;
-            $autoRoute->setParent($autoRouteStack->getContext()->getTopRoute());
+            $autoRoute->setParent($context->getTopRoute());
             $autoRoute->setRouteContent($content);
         }
 

AutoRoute/RouteStack/Builder.php

@@ -33,7 +33,7 @@ public function build(RouteStack $routeStack, BuilderUnitInterface $rsbu)
             $rsbu->notExistsAction($routeStack);
         }
 
-        // hmm ...
+        // hmm ... this seems wierd. Needs some refactoring.
         $routeStack->close();
         $routeStack->getContext()->commitRouteStack();
     }

Tests/AutoRoute/AutoRouteMakerTest.php

@@ -47,7 +47,7 @@ public function setUp()
 
     protected function setupDocumentPersisted($isPersisted)
     {
-        $this->dm->expects($this->once())
+        $this->dm->expects($this->any())
             ->method('getClassMetadata')
             ->will($this->returnValue($this->metadata));
         $this->dm->expects($this->once())
@@ -93,10 +93,6 @@ public function testCreateOrUpdateAutoRouteForNew()
         $this->setupDocumentPersisted(false);
 
         $testCase = $this;
-        $this->dm->expects($this->once())
-            ->method('getReferrers')
-            ->will($this->returnValue(new ArrayCollection(array(
-            ))));
 
         $this->autoRouteStack->expects($this->once())
             ->method('getContext')

Tests/AutoRoute/FactoryTest.php

@@ -79,10 +79,10 @@ public function provideTestGetChain()
                             'name' => 'fixed',
                             'message' => 'barfoo'
                         ),
-                        'exists' => array(
+                        'exists_action' => array(
                             'strategy' => 'create'
                         ),
-                        'not_exists' => array(
+                        'not_exists_action' => array(
                             'strategy' => 'throw_excep',
                         ),
                     ),

Tests/AutoRoute/PathExists/AutoIncrementPathTest.php

@@ -48,7 +48,6 @@ public function testAutoIncrement()
             ->with($this->routeStack);
 
         $this->aiPath->execute($this->routeStack);
-
     }
 
 }

Tests/AutoRoute/PathExists/UsePathTest.php

@@ -20,11 +20,13 @@ public function setUp()
         $this->routeObject = new \stdClass;
     }
 
-    public function testAutoIncrement()
+    public function testUse()
     {
         $this->routeStack->expects($this->once())
-            ->method('getFullPath')
-            ->will($this->returnValue('foobar'));
+            ->method('getFullPaths')
+            ->will($this->returnValue(array(
+                'foobar'
+            )));
 
         $this->routeStack->expects($this->once())
             ->method('addRoute')

Tests/AutoRoute/PathProvider/FromObjectMethodProviderTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\AutoRoute;
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\AutoRoute\PathProvider;
 
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathExists\PathProvider;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathProvider\FromObjectMethodProvider;
@@ -9,14 +9,18 @@ class FromObjectMethodProviderTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        $this->provider = new FromObjectMethodProvider;
         $this->builderContext = $this->getMock(
             'Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\BuilderContext'
         );
         $this->routeStack = $this->getMockBuilder(
             'Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteStack'
         )->disableOriginalConstructor()->getMock();
-        $this->object = new FromObjectMethodTestClass;
+        $this->slugifier = $this->getMock(
+            'Symfony\Cmf\Bundle\CoreBundle\Slugifier\SlugifierInterface'
+        );
+
+        $this->provider = new FromObjectMethodProvider($this->slugifier);
+        $this->object = new FromObjectMethodTestClass();
     }
 
     /**
@@ -42,35 +46,60 @@ public function testProvideMethod_invalidMethod()
         $this->provider->providePath($this->routeStack);
     }
 
-    public function testProvideMethod()
+    public function setupTest($slugify = true)
     {
-        $this->routeStack->expects($this->once())
-            ->method('addPathElements')
-            ->with(array('this', 'is', 'path'));
         $this->routeStack->expects($this->once())
             ->method('getContext')
             ->will($this->returnValue($this->builderContext));
         $this->builderContext->expects($this->once())
             ->method('getContent')
             ->will($this->returnValue($this->object));
 
+        if ($slugify) {
+            $this->slugifier->expects($this->any())
+                ->method('slugify')
+                ->will($this->returnCallback(function ($el) { return $el; }));
+        }
+    }
+
+    public function testProvideMethod()
+    {
+        $this->setupTest();
+        $this->routeStack->expects($this->once())
+            ->method('addPathElements')
+            ->with(array('this', 'is', 'path'));
+
         $this->provider->init(array('method' => 'getSlug'));
         $this->provider->providePath($this->routeStack);
     }
 
+    public function testProvideMethodNoSlugify()
+    {
+        $this->setupTest(false);
+        $this->routeStack->expects($this->once())
+            ->method('addPathElements')
+            ->with(array('this', 'is', 'path'));
+
+        $this->provider->init(array('method' => 'getSlug', 'slugify' => false));
+        $this->provider->providePath($this->routeStack);
+    }
+
+    public function testProvideMethodWithString()
+    {
+        $this->setupTest();
+
+        $this->provider->init(array('method' => 'getStringSlug'));
+        $this->provider->providePath($this->routeStack);
+    }
+
     /**
      * @expectedException \RuntimeException
      */
-    public function testProvideMethodWithInvalidReturnValue()
+    public function testProvideMethodWithAbsolute()
     {
-        $this->routeStack->expects($this->once())
-            ->method('getContext')
-            ->will($this->returnValue($this->builderContext));
-        $this->builderContext->expects($this->once())
-            ->method('getContent')
-            ->will($this->returnValue($this->object));
+        $this->setupTest();
 
-        $this->provider->init(array('method' => 'getBadSlug'));
+        $this->provider->init(array('method' => 'getAbsoluteSlug'));
         $this->provider->providePath($this->routeStack);
     }
 }
@@ -82,8 +111,14 @@ public function getSlug()
         return array('this', 'is', 'path');
     }
 
-    public function getBadSlug()
+    public function getStringSlug()
     {
         return 'this/is/a/path';
     }
+
+    public function getAbsoluteSlug()
+    {
+        return '/this/is/absolute';
+    }
+
 }

Tests/AutoRoute/RouteStack/BuilderTest.php

@@ -32,7 +32,7 @@ public function testNotExists()
             ->with($this->routeStack);
         $this->routeStack->expects($this->once())
             ->method('getFullPath')
-            ->will($this->returnValue('/test/path'));
+            ->will($this->returnValue('test/path'));
 
         $this->phpcrSession->expects($this->once())
             ->method('nodeExists')
@@ -42,6 +42,10 @@ public function testNotExists()
         $this->routeStackBuilderUnit->expects($this->once())
             ->method('notExistsAction')
             ->with($this->routeStack);
+
+        $this->routeStack->expects($this->once())
+            ->method('getContext')
+            ->will($this->returnValue($this->builderContext));
 
         $this->routeStack->expects($this->once())
             ->method('close');
@@ -57,7 +61,11 @@ public function testExists()
 
         $this->routeStack->expects($this->once())
             ->method('getFullPath')
-            ->will($this->returnValue('/test/path'));
+            ->will($this->returnValue('test/path'));
+
+        $this->routeStack->expects($this->once())
+            ->method('getContext')
+            ->will($this->returnValue($this->builderContext));
 
         $this->routeStackBuilderUnit->expects($this->exactly(1))
             ->method('existsAction')