Skip to content

Commit f61214d

Browse files
gabrieldagamagabrieldagama
authored
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop
Accepted Community Pull Requests: - #29831: [MFTF] add new AdminOpenCatalogSearchTermIndexPageActionGroup (by @Usik2203) - #29869: #1797: The vertical image is not centered in Category image preview (by @joweecaquicla) - #29875: #1796: [MFTF] Unskip AdminMediaGalleryUploadCategoryImageTest (by @joweecaquicla) - #27386: Aria-atomic="true" missing on error container (by @bradleybrecher) - #29044: Improvements webfont loading for theme (by @mrtuvn) - #29822: [MFTF] Add new AdminOpenIndexManagementPageActionGroup (by @Usik2203) - #29836: [MFTF] add AssertStorefrontCustomerLogoutSuccessPageActionGroup (by @Usik2203) - #28349: Replaced deprecated method addError with addErrorMessage (by @VinothKumar361) Fixed GitHub Issues: - #29844: [Issue] [MFTF] add new AdminOpenCatalogSearchTermIndexPageActionGroup (reported by @m2-assistant[bot]) has been fixed in #29831 by @Usik2203 in 2.4-develop branch Related commits: 1. 2d9d741 2. 41d0ada - #29560: [Issue] Aria-atomic="true" missing on error container (reported by @m2-assistant[bot]) has been fixed in #27386 by @bradleybrecher in 2.4-develop branch Related commits: 1. 8f08efe 2. a75c7f6 3. 27555c2 4. 2e90fad 5. 2738a61 6. 7939d99 7. 7436d57 8. b91ebf2 9. 1e28435 10. 65387f8 - #29526: [Issue] Improvements webfont loading for theme (reported by @m2-assistant[bot]) has been fixed in #29044 by @mrtuvn in 2.4-develop branch Related commits: 1. be3c1ec - #29825: [Issue] [MFTF] Add new AdminOpenIndexManagementPageActionGroup (reported by @m2-assistant[bot]) has been fixed in #29822 by @Usik2203 in 2.4-develop branch Related commits: 1. b991d9a 2. 6c103a7 3. 4dfb45e - #29841: [Issue] [MFTF] add AssertStorefrontCustomerLogoutSuccessPageActionGroup (reported by @m2-assistant[bot]) has been fixed in #29836 by @Usik2203 in 2.4-develop branch Related commits: 1. 5228d6b 2. 889369c 3. 6cd78b5
2 parents 9e7b088 + 8c9fb75 commit f61214d

File tree

72 files changed

+435
-297
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+435
-297
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@
7676
<argument name="tags" value=""/>
7777
</actionGroup>
7878
<!--Open Index Management Page -->
79-
<amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
80-
<waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
79+
<actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="openIndexManagementPage"/>
8180
<see stepKey="seeIndexStatus" selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
8281
<!--Verify Category In Store Front-->
8382
<amOnPage url="/$$createCategory.name$$.html" stepKey="openCategoryPage1"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,7 @@
7676
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
7777
<argument name="tags" value=""/>
7878
</actionGroup>
79-
<!--Open Index Management Page -->
80-
<amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
81-
<waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
79+
<actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="openIndexManagementPage"/>
8280
<see stepKey="seeIndexStatus" selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
8381
<!--Verify Category In Store Front-->
8482
<amOnPage url="/$$createCategory.name$$.html" stepKey="openCategoryPage1"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,7 @@
7777
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
7878
<argument name="tags" value=""/>
7979
</actionGroup>
80-
<!--Open Index Management Page -->
81-
<amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
82-
<waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
80+
<actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="openIndexManagementPage"/>
8381
<see stepKey="seeIndexStatus" selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
8482
<!--Verify Category In Store Front-->
8583
<amOnPage url="/$$category.name$$.html" stepKey="openCategoryPage1"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
<createData entity="_defaultCategory" stepKey="createSecondCategory"/>
2626

2727
<!-- Switch "Category Product" and "Product Category" indexers to "Update by Schedule" mode -->
28-
<amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="onIndexManagement"/>
29-
<waitForPageLoad stepKey="waitForManagementPage"/>
28+
<actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="onIndexManagement"/>
3029

3130
<actionGroup ref="AdminSwitchIndexerToActionModeActionGroup" stepKey="switchCategoryProduct">
3231
<argument name="indexerValue" value="catalog_category_product"/>
@@ -38,8 +37,7 @@
3837

3938
<after>
4039
<!-- Switch "Category Product" and "Product Category" indexers to "Update by Save" mode -->
41-
<amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="onIndexManagement"/>
42-
<waitForPageLoad stepKey="waitForManagementPage"/>
40+
<actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="onIndexManagement"/>
4341

4442
<actionGroup ref="AdminSwitchIndexerToActionModeActionGroup" stepKey="switchCategoryProduct">
4543
<argument name="indexerValue" value="catalog_category_product"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,7 @@
8989
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
9090
<argument name="tags" value=""/>
9191
</actionGroup>
92-
<!--Open Index Management Page -->
93-
<amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
94-
<waitForPageLoad stepKey="waitForIndexPageToLoad"/>
92+
<actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="openIndexManagementPage"/>
9593
<see stepKey="seeCategoryIndexStatus" selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
9694
<!--Verify Product In Store Front-->
9795
<amOnPage url="$$createSimpleProduct.name$$.html" stepKey="goToStorefrontPage"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,7 @@
7171
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
7272
<argument name="tags" value=""/>
7373
</actionGroup>
74-
<!--Open Index Management Page -->
75-
<amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
76-
<waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
74+
<actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="openIndexManagementPage"/>
7775
<see stepKey="seeIndexStatus" selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
7876
<!--Verify Category In Store Front-->
7977
<amOnPage url="/$$createCategory.name$$.html" stepKey="openCategoryPage1"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,7 @@
7676
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
7777
<argument name="tags" value=""/>
7878
</actionGroup>
79-
<!--Open Index Management Page -->
80-
<amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
81-
<waitForPageLoad stepKey="waitForIndexPageToLoad"/>
79+
<actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="openIndexManagementPage"/>
8280
<see stepKey="seeIndexStatus" selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="READY"/>
8381
<!--Verify Category In Store Front-->
8482
<amOnPage url="{{SimpleSubCategory.name}}.html" stepKey="goToStorefrontPage"/>

‎app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminOpenCatalogSearchTermIndexPageActionGroup.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminOpenCatalogSearchTermIndexPageActionGroup">
12+
<annotations>
13+
<description>Open catalog search term index page.</description>
14+
</annotations>
15+
16+
<amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openCatalogSearchTermIndexPage"/>
17+
<waitForPageLoad stepKey="waitForPageLoad"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontUpdateSearchTermEntityTest.xml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@
3939
<deleteData createDataKey="createCategory1" stepKey="deleteCategory1"/>
4040

4141
<!-- Delete all search terms -->
42-
<amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage"/>
43-
<waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
42+
<actionGroup ref="AdminOpenCatalogSearchTermIndexPageActionGroup" stepKey="openAdminCatalogSearchTermIndexPage"/>
4443
<comment userInput="Delete all search terms" stepKey="deleteAllSearchTermsComment"/>
4544
<actionGroup ref="AdminDeleteAllSearchTermsActionGroup" stepKey="deleteAllSearchTerms"/>
4645

@@ -53,8 +52,7 @@
5352

5453
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
5554

56-
<amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage1"/>
57-
<waitForPageLoad stepKey="waitForPageLoad1"/>
55+
<actionGroup ref="AdminOpenCatalogSearchTermIndexPageActionGroup" stepKey="openAdminCatalogSearchTermIndexPage1"/>
5856

5957
<actionGroup ref="AdminSearchTermFilterBySearchQueryActionGroup" stepKey="filterByFirstSearchQuery1">
6058
<argument name="searchQuery" value="$$createProduct1.name$$"/>
@@ -67,8 +65,7 @@
6765
<argument name="searchTerm" value="UpdatedSearchTermData1"/>
6866
</actionGroup>
6967

70-
<amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage2"/>
71-
<waitForPageLoad stepKey="waitForPageLoad3"/>
68+
<actionGroup ref="AdminOpenCatalogSearchTermIndexPageActionGroup" stepKey="openAdminCatalogSearchTermIndexPage2"/>
7269

7370
<actionGroup ref="AdminSearchTermFilterBySearchQueryActionGroup" stepKey="filterByFirstSearchQuery2">
7471
<argument name="searchQuery" value="{{UpdatedSearchTermData1.query_text}}"/>

‎app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
67

78
namespace Magento\Customer\Observer;
89

@@ -17,6 +18,7 @@
1718
use Magento\Framework\App\State as AppState;
1819
use Magento\Framework\DataObject;
1920
use Magento\Framework\Escaper;
21+
use Magento\Framework\Event\Observer;
2022
use Magento\Framework\Event\ObserverInterface;
2123
use Magento\Framework\Message\ManagerInterface;
2224
use Magento\Framework\Registry;
@@ -25,6 +27,7 @@
2527
/**
2628
* Customer Observer Model
2729
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
30+
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
2831
*/
2932
class AfterAddressSaveObserver implements ObserverInterface
3033
{
@@ -114,11 +117,11 @@ public function __construct(
114117
/**
115118
* Address after save event handler
116119
*
117-
* @param \Magento\Framework\Event\Observer $observer
120+
* @param Observer $observer
118121
* @return void
119122
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
120123
*/
121-
public function execute(\Magento\Framework\Event\Observer $observer)
124+
public function execute(Observer $observer)
122125
{
123126
/** @var $customerAddress Address */
124127
$customerAddress = $observer->getCustomerAddress();
@@ -280,7 +283,7 @@ protected function addInvalidMessage($customerAddress)
280283
$message[] = (string)__('You will be charged tax.');
281284
}
282285

283-
$this->messageManager->addError(implode(' ', $message));
286+
$this->messageManager->addErrorMessage(implode(' ', $message));
284287

285288
return $this;
286289
}
@@ -307,7 +310,7 @@ protected function addErrorMessage($customerAddress)
307310
$email = $this->scopeConfig->getValue('trans_email/ident_support/email', ScopeInterface::SCOPE_STORE);
308311
$message[] = (string)__('If you believe this is an error, please contact us at %1', $email);
309312

310-
$this->messageManager->addError(implode(' ', $message));
313+
$this->messageManager->addErrorMessage(implode(' ', $message));
311314

312315
return $this;
313316
}

0 commit comments

Comments
 (0)