finish stuff

symfony-cmf · Dec 13, 2014 · 3d56fbf · 3d56fbf
1 parent f73646b
commit 3d56fbf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/Resources/views/Sitemap/index.xml.twig b/Resources/views/Sitemap/index.xml.twig
@@ -5,8 +5,8 @@
             <loc>{{ url.loc }}</loc>
             <lastmod>{{ url.lastmod }}</lastmod>
             <changefreq>{{ url.changeFreq }}</changefreq>
-            {% if alternateLoace is defined %}
-                {% for locale in alternateLocales %}
+            {% if url.alternateLocales is defined and url.alternateLocales|length > 0 %}
+                {% for locale in url.alternateLocales %}
                     <xhtml:link rel="alternate" hreflang="{{ locale.hrefLocale }}" href="{{ locale.href }}"/>
                 {% endfor %}
             {% endif %}

diff --git a/...map/SitemapUrlInformationProviderTest.php → ...pcr/SitemapUrlInformationProviderTest.php b/...map/SitemapUrlInformationProviderTest.php → ...pcr/SitemapUrlInformationProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\SeoBundle\Tests\Functional\Sitemap;
+namespace Symfony\Cmf\Bundle\SeoBundle\Tests\Functional\Doctrine\Phpcr;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ODM\PHPCR\DocumentManager;

diff --git a/Tests/Unit/Controller/SitemapControllerTest.php b/Tests/Unit/Controller/SitemapControllerTest.php
@@ -82,13 +82,13 @@ public function testRequestXml()
 
     public function testRequestHtml()
     {
-        $response = new Response('some-html-string');
-        $this->templating->expects($this->once())->method('render')->will($this->returnValue($response));
+        $expectedResponse = new Response('some-html-string');
+        $this->templating->expects($this->once())->method('render')->will($this->returnValue($expectedResponse));
 
         /** @var Response $response */
         $response = $this->controller->indexAction('html');
 
-        $this->assertEquals(new Response('some-html-string'), $response->getContent());
+        $this->assertEquals($expectedResponse, $response->getContent());
     }
 
     private function createRoutes()

diff --git a/Tests/WebTest/SitemapTest.php b/Tests/WebTest/SitemapTest.php
@@ -65,6 +65,7 @@ public function getContent($format)
                             <loc>http://localhost/sitemap-aware</loc>
                             <lastmod/>
                             <changefreq>always</changefreq>
+                            <xhtml:link href="http://localhost/sitemap-aware?_locale=de" hreflang="de" rel="alternate"/>
                           </url>
                           <url>
                             <loc>http://localhost/sitemap-aware-publish</loc>