Merge remote-tracking branch 'origin/MAGETWO-70779-Category-URL-Rewrite' into Okapis-PR

Author: pdohogne-magento

app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php

@@ -161,7 +161,8 @@ protected function _getNodesArray($node)
             'parent_id' => (int)$node->getParentId(),
             'children_count' => (int)$node->getChildrenCount(),
             'is_active' => (bool)$node->getIsActive(),
-            'name' => $node->getName(),
+            // Scrub names for raw js output
+            'name' => $this->escapeHtml($node->getName()),
             'level' => (int)$node->getLevel(),
             'product_count' => (int)$node->getProductCount(),
         ];

dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml

@@ -45,6 +45,16 @@
             <field name="include_in_menu" xsi:type="string">Yes</field>
         </dataset>
 
+        <dataset name="default_subcategory_with_single_quote_in_name">
+            <field name="name" xsi:type="string">DefaultSubcategory\'%isolation%</field>
+            <field name="url_key" xsi:type="string">default-subcategory-%isolation%</field>
+            <field name="parent_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">default_category</item>
+            </field>
+            <field name="is_active" xsi:type="string">Yes</field>
+            <field name="include_in_menu" xsi:type="string">Yes</field>
+        </dataset>
+
         <dataset name="default_subcategory_without_url_key">
             <field name="name" xsi:type="string">DefaultSubcategory%isolation%</field>
             <field name="parent_id" xsi:type="array">

dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Category/Tree.php

@@ -32,7 +32,7 @@ public function selectCategory($category)
     {
         if ($category != null && $category->hasData('name')) {
             $this->_rootElement->find(
-                "//a[contains(text(),'{$category->getName()}')]",
+                "//a[contains(text(),\"{$category->getName()}\")]",
                 Locator::SELECTOR_XPATH
             )->click();
         } else {

dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.php

@@ -68,7 +68,7 @@ public function __inject(
         $this->urlRewriteIndex = $urlRewriteIndex;
         $category = $fixtureFactory->createByCode(
             'category',
-            ['dataset' => 'default_subcategory']
+            ['dataset' => 'default_subcategory_with_single_quote_in_name']
         );
         $category->persist();
         return ['category' => $category];
@@ -87,6 +87,7 @@ public function test(UrlRewrite $urlRewrite, Category $category)
         $this->urlRewriteIndex->open();
         $this->urlRewriteIndex->getPageActionsBlock()->addNew();
         $this->urlRewriteEdit->getFormBlock()->fill($urlRewrite);
+
         $this->urlRewriteEdit->getTreeBlock()->selectCategory($category);
         $this->urlRewriteEdit->getFormBlock()->fill($urlRewrite);
         $this->urlRewriteEdit->getPageMainActions()->save();

dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_apostrophe.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var $category \Magento\Catalog\Model\Category */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$categoryFirst = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$categoryFirst->setName('Category 1')
+    ->setPath('1/2')
+    ->setLevel(2)
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setPosition(1)
+    ->save();
+
+// products from this fixture were moved to indexer_catalog_products.php
+$categorySecond = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$categorySecond->setName('\'Category 6\'')
+    ->setPath($categoryFirst->getPath())
+    ->setLevel(3)
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setPosition(1)
+    ->save();

dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_apostrophe_rollback.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
+$collection = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Category\Collection::class);
+$collection
+    ->addAttributeToFilter('level', 2)
+    ->load()
+    ->delete();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/TreeTest.php

@@ -45,6 +45,20 @@ public function testGetTreeArray()
         $this->assertCount(1, $tree['children']);
     }
 
+    /**
+     * Test that the getTreeArray() method scrubs single quotes and apostrophes from names
+     *
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Catalog/_files/catalog_category_with_apostrophe.php
+     */
+    public function testGetTreeArrayApostropheReplaced()
+    {
+        $tree = $this->_treeBlock->getTreeArray();
+
+        $this->assertNotContains('\'', $tree['children'][0]['children'][0]['children'][0]['name']);
+        $this->assertEquals(''Category 6'', $tree['children'][0]['children'][0]['children'][0]['name']);
+    }
+
     /**
      * Test prepare grid
      */