[Content][Core] Behat fixes

Sylius · Aug 9, 2016 · 4ef6552 · 4ef6552
1 parent d3e9b97
commit 4ef6552
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 45 deletions.
diff --git a/src/Sylius/Behat/Page/Shop/Product/ShowPage.php b/src/Sylius/Behat/Page/Shop/Product/ShowPage.php
@@ -96,7 +96,7 @@ public function hasAttributeWithValue($name, $value)
 
         $row = $nameTd->getParent();
 
-        return $value === $row->find('css', 'td.sylius-product-attribute-value')->getText();
+        return $value === trim($row->find('css', 'td.sylius-product-attribute-value')->getText());
     }
 
     /**

diff --git a/src/Sylius/Bundle/ContentBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/ContentBundle/DependencyInjection/Configuration.php
@@ -14,9 +14,6 @@
 use Sylius\Bundle\ContentBundle\Doctrine\ODM\PHPCR\StaticContentRepository;
 use Sylius\Bundle\ContentBundle\Document\ActionBlock;
 use Sylius\Bundle\ContentBundle\Document\ImagineBlock;
-use Sylius\Bundle\ContentBundle\Document\Menu;
-use Sylius\Bundle\ContentBundle\Document\MenuBlock;
-use Sylius\Bundle\ContentBundle\Document\MenuNode;
 use Sylius\Bundle\ContentBundle\Document\RedirectRoute;
 use Sylius\Bundle\ContentBundle\Document\ReferenceBlock;
 use Sylius\Bundle\ContentBundle\Document\Route;
@@ -26,9 +23,6 @@
 use Sylius\Bundle\ContentBundle\Document\StringBlock;
 use Sylius\Bundle\ContentBundle\Form\Type\ActionBlockType;
 use Sylius\Bundle\ContentBundle\Form\Type\ImagineBlockType;
-use Sylius\Bundle\ContentBundle\Form\Type\MenuBlockType;
-use Sylius\Bundle\ContentBundle\Form\Type\MenuNodeType;
-use Sylius\Bundle\ContentBundle\Form\Type\MenuType;
 use Sylius\Bundle\ContentBundle\Form\Type\RedirectRouteType;
 use Sylius\Bundle\ContentBundle\Form\Type\ReferenceBlockType;
 use Sylius\Bundle\ContentBundle\Form\Type\RouteType;

diff --git a/src/Sylius/Bundle/ContentBundle/Form/Type/StaticContentType.php b/src/Sylius/Bundle/ContentBundle/Form/Type/StaticContentType.php
@@ -16,8 +16,6 @@
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * Simple static content type.
- *
  * @author Paweł Jędrzejewski <pawel@sylius.org>
  */
 class StaticContentType extends AbstractResourceType
@@ -51,14 +49,6 @@ public function buildForm(FormBuilderInterface $builder, array $options = [])
                 'label' => 'sylius.form.static_content.routes',
                 'cascade_validation' => true,
              ])
-            ->add('menuNodes', 'collection', [
-                'type' => 'sylius_menu_node',
-                'allow_add' => true,
-                'allow_delete' => true,
-                'by_reference' => false,
-                'label' => 'sylius.form.static_content.menu_nodes',
-                'cascade_validation' => true,
-             ])
             ->add('body', 'textarea', [
                 'required' => false,
                 'label' => 'sylius.form.static_content.body',

diff --git a/src/Sylius/Bundle/ContentBundle/Resources/config/validation.xml b/src/Sylius/Bundle/ContentBundle/Resources/config/validation.xml
@@ -82,33 +82,6 @@
         </property>
     </class>
 
-    <class name="Symfony\Cmf\Bundle\MenuBundle\Doctrine\Phpcr\MenuNode">
-        <property name="name">
-            <constraint name="NotBlank">
-                <option name="message">sylius.menu_node.name.not_blank</option>
-                <option name="groups">sylius</option>
-            </constraint>
-        </property>
-        <property name="label">
-            <constraint name="NotBlank">
-                <option name="message">sylius.menu_node.label.not_blank</option>
-                <option name="groups">sylius</option>
-            </constraint>
-        </property>
-        <property name="publishStartDate">
-            <constraint name="DateTime">
-                <option name="message">sylius.menu_node.start_date.invalid_date</option>
-                <option name="groups">sylius</option>
-            </constraint>
-        </property>
-        <property name="publishEndDate">
-            <constraint name="DateTime">
-                <option name="message">sylius.menu_node.end_date.invalid_date</option>
-                <option name="groups">sylius</option>
-            </constraint>
-        </property>
-    </class>
-
     <class name="Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route">
         <property name="name">
             <constraint name="NotBlank">

diff --git a/src/Sylius/Bundle/ContentBundle/composer.json b/src/Sylius/Bundle/ContentBundle/composer.json
@@ -29,7 +29,6 @@
         "symfony-cmf/content-bundle": "~1.2",
         "symfony-cmf/create-bundle": "~1.2",
         "symfony-cmf/media-bundle": "~1.2",
-        "symfony-cmf/menu-bundle": "~1.2",
         "symfony-cmf/routing-bundle": "~1.2"
     },
     "require-dev": {