🔃 [Magento Community Engineering] Community Contributions - 2.4-develop

Accepted Community Pull Requests:
 - #28407: MFTF: Refactoring AdminUrlRewritesForProductsWithConfigurationTurnedOffTest (by @kate-kyzyma)
 - #28467: [Integration] Refactoring some fixtures for cms module (by @Usik2203)

Author: magento-engcom-team

app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductInAnchorCategoriesTest/AdminUrlRewritesForProductsWithConfigurationTurnedOffTest.xml

@@ -41,17 +41,26 @@
             <!--Flush cache-->
             <magentoCLI command="cache:flush" stepKey="cleanCache2"/>
         </after>
+
         <!-- 1. Log in to Admin -->
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+
         <!-- 2. Open Marketing - SEO & Search - URL Rewrites -->
-        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="amOnUrlRewriteIndexPage"/>
-        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openUrlRewriteGridFilters"/>
-        <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" userInput="$createSimpleProduct.custom_attributes[url_key]$.html" stepKey="inputProductName"/>
-        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>
-        <waitForPageLoad stepKey="waitForPageToLoad"/>
-        <seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Request Path', $createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="seeProducturl"/>
-        <dontSeeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Request Path', $simpleSubCategory1.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html)}}" stepKey="dontSeeCategoryProducturlKey"/>
-        <amOnPage url="/$simpleSubCategory1.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html" stepKey="navigateToProductPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createSimpleProduct.name$$" stepKey="seeProductName"/>
+        <actionGroup ref="AdminSearchUrlRewriteByRequestPathActionGroup" stepKey="searchingUrlRewrite">
+            <argument name="requestPath" value="$createSimpleProduct.custom_attributes[url_key]$.html"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminRequestPathInUrlRewriteGrigActionGroup" stepKey="seeProductUrlInGrid">
+            <argument name="requestPath" value="$createSimpleProduct.custom_attributes[url_key]$.html"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminRequestPathIsNotFoundInUrlRewriteGrigActionGroup" stepKey="categoryProductUrlIsNotShown">
+            <argument name="requestPath" value="$simpleSubCategory1.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html"/>
+        </actionGroup>
+
+        <!-- 3. Assert the Redirect works and Product is present on StoreFront-->
+        <actionGroup ref="AssertStorefrontProductRedirectActionGroup" stepKey="verifyProductInStoreFrontPage">
+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
+            <argument name="productSku" value="$$createSimpleProduct.sku$$"/>
+            <argument name="productRequestPath" value="/$simpleSubCategory1.custom_attributes[url_key]$/$createSimpleProduct.custom_attributes[url_key]$.html"/>
+        </actionGroup>
     </test>
 </tests>

dev/tests/integration/testsuite/Magento/Cms/_files/block.php

@@ -3,9 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
+use Magento\Cms\Api\BlockRepositoryInterface;
+use Magento\Cms\Model\Block;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/**
+ * @var $block Block
+ * @var $blockRepository BlockRepositoryInterface
+ */
+$block = $objectManager->create(Block::class);
+$blockRepository = $objectManager->create(BlockRepositoryInterface::class);
 
-/** @var $block \Magento\Cms\Model\Block */
-$block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Cms\Model\Block::class);
 $block->setTitle(
     'CMS Block Title'
 )->setIdentifier(
@@ -20,8 +33,10 @@
     1
 )->setStores(
     [
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Store\Model\StoreManagerInterface::class
+        Bootstrap::getObjectManager()->get(
+            StoreManagerInterface::class
         )->getStore()->getId()
     ]
-)->save();
+);
+
+$blockRepository->save($block);

dev/tests/integration/testsuite/Magento/Cms/_files/block_default_store.php

@@ -5,12 +5,20 @@
  */
 declare(strict_types=1);
 
+use Magento\Cms\Api\BlockRepositoryInterface;
 use Magento\Cms\Model\Block;
 use Magento\Store\Model\Store;
 use Magento\TestFramework\Helper\Bootstrap;
 
-/** @var $block Block */
-$block = Bootstrap::getObjectManager()->create(Block::class);
+$objectManager = Bootstrap::getObjectManager();
+
+/**
+ * @var $block Block
+ * @var $blockRepository BlockRepositoryInterface
+ */
+$block = $objectManager->create(Block::class);
+$blockRepository = $objectManager->create(BlockRepositoryInterface::class);
+
 $block->setTitle(
     'CMS Block Title'
 )->setIdentifier(
@@ -24,4 +32,6 @@
     1
 )->setStores(
     [Store::DEFAULT_STORE_ID]
-)->save();
+);
+
+$blockRepository->save($block);

dev/tests/integration/testsuite/Magento/Cms/_files/home_with_custom_handle.php

@@ -5,6 +5,7 @@
  */
 declare(strict_types=1);
 
+use Magento\Cms\Model\ResourceModel\Page as PageResource;
 use Magento\Cms\Model\Page as PageModel;
 use Magento\Cms\Model\PageFactory as PageModelFactory;
 use Magento\TestFramework\Cms\Model\CustomLayoutManager;
@@ -20,11 +21,16 @@
 
 $customLayoutName = 'page_custom_layout';
 
-/** @var PageModel $page */
+/**
+ * @var PageModel $page
+ * @var PageResource $pageResource
+ */
 $page = $pageFactory->create(['customLayoutRepository' => $layoutRepo]);
-$page->load('home');
+$pageResource = $objectManager->create(PageResource::class);
+
+$pageResource->load($page, 'home');
 $cmsPageId = (int)$page->getId();
 
 $fakeManager->fakeAvailableFiles($cmsPageId, [$customLayoutName]);
 $page->setData('layout_update_selected', $customLayoutName);
-$page->save();
+$pageResource->save($page);

dev/tests/integration/testsuite/Magento/Cms/_files/noroute.php

@@ -3,6 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-$block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Cms\Model\Page::class);
-$block->load('no-route', 'identifier');
-$block->setIsActive(0)->save();
+
+declare(strict_types=1);
+
+use Magento\Cms\Model\Page;
+use Magento\Cms\Model\ResourceModel\Page as PageResource;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/**
+ * @var Page $page
+ * @var PageResource $pageResource
+ */
+$page = $objectManager->create(Page::class);
+$pageResource = $objectManager->create(PageResource::class);
+
+$pageResource->load($page, 'no-route', 'identifier');
+$page->setIsActive(0);
+$pageResource->save($page);

dev/tests/integration/testsuite/Magento/Cms/_files/pages.php

@@ -4,8 +4,21 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $page \Magento\Cms\Model\Page */
-$page = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Cms\Model\Page::class);
+declare(strict_types=1);
+
+use Magento\Cms\Api\PageRepositoryInterface;
+use Magento\Cms\Model\Page;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/**
+ * @var $page Page
+ * @var $pageRepository PageRepositoryInterface
+ */
+$page = $objectManager->create(Page::class);
+$pageRepository = $objectManager->create(PageRepositoryInterface::class);
+
 $page->setTitle('Cms Page 100')
     ->setIdentifier('page100')
     ->setStores([0])
@@ -15,10 +28,10 @@
     ->setMetaTitle('Cms Meta title for page100')
     ->setMetaKeywords('Cms Meta Keywords for page100')
     ->setMetaDescription('Cms Meta Description for page100')
-    ->setPageLayout('1column')
-    ->save();
+    ->setPageLayout('1column');
+$pageRepository->save($page);
 
-$page = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Cms\Model\Page::class);
+$page = $objectManager->create(Page::class);
 $page->setTitle('Cms Page Design Blank')
     ->setIdentifier('page_design_blank')
     ->setStores([0])
@@ -29,5 +42,5 @@
     ->setMetaKeywords('Cms Meta Keywords for Blank page')
     ->setMetaDescription('Cms Meta Description for Blank page')
     ->setPageLayout('1column')
-    ->setCustomTheme('Magento/blank')
-    ->save();
+    ->setCustomTheme('Magento/blank');
+$pageRepository->save($page);

dev/tests/integration/testsuite/Magento/Cms/_files/pages_with_layout_xml.php

@@ -7,16 +7,21 @@
 declare(strict_types=1);
 
 use Magento\Cms\Model\Page as PageModel;
+use Magento\Cms\Model\ResourceModel\Page as PageResource;
 use Magento\Cms\Model\PageFactory as PageModelFactory;
 use Magento\TestFramework\Cms\Model\CustomLayoutManager;
 use Magento\TestFramework\Helper\Bootstrap;
 
 $objectManager = Bootstrap::getObjectManager();
 $pageFactory = $objectManager->get(PageModelFactory::class);
+
 /** @var CustomLayoutManager $fakeManager */
 $fakeManager = $objectManager->get(CustomLayoutManager::class);
 $layoutRepo = $objectManager->create(PageModel\CustomLayoutRepositoryInterface::class, ['manager' => $fakeManager]);
 
+/** @var PageResource $pageRepository */
+$pageResource = $objectManager->create(PageResource::class);
+
 /** @var PageModel $page */
 $page = $pageFactory->create(['customLayoutRepository' => $layoutRepo]);
 $page->setIdentifier('test_custom_layout_page_1');
@@ -25,14 +30,16 @@
 $page->setLayoutUpdateXml('<container />');
 $page->setIsActive(true);
 $page->setStoreId(0);
-$page->save();
+$pageResource->save($page);
+
 /** @var PageModel $page2 */
 $page2 = $pageFactory->create(['customLayoutRepository' => $layoutRepo]);
 $page2->setIdentifier('test_custom_layout_page_2');
 $page2->setTitle('Test Page 2');
 $page->setIsActive(true);
 $page->setStoreId(0);
-$page2->save();
+$pageResource->save($page2);
+
 /** @var PageModel $page3 */
 $page3 = $pageFactory->create(['customLayoutRepository' => $layoutRepo]);
 $page3->setIdentifier('test_custom_layout_page_3');
@@ -41,7 +48,7 @@
 $page3->setIsActive(1);
 $page3->setContent('<h1>Test Page</h1>');
 $page3->setPageLayout('1column');
-$page3->save();
+$pageResource->save($page3);
 $fakeManager->fakeAvailableFiles((int)$page3->getId(), ['test_selected']);
 $page3->setData('layout_update_selected', 'test_selected');
-$page3->save();
+$pageResource->save($page3);

dev/tests/integration/testsuite/Magento/Cms/_files/pages_with_layout_xml_rollback.php

@@ -8,25 +8,33 @@
 
 use Magento\Cms\Model\Page as PageModel;
 use Magento\Cms\Model\PageFactory as PageModelFactory;
+use Magento\Cms\Model\ResourceModel\Page as PageResource;
 use Magento\TestFramework\Helper\Bootstrap;
 
 $objectManager = Bootstrap::getObjectManager();
 $pageFactory = $objectManager->get(PageModelFactory::class);
-/** @var PageModel $page */
+
+/**
+ * @var PageModel $page
+ * @var PageResource $pageResource
+ */
 $page = $pageFactory->create();
-$page->load('test_custom_layout_page_1', PageModel::IDENTIFIER);
+$pageResource = $objectManager->create(PageResource::class);
+$pageResource->load($page, 'test_custom_layout_page_1', PageModel::IDENTIFIER);
 if ($page->getId()) {
-    $page->delete();
+    $pageResource->delete($page);
 }
+
 /** @var PageModel $page2 */
 $page2 = $pageFactory->create();
-$page2->load('test_custom_layout_page_2', PageModel::IDENTIFIER);
+$pageResource->load($page2, 'test_custom_layout_page_2', PageModel::IDENTIFIER);
 if ($page2->getId()) {
-    $page2->delete();
+    $pageResource->delete($page2);
 }
+
 /** @var PageModel $page3 */
 $page3 = $pageFactory->create();
-$page3->load('test_custom_layout_page_3', PageModel::IDENTIFIER);
+$pageResource->load($page3, 'test_custom_layout_page_3', PageModel::IDENTIFIER);
 if ($page3->getId()) {
-    $page3->delete();
+    $pageResource->delete($page3);
 }

dev/tests/integration/testsuite/Magento/Cms/_files/two_cms_page_with_same_url_for_different_stores.php

@@ -5,29 +5,37 @@
  */
 declare(strict_types=1);
 
+use Magento\Cms\Api\PageRepositoryInterface;
+use Magento\Cms\Model\Page;
 use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 Resolver::getInstance()->requireDataFixture('Magento/Store/_files/second_store.php');
 
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$objectManager = Bootstrap::getObjectManager();
+
 /** @var StoreRepositoryInterface $storeRepository */
 $storeRepository = $objectManager->get(StoreRepositoryInterface::class);
 $store = $storeRepository->get('fixture_second_store');
-/** @var $page \Magento\Cms\Model\Page */
-$page = $objectManager->create(\Magento\Cms\Model\Page::class);
+
+/** @var PageRepositoryInterface $pageRepository */
+$pageRepository = $objectManager->create(PageRepositoryInterface::class);
+
+/** @var $page Page */
+$page = $objectManager->create(Page::class);
 $page->setTitle('First test page')
     ->setIdentifier('page1')
     ->setStores([1])
     ->setIsActive(1)
-    ->setPageLayout('1column')
-    ->save();
+    ->setPageLayout('1column');
+$pageRepository->save($page);
 
-/** @var $page \Magento\Cms\Model\Page */
-$page = $objectManager->create(\Magento\Cms\Model\Page::class);
+/** @var $page Page */
+$page = $objectManager->create(Page::class);
 $page->setTitle('Second test page')
     ->setIdentifier('page1')
     ->setStores([$store->getId()])
     ->setIsActive(1)
-    ->setPageLayout('1column')
-    ->save();
+    ->setPageLayout('1column');
+$pageRepository->save($page);