Merge branch 'MAGETWO-60055' into 2.0-develop-pr2

Author: zakdma

app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php

@@ -11,6 +11,7 @@
 use Magento\Framework\Event\Observer;
 use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Store\Model\Store;
 
 class CategoryUrlPathAutogeneratorObserver implements ObserverInterface
@@ -42,13 +43,22 @@ public function __construct(
     /**
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
+     * @throws LocalizedException
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
         /** @var Category $category */
         $category = $observer->getEvent()->getCategory();
         if ($category->getUrlKey() !== false) {
-            $category->setUrlKey($this->categoryUrlPathGenerator->getUrlKey($category))
+
+            /** @var string $resultUrlKey */
+            $resultUrlKey = $this->categoryUrlPathGenerator->getUrlKey($category);
+
+            if (empty($resultUrlKey)) {
+                throw new LocalizedException(__('Invalid URL key'));
+            }
+
+            $category->setUrlKey($resultUrlKey)
                 ->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
             if (!$category->isObjectNew()) {
                 $category->getResource()->saveAttribute($category, 'url_path');

dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Category/ProductTest.php

@@ -41,6 +41,7 @@ protected function setUp()
     }
 
     /**
+     * @magentoAppArea adminhtml
      * @magentoDataFixture Magento/Catalog/_files/indexer_catalog_category.php
      * @magentoDbIsolation enabled
      */
@@ -214,7 +215,7 @@ protected function getCategories($count)
             'Magento\Catalog\Model\Category'
         );
 
-        $result = $category->getCollection()->getItems();
+        $result = $category->getCollection()->addAttributeToSelect('name')->getItems();
         $result = array_slice($result, 2);
 
         return array_slice($result, 0, $count);

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php

@@ -25,13 +25,6 @@ protected function setUp()
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
     }
 
-    public function tearDown()
-    {
-        $category = $this->objectManager->create('Magento\Catalog\Model\Category');
-        $category->load(3);
-        $category->delete();
-    }
-
     /**
      * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories.php
      * @magentoDbIsolation enabled
@@ -96,6 +89,40 @@ public function testGenerateUrlRewritesWithSaveHistory()
         $this->assertResults($categoryExpectedResult, $actualResults);
     }
 
+    /**
+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories.php
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @param string $urlKey
+     * @dataProvider incorrectUrlRewritesDataProvider
+     */
+    public function testGenerateUrlRewritesWithIncorrectUrlKey($urlKey)
+    {
+        $this->setExpectedException(
+            \Magento\Framework\Exception\LocalizedException::class,
+            'Invalid URL key'
+        );
+
+        /** @var \Magento\Catalog\Api\CategoryRepositoryInterface $repository */
+        $repository = $this->objectManager->get(\Magento\Catalog\Api\CategoryRepositoryInterface::class);
+
+        $category = $repository->get(3);
+        $category->setUrlKey($urlKey);
+
+        $repository->save($category);
+    }
+
+    /**
+     * @return array
+     */
+    public function incorrectUrlRewritesDataProvider()
+    {
+        return [
+            ['#'],
+            ['//']
+        ];
+    }
+
     /**
      * @param array $filter
      * @return array