MC-22031: Admin: Product URL Management

Author: ysapiga

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

@@ -11,7 +11,7 @@
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Model\CategoryFactory;
-use Magento\Catalog\Model\ResourceModel\CategoryFactory as CategoryResourceFactory;
+use Magento\Catalog\Model\ResourceModel\Category as CategoryResource;
 use Magento\CatalogUrlRewrite\Model\Map\DataCategoryUrlRewriteDatabaseMap;
 use Magento\CatalogUrlRewrite\Model\Map\DataProductUrlRewriteDatabaseMap;
 use Magento\CatalogUrlRewrite\Model\ResourceModel\Category\Product;
@@ -32,8 +32,8 @@ class CategoryUrlRewriteTest extends AbstractUrlRewriteTest
     /** @var CategoryRepositoryInterface */
     private $categoryRepository;
 
-    /** @var CategoryResourceFactory */
-    private $categoryResourceFactory;
+    /** @var CategoryResource */
+    private $categoryResource;
 
     /** @var CategoryLinkManagementInterface */
     private $categoryLinkManagement;
@@ -52,7 +52,7 @@ protected function setUp()
         parent::setUp();
 
         $this->categoryRepository = $this->objectManager->create(CategoryRepositoryInterface::class);
-        $this->categoryResourceFactory = $this->objectManager->get(CategoryResourceFactory::class);
+        $this->categoryResource = $this->objectManager->get(CategoryResource::class);
         $this->categoryLinkManagement = $this->objectManager->create(CategoryLinkManagementInterface::class);
         $this->categoryFactory = $this->objectManager->get(CategoryFactory::class);
         $this->suffix = $this->config->getValue(
@@ -69,7 +69,7 @@ protected function setUp()
      */
     public function testUrlRewriteOnCategorySave(array $data): void
     {
-        $categoryModel = $this->resourceSaveCategoryWithData($data['data']);
+        $categoryModel = $this->saveCategory($data['data']);
         $this->assertNotNull($categoryModel->getId(), 'The category was not created');
         $urlRewriteCollection = $this->getEntityRewriteCollection($categoryModel->getId());
         $this->assertRewrites(
@@ -174,7 +174,7 @@ public function testUrlRewriteOnCategorySaveWithExistingUrlKey(array $data): voi
     {
         $this->expectException(UrlAlreadyExistsException::class);
         $this->expectExceptionMessage((string)__('URL key for specified store already exists.'));
-        $this->resourceSaveCategoryWithData($data);
+        $this->saveCategory($data);
     }
 
     /**
@@ -339,7 +339,7 @@ public function testCategoryUrlRewritePerStoreViews(): void
         $categoryId = 333;
         $category = $this->categoryRepository->get($categoryId);
         $urlKeyFirstStore = $category->getUrlKey();
-        $this->resourceSaveCategoryWithData(
+        $this->saveCategory(
             ['store_id' => $secondStoreId, 'url_key' => $urlKeySecondStore],
             $category
         );
@@ -383,12 +383,11 @@ protected function getEntityFactory()
      * @param CategoryInterface|null $category
      * @return CategoryInterface
      */
-    private function resourceSaveCategoryWithData(array $data, $category = null): CategoryInterface
+    private function saveCategory(array $data, $category = null): CategoryInterface
     {
         $category = $category ?: $this->categoryFactory->create();
         $category->addData($data);
-        $categoryResource = $this->categoryResourceFactory->create();
-        $categoryResource->save($category);
+        $this->categoryResource->save($category);
 
         return $category;
     }
@@ -405,7 +404,7 @@ private function getCategoryProductRewriteCollection($categoryId): UrlRewriteCol
         $productRewriteCollection = $this->urlRewriteCollectionFactory->create();
         $productRewriteCollection
             ->join(
-                ['p' => Product::TABLE_NAME],
+                ['p' => $this->categoryResource->getTable(Product::TABLE_NAME)],
                 'main_table.url_rewrite_id = p.url_rewrite_id',
                 'category_id'
             )

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

@@ -12,7 +12,7 @@
 use Magento\Catalog\Model\Product\Type;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ProductFactory;
-use Magento\Catalog\Model\ResourceModel\ProductFactory as ProductResourceFactory;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
 use Magento\CatalogUrlRewrite\Model\Map\DataProductUrlRewriteDatabaseMap;
 use Magento\Store\Model\ScopeInterface;
 use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
@@ -32,8 +32,8 @@ class ProductUrlRewriteTest extends AbstractUrlRewriteTest
     /** @var string */
     private $suffix;
 
-    /** @var ProductResourceFactory */
-    private $productResourceFactory;
+    /** @var ProductResource */
+    private $productResource;
 
     /** @var ProductRepositoryInterface */
     private $productRepository;
@@ -45,7 +45,7 @@ protected function setUp()
     {
         parent::setUp();
 
-        $this->productResourceFactory = $this->objectManager->create(ProductResourceFactory::class);
+        $this->productResource = $this->objectManager->create(ProductResource::class);
         $this->productFactory = $this->objectManager->get(ProductFactory::class);
         $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
         $this->suffix = $this->config->getValue(
@@ -61,7 +61,7 @@ protected function setUp()
      */
     public function testUrlRewriteOnProductSave(array $data): void
     {
-        $product = $this->resourceSaveProductWithData($data['data']);
+        $product = $this->saveProduct($data['data']);
         $this->assertNotNull($product->getId(), 'The product was not created');
         $productUrlRewriteCollection = $this->getEntityRewriteCollection($product->getId());
         $this->assertRewrites(
@@ -144,7 +144,7 @@ public function testUrlRewriteOnProductEdit(array $expectedData): void
             'url_key_create_redirect' => $product->getUrlKey(),
             'save_rewrites_history' => true,
         ];
-        $product = $this->resourceSaveProductWithData($data, $product);
+        $product = $this->saveProduct($data, $product);
         $productRewriteCollection = $this->getEntityRewriteCollection($product->getId());
         $this->assertRewrites(
             $productRewriteCollection,
@@ -184,7 +184,7 @@ public function testUrlRewriteOnProductSaveWithExistingUrlKey(array $data): void
     {
         $this->expectException(UrlAlreadyExistsException::class);
         $this->expectExceptionMessage((string)__('URL key for specified store already exists.'));
-        $this->resourceSaveProductWithData($data);
+        $this->saveProduct($data);
     }
 
     /**
@@ -255,7 +255,7 @@ public function testProductUrlRewritePerStoreViews(): void
         $secondStoreId = $this->storeRepository->get('fixture_second_store')->getId();
         $product = $this->productRepository->get('simple2');
         $urlKeyFirstStore = $product->getUrlKey();
-        $product = $this->resourceSaveProductWithData(
+        $product = $this->saveProduct(
             ['store_id' => $secondStoreId, 'url_key' => $urlKeySecondStore],
             $product
         );
@@ -275,12 +275,11 @@ public function testProductUrlRewritePerStoreViews(): void
      * @param ProductInterface|null $product
      * @return ProductInterface
      */
-    protected function resourceSaveProductWithData(array $data, $product = null): ProductInterface
+    protected function saveProduct(array $data, $product = null): ProductInterface
     {
         $product = $product ?: $this->productFactory->create();
         $product->addData($data);
-        $productResource = $this->productResourceFactory->create();
-        $productResource->save($product);
+        $this->productResource->save($product);
 
         return $product;
     }