Introduced web test case for redirect

Author: dantleech

.travis.yml

@@ -11,7 +11,6 @@ env:
   - SYMFONY_VERSION=dev-master
 
 before_script:
-  - composer self-update
   - composer require symfony/framework-bundle:${SYMFONY_VERSION} --prefer-source
   - vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
 

Adapter/PhpcrOdmAdapter.php

@@ -99,22 +99,6 @@ public function migrateAutoRouteChildren(AutoRouteInterface $srcAutoRoute, AutoR
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    public function removeDefunctRoute(AutoRouteInterface $autoRoute, $newRoute)
-    {
-        $session = $this->dm->getPhpcrSession();
-        try {
-            $node = $this->dm->getNodeForDocument($autoRoute);
-            $newNode = $this->dm->getNodeForDocument($newRoute);
-        } catch (InvalidItemStateException $e) {
-            // nothing ..
-        }
-
-        $session->save();
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -165,7 +149,6 @@ public function createRedirectRoute(AutoRouteInterface $referringAutoRoute, Auto
     {
         $referringAutoRoute->setRedirectTarget($newRoute);
         $referringAutoRoute->setType(AutoRouteInterface::TYPE_REDIRECT);
-        $this->dm->persist($referringAutoRoute);
     }
 
     /**

Model/AutoRoute.php

@@ -27,7 +27,7 @@ class AutoRoute extends Route implements AutoRouteInterface
     /**
      * @var AutoRouteInterface
      */
-    protected $redirectTarget;
+    protected $redirectRoute;
 
     /**
      * {@inheritDoc}
@@ -50,8 +50,13 @@ public function setType($type)
         $this->setDefault('type', $type);
     }
 
-    public function setRedirectTarget(AutoRouteInterface $redirectTarget)
+    public function setRedirectTarget(AutoRouteInterface $redirectRoute)
     {
-        $this->redirectTarget = $redirectTarget;
+        $this->redirectRoute = $redirectRoute;
+    }
+
+    public function getRedirectTarget()
+    {
+        return $this->redirectRoute;
     }
 }

Resources/config/doctrine-model/AutoRoute.phpcr.xml

@@ -2,7 +2,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
       <document name="Symfony\Cmf\Bundle\RoutingAutoBundle\Model\AutoRoute">
-          <reference-one name="redirectTarget"/>
+          <reference-one name="redirectRoute"/>
       </document>
 
 </doctrine-mapping>

Tests/Functional/EventListener/AutoRouteListenerTest.php

@@ -386,19 +386,16 @@ public function testLeaveRedirect($data, $updatedData, $expectedRedirectRoutePat
     }
 
     /**
-     * depends testLeaveRedirect
+     * @depends testLeaveRedirect
      *
      * See https://github.com/symfony-cmf/RoutingAutoBundle/issues/111
      */
-    public function testLLeaveRedirectAndRenameToOriginal()
+    public function testLeaveRedirectAndRenameToOriginal()
     {
         $article = new SeoArticle;
         $article->title = 'Hai';
         $article->path = '/test/article-1';
         $this->getDm()->persist($article);
-
-        $this->getDm()->persist($article);
-
         $this->getDm()->flush();
 
         $article->title = 'Ho';

Tests/Resources/Controller/TestController.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Resources\Controller;
+
+use Symfony\Cmf\Component\RoutingAuto\Model\AutoRouteInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+
+class TestController extends Controller
+{
+    public function redirectAction(AutoRouteInterface $routeDocument)
+    {
+        $routeTarget = $routeDocument->getRedirectTarget();
+        return $this->redirect($this->get('router')->generate($routeTarget));
+    }
+}

Tests/Resources/app/config/app_config.yml

@@ -6,13 +6,11 @@ cmf_routing:
     dynamic:
         enabled: true
         controllers_by_type:
-            demo_alias: test.controller:aliasAction
-        controllers_by_class:
-            Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute:  cmf_routing.redirect_controller:redirectAction
+            cmf_routing_auto.redirect: Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Resources\Controller\TestController::redirectAction
         persistence:
             phpcr:
                 enabled: true
-                route_basepath: /test/routing
+                route_basepath: /test/auto-route
 
 cmf_routing_auto:
     auto_mapping: false

Tests/Resources/app/config/routing.php

@@ -0,0 +1,7 @@
+<?php
+
+use Symfony\Component\Routing\RouteCollection;
+
+$collection = new RouteCollection();
+
+return $collection;

Tests/WebTest/RedirectTest.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\WebTest;
+
+use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Resources\Document\SeoArticle;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\BaseTestCase;
+
+class RedirectTest extends BaseTestCase
+{
+    public function setUp(array $options = array(), $routebase = null)
+    {
+        parent::setUp($options, $routebase);
+        $this->client = $this->createClient();
+
+        $article = new SeoArticle();
+        $article->title = 'SEO Article';
+        $article->path = '/test/article-1';
+
+        $this->getDm()->persist($article);
+        $this->getDm()->flush();
+    }
+
+    public function testRedirect()
+    {
+        $article = $this->getDm()->find(null, '/test/article-1');
+        $this->assertNotNull($article);
+        $article->title = 'Renamed Article';
+        $this->getDm()->flush();
+
+        $this->client->request('GET', '/seo-articles/seo-article');
+        $resp = $this->client->getResponse();
+        $this->assertEquals(302, $resp->getStatusCode());
+        $this->assertContains('Redirecting to <a href="/seo-articles/renamed-article">/seo-articles/renamed-article</a>', $resp->getContent());
+    }
+}