Fixed some bugs and test locations

wouterj · wouterj · commit b12c704a523b · 2016-12-18T12:46:49.000+01:00
diff --git a/src/Admin/Block/Extension/BlockCacheExtension.php b/src/Admin/Block/Extension/BlockCacheExtension.php
@@ -44,7 +44,7 @@ public function configureFormFields(FormMapper $formMapper)
 
         $formMapper
             ->tab($this->formTab, 'form.tab_general' === $this->formtab
-                ? ['translation_domain' => 'CmfSonataAdminIntegrationBundle'
+                ? ['translation_domain' => 'CmfSonataAdminIntegrationBundle']
                 : []
             )
                 ->with($this->formGroup, 'form.group_metadata' === $this->formGroup
diff --git a/src/DependencyInjection/Factory/BlockAdminFactory.php b/src/DependencyInjection/Factory/BlockAdminFactory.php
@@ -70,7 +70,6 @@ public function create(array $config, ContainerBuilder $container, XmlFileLoader
         $container->setParameter('cmf_sonata_admin_integration.block.extension.block_cache.form_group', $config['extensions']['block_cache']['form_group']);
         $container->setParameter('cmf_sonata_admin_integration.block.extension.block_cache.form_tab', $config['extensions']['block_cache']['form_tab']);
 
-
         $loader->load('block.xml');
 
         $bundles = $container->getParameter('kernel.bundles');
diff --git a/src/DependencyInjection/Factory/CoreAdminFactory.php b/src/DependencyInjection/Factory/CoreAdminFactory.php
@@ -48,7 +48,7 @@ public function addConfiguration(NodeBuilder $builder)
                         ->addDefaultsIfNotSet()
                         ->children()
                             ->scalarNode('form_group')->defaultValue('form.group_publish_workflow')->end()
-                            ->scalarNode('form_tab')->defaultValue('form.group_publish')->end()
+                            ->scalarNode('form_tab')->defaultValue('form.tab_publish')->end()
                         ->end()
                     ->end()
                 ->end()
diff --git a/src/DependencyInjection/Factory/MenuAdminFactory.php b/src/DependencyInjection/Factory/MenuAdminFactory.php
@@ -87,7 +87,7 @@ private function loadExtensions(array $config, ContainerBuilder $container, XmlF
                         throw new InvalidConfigurationException('To use advanced menu options, you need the burgov/key-value-form-bundle in your project.');
                     }
 
-                    $container->setParameter('cmf_sonata_admin_integration.menu.extensions.menu_options.advanced', $config['menu_options']['advanced']);
+                    $container->setParameter('cmf_sonata_admin_integration.menu.extension.menu_options.advanced', $config['menu_options']['advanced']);
 
                     // no break is intended to allow disabling the menu_options extension
                 default:
diff --git a/src/Resources/config/menu.xml b/src/Resources/config/menu.xml
@@ -71,17 +71,17 @@
         <service
                 id="cmf_sonata_admin_integration.menu.extension.menu_node_referrers"
                 class="Symfony\Cmf\Bundle\SonataAdminIntegrationBundle\Admin\Menu\Extension\MenuNodeReferrersExtension">
-            <argument>%cmf_sonata_admin_integration.menu.extensions.menu_node_referrers.form_group%</argument>
-            <argument>%cmf_sonata_admin_integration.menu.extensions.menu_node_referrers.form_tab%</argument>
+            <argument>%cmf_sonata_admin_integration.menu.extension.menu_node_referrers.form_group%</argument>
+            <argument>%cmf_sonata_admin_integration.menu.extension.menu_node_referrers.form_tab%</argument>
             <tag name="sonata.admin.extension"/>
         </service>
 
         <service
                 id="cmf_sonata_admin_integration.menu.extension.menu_options"
                 class="Symfony\Cmf\Bundle\SonataAdminIntegrationBundle\Admin\Menu\Extension\MenuOptionsExtension">
-            <argument>%cmf_sonata_admin_integration.menu.extensions.menu_options.form_group%</argument>
-            <argument>%cmf_sonata_admin_integration.menu.extensions.menu_options.form_tab%</argument>
-            <argument>%cmf_sonata_admin_integration.menu.extensions.menu_options.advanced%</argument>
+            <argument>%cmf_sonata_admin_integration.menu.extension.menu_options.form_group%</argument>
+            <argument>%cmf_sonata_admin_integration.menu.extension.menu_options.form_tab%</argument>
+            <argument>%cmf_sonata_admin_integration.menu.extension.menu_options.advanced%</argument>
             <tag name="sonata.admin.extension"/>
         </service>
 
diff --git a/tests/Resources/Fixtures/config/config.php b/tests/Resources/Fixtures/config/config.php
@@ -17,7 +17,6 @@
         ],
         'core' => [
             'enabled' => true,
-            'form_group' => 'core_form',
         ],
     ],
 ]);
diff --git a/tests/Unit/Admin/Core/Extension/PublishTimePeriodExtensionTest.php b/tests/Unit/Admin/Core/Extension/PublishTimePeriodExtensionTest.php
diff --git a/tests/Unit/Admin/Core/Extension/PublishableExtensionTest.php b/tests/Unit/Admin/Core/Extension/PublishableExtensionTest.php
diff --git a/tests/Unit/DependencyInjection/CmfSonataAdminExtensionTest.php b/tests/Unit/DependencyInjection/CmfSonataAdminExtensionTest.php
@@ -101,17 +101,14 @@ public function testCoreDefaults()
             'bundles' => [
                 'core' => [
                     'enabled' => true,
-                    'form_group' => 'core_form',
                     'extensions' => [
                         'publishable' => ['form_group' => 'publishable_form'],
                         'publish_time' => ['form_group' => 'publish_time_form'],
-                        'translatable' => ['form_group' => 'translatable_form'],
                     ],
                 ],
             ],
         ]);
 
-        $this->assertContainerBuilderHasParameter('cmf_sonata_admin_integration.core.form_group', 'core_form');
         $this->assertContainerBuilderHasParameter(
             'cmf_sonata_admin_integration.core.publishable.form_group',
             'publishable_form'
@@ -120,10 +117,6 @@ public function testCoreDefaults()
             'cmf_sonata_admin_integration.core.publish_time.form_group',
             'publish_time_form'
         );
-        $this->assertContainerBuilderHasParameter(
-            'cmf_sonata_admin_integration.core.translatable.form_group',
-            'translatable_form'
-        );
 
         $this->assertContainerBuilderHasService(
             'cmf_sonata_admin_integration.core.extension.publish_workflow.time_period'
diff --git a/tests/Unit/DependencyInjection/ConfigurationTest.php b/tests/Unit/DependencyInjection/ConfigurationTest.php
@@ -45,14 +45,19 @@ public function testDefaultsForAllConfigFormats()
                 'seo' => [
                     'enabled' => true,
                     'form_group' => 'seo_form',
+                    'form_tab' => 'form.tab_seo',
                 ],
                 'core' => [
                     'enabled' => true,
-                    'form_group' => 'core_form',
                     'extensions' => [
-                        'publishable' => ['form_group' => 'form.group_publish_workflow'],
-                        'publish_time' => ['form_group' => 'form.group_publish_workflow'],
-                        'translatable' => ['form_group' => 'form.group_general'],
+                        'publishable' => [
+                            'form_group' => 'form.group_publish_workflow',
+                            'form_tab' => 'form.tab_publish',
+                        ],
+                        'publish_time' => [
+                            'form_group' => 'form.group_publish_workflow',
+                            'form_tab' => 'form.tab_publish',
+                        ],
                     ],
                 ],
             ],
diff --git a/tests/WebTest/Admin/Core/Extension/CoreAdminExtensionTest.php b/tests/WebTest/Admin/Core/Extension/CoreAdminExtensionTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Cmf\Bundle\SonataAdminIntegrationBundle\Tests\WebTest\Admin\Seo\Extension;
+namespace Symfony\Cmf\Bundle\SonataAdminIntegrationBundle\Tests\WebTest\Admin\Core\Extension;
 
 use Symfony\Cmf\Bundle\SonataAdminIntegrationBundle\Tests\WebTest\Admin\TestCase;
 
@@ -28,22 +28,15 @@ public function setUp()
         $this->client = $this->createClient();
     }
 
-    public function testAdminExtensionExists()
-    {
-        $crawler = $this->client->request('GET', '/admin/cmf/core/extensions/list');
-
-        $this->assertResponseSuccess($this->getClient()->getResponse());
-        $this->assertCount(1, $crawler->filter('html:contains("with-extensions")'));
-    }
-
     public function testItemEditView()
     {
         $crawler = $this->getClient()->request('GET', '/admin/cmf/core/extensions/test/core/with-extensions/edit');
 
         $this->assertResponseSuccess($this->getClient()->getResponse());
 
-        $this->assertCount(1, $crawler->filter('html:contains("FORM_publish")'));
-        $this->assertCount(1, $crawler->filter('html:contains("FORM_publish_time")'));
+        $this->assertCount(1, $crawler->filter('html:contains("Publishable")'));
+        $this->assertCount(1, $crawler->filter('html:contains("Publish from")'));
+        $this->assertCount(1, $crawler->filter('html:contains("Publish until")'));
     }
 
     public function testItemCreate()
@@ -52,7 +45,8 @@ public function testItemCreate()
 
         $this->assertResponseSuccess($this->getClient()->getResponse());
 
-        $this->assertCount(1, $crawler->filter('html:contains("FORM_publish")'));
-        $this->assertCount(1, $crawler->filter('html:contains("FORM_publish_time")'));
+        $this->assertCount(1, $crawler->filter('html:contains("Publishable")'));
+        $this->assertCount(1, $crawler->filter('html:contains("Publish from")'));
+        $this->assertCount(1, $crawler->filter('html:contains("Publish until")'));
     }
 }
diff --git a/tests/WebTest/Admin/Seo/Extension/SeoContentAdminExtensionTest.php b/tests/WebTest/Admin/Seo/Extension/SeoContentAdminExtensionTest.php
@@ -35,7 +35,7 @@ public function testItemEditView()
         $this->assertResponseSuccess($this->getClient()->getResponse());
 
         $this->assertCount(1, $crawler->filter('html:contains("SEO")'));
-        $this->assertCount(1, $crawler->filter('html:contains("Page title")'));
+        $this->assertCount(1, $crawler->filter('html:contains("Title")'));
         $this->assertCount(1, $crawler->filter('html:contains("Original URL")'));
         $this->assertCount(1, $crawler->filter('html:contains("description")'));
         $this->assertCount(1, $crawler->filter('html:contains("keywords")'));
@@ -48,7 +48,7 @@ public function testItemCreate()
         $this->assertResponseSuccess($this->getClient()->getResponse());
 
         $this->assertCount(1, $crawler->filter('html:contains("SEO")'));
-        $this->assertCount(1, $crawler->filter('html:contains("Page title")'));
+        $this->assertCount(1, $crawler->filter('html:contains("Title")'));
         $this->assertCount(1, $crawler->filter('html:contains("Original URL")'));
         $this->assertCount(1, $crawler->filter('html:contains("description")'));
         $this->assertCount(1, $crawler->filter('html:contains("keywords")'));
diff --git a/tests/WebTest/Admin/TestCase.php b/tests/WebTest/Admin/TestCase.php
@@ -24,8 +24,6 @@ public function testAdminDashboard()
         $this->assertResponseSuccess($this->getClient()->getResponse());
     }
 
-    abstract public function testAdminExtensionExists();
-
     abstract public function testItemEditView();
 
     abstract public function testItemCreate();

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function configureFormFields(FormMapper $formMapper)`
`44`	`44`
`45`	`45`	`$formMapper`
`46`	`46`	`->tab($this->formTab, 'form.tab_general' === $this->formtab`
`47`		`- ? ['translation_domain' => 'CmfSonataAdminIntegrationBundle'`
	`47`	`+ ? ['translation_domain' => 'CmfSonataAdminIntegrationBundle']`
`48`	`48`	`: []`
`49`	`49`	`)`
`50`	`50`	`->with($this->formGroup, 'form.group_metadata' === $this->formGroup`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ private function loadExtensions(array $config, ContainerBuilder $container, XmlF`
`87`	`87`	`throw new InvalidConfigurationException('To use advanced menu options, you need the burgov/key-value-form-bundle in your project.');`
`88`	`88`	`}`
`89`	`89`
`90`		`- $container->setParameter('cmf_sonata_admin_integration.menu.extensions.menu_options.advanced', $config['menu_options']['advanced']);`
	`90`	`+ $container->setParameter('cmf_sonata_admin_integration.menu.extension.menu_options.advanced', $config['menu_options']['advanced']);`
`91`	`91`
`92`	`92`	`// no break is intended to allow disabling the menu_options extension`
`93`	`93`	`default:`