Fix tests

Author: wouterj

app/config/config.yml

@@ -22,9 +22,6 @@ framework:
 twig:
     debug:            '%kernel.debug%'
     strict_variables: '%kernel.debug%'
-    form:
-        resources:
-            - 'CmfMediaBundle:Form:fields.html.twig'
     exception_controller: 'FOS\RestBundle\Controller\ExceptionController::showAction'
 
 # Assetic Configuration
@@ -182,8 +179,6 @@ sonata_admin:
                     - cmf_block.container_admin
                     - cmf_block.reference_admin
                     - cmf_block.action_admin
-                    - cmf_block.imagine.slideshow_admin
-                    - cmf_block.imagine.imagine_admin
             routing:
                 label: URLs
                 icon: '<i class="fa fa-link"></i>'
@@ -212,7 +207,6 @@ sonata_doctrine_phpcr_admin:
                 - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ContainerBlock
                 - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ReferenceBlock
                 - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ActionBlock
-                - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SlideshowBlock
                 - Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\RssBlock
         Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ReferenceBlock:
             valid_children: []

app/tests/AdminDashboardTest.php

@@ -43,6 +43,6 @@ public function testContents()
         $this->assertContains('Sonata Admin', $response->getContent());
 
         $this->assertCount(1, $crawler->filter('.container-fluid'));
-        $this->assertCount(12, $crawler->filter('.sonata-ba-list-label'));
+        $this->assertCount(9, $crawler->filter('.sonata-ba-list-label'));
     }
 }

app/tests/AdminTest.php

@@ -37,8 +37,6 @@ class AdminTest extends WebTestCase
         '/cmf/block/actionblock/create',
         '/cmf/block/actionblock/{id}/edit',
         '/cmf/block/actionblock/{id}/delete',
-        '/cmf/block/imagineblock/list',
-        '/cmf/block/imagineblock/create',
         '/cmf/routing/route/list',
         '/cmf/routing/route/create',
         '/cmf/routing/route/{id}/edit',
@@ -55,10 +53,6 @@ class AdminTest extends WebTestCase
         '/cmf/menu/menunode/create',
         '/cmf/menu/menunode/{id}/edit',
         '/cmf/menu/menunode/{id}/delete',
-        '/cmf/simplecms/page/list',
-        '/cmf/simplecms/page/create',
-        '/cmf/simplecms/page/{id}/edit',
-        '/cmf/simplecms/page/{id}/delete',
     );
 
     protected $testedPatterns = array();

app/tests/HomepageTest.php

@@ -36,8 +36,7 @@ public function testContents()
         $this->assertCount(1, $crawler->filter('h1:contains(Homepage)'));
         $this->assertCount(1, $crawler->filter('h2:contains("Welcome to the Symfony CMF Demo")'));
 
-        $menuCount = $this->isSearchSupported() ? 22 : 21;
-        $this->assertCount($menuCount, $crawler->filter('.panel-nav li'));
+        $this->assertCount(23, $crawler->filter('.panel-nav li'));
     }
 
     public function testJsonContents()

app/tests/StaticPageTest.php

@@ -44,7 +44,7 @@ public function contentDataProvider()
             array('/demo/type', 'Controller by type'),
             array('/demo/class', 'Controller by class'),
             array('/hello', 'Hello World!'),
-            array('/about', 'Some information about us'),
+            array('/en/about', 'Some information about us'),
         );
     }
 

app/tests/WebTestCase.php

@@ -32,16 +32,6 @@ public function setUp()
         self::$fixturesLoaded = true;
     }
 
-    protected function isSearchSupported()
-    {
-        return $this->getContainer()
-            ->get('doctrine_phpcr')
-            ->getConnection()
-            ->getRepository()
-            ->getDescriptor(RepositoryInterface::QUERY_FULL_TEXT_SEARCH_SUPPORTED)
-        ;
-    }
-
     protected function createClientAuthenticated(array $options = array(), array $server = array())
     {
         $server = array_merge($server, array(