Reflected Testing changes

Author: wouterj

.travis.yml

@@ -13,7 +13,7 @@ env:
 before_script:
   - composer self-update
   - composer require symfony/symfony:${SYMFONY_VERSION} --prefer-source
-  - vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
+  - vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_orm_dbal.sh
 
 script: phpunit --coverage-text
 

Tests/Functional/Admin/RouteAdminTest.php

@@ -22,7 +22,7 @@ class RouteAdminTest extends BaseTestCase
      */
     private $errorElement;
 
-    protected function setUp()
+    public function setUp()
     {
         parent::setUp();
         $this->db('PHPCR')->createTestNode();

Tests/Functional/Routing/DynamicRouterTest.php

@@ -30,6 +30,7 @@ class DynamicRouterTest extends BaseTestCase
     public function setUp()
     {
         parent::setUp();
+
         $this->db('PHPCR')->createTestNode();
         $this->createRoute(self::ROUTE_ROOT);
 

Tests/Resources/app/AppKernel.php

@@ -20,6 +20,6 @@ public function configure()
 
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load(__DIR__.'/config/config.php');
+        $loader->load(__DIR__.'/config/config_'.$this->environment.'.php');
     }
 }

Tests/Resources/app/config/cmf_routing.phpcr.yml

@@ -0,0 +1,6 @@
+cmf_routing:
+    dynamic:
+        persistence:
+            phpcr:
+                enabled: true
+                route_basepath: /test/routing

Tests/Resources/app/config/cmf_routing.yml

@@ -12,10 +12,6 @@ cmf_routing:
             Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute:  cmf_routing.redirect_controller:redirectAction
         templates_by_class:
             Symfony\Cmf\Component\Testing\Document\Content: TestBundle:Content:index.html.twig
-        persistence:
-            phpcr:
-                enabled: true
-                route_basepath: /test/routing
         locales:
             - en
             - de

Tests/Resources/app/config/config.php renamed to Tests/Resources/app/config/config_phpcr.php

@@ -4,3 +4,4 @@
 $loader->import(CMF_TEST_CONFIG_DIR.'/phpcr_odm.php');
 $loader->import(CMF_TEST_CONFIG_DIR.'/sonata_admin.php');
 $loader->import(__DIR__.'/cmf_routing.yml');
+$loader->import(__DIR__.'/cmf_routing.phpcr.yml');