Skip to content

Commit c6f5b12

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop
Accepted Community Pull Requests: - #28999: [MFTF] Use actionGroup go to CatalogRulePage (by @Usik2203) - #27221: Store longer X-Forwarded-For header (by @ihor-sviziev) - #28922: Deploy all used locales (by @AntonEvers) - #29162: [MFTF] created ActionGroup to go to AdminSystemStorePage (by @Usik2203) - #28856: Issue 28656 inline translation rest api (by @zaximus84) - #29077: FIX: blocky moving inside magnifier (by @GrimLink) - #27340: Fix issue 27162 sort order link incorrect compare (by @mrtuvn) Fixed GitHub Issues: - #28693: IPv6 values of X_FORWARDED_FOR in sales orders are truncated to 32 characters. (reported by @n2diving-dgx) has been fixed in #27221 by @ihor-sviziev in 2.4-develop branch Related commits: 1. 8ec11ad 2. 7308ee2 3. 4514e0c 4. aa59e48 - #29218: [Issue] Deploy all used locales (reported by @m2-assistant[bot]) has been fixed in #28922 by @AntonEvers in 2.4-develop branch Related commits: 1. da400fb - #28656: Enabled Translation inline affect to result of REST APIs. (reported by @phongphanmage) has been fixed in #28856 by @zaximus84 in 2.4-develop branch Related commits: 1. c1eeed2 2. 35f7e8d 3. b444002 4. 6fc4595 5. e3726fc 6. 9fc982c 7. 285635b 8. a925a03 9. 9204022 - #29076: Gallery inside magnifier moves blocky (reported by @GrimLink) has been fixed in #29077 by @GrimLink in 2.4-develop branch Related commits: 1. feb01e4 - #27162: SortOrder is reversed in layout XML (reported by @krisztian-fekete) has been fixed in #27340 by @mrtuvn in 2.4-develop branch Related commits: 1. 4f49790 2. 1e22f3d 3. 0fadeff
2 parents c36db34 + e3cf152 commit c6f5b12

File tree

46 files changed

+973
-357
lines changed

Some content is hidden

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

46 files changed

+973
-357
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
<!--Delete all created data during the test execution and assign Default Root Category to Store-->
2222
<after>
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin2"/>
24-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnPageAdminSystemStore"/>
25-
<waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad" />
24+
<actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnPageAdminSystemStore"/>
2625
<click selector="{{AdminStoresGridSection.resetButton}}" stepKey="clickOnResetButton"/>
2726
<waitForPageLoad time="10" stepKey="waitForPageAdminStoresGridLoadAfterResetButton"/>
2827
<fillField selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="Main Website Store" stepKey="fillFieldOnWebsiteStore"/>
@@ -58,8 +57,7 @@
5857
<argument name="categoryEntity" value="SubCategoryWithParent"/>
5958
</actionGroup>
6059
<!--Assign new created root category to store-->
61-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnPageAdminSystemStore"/>
62-
<waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad" />
60+
<actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnPageAdminSystemStore"/>
6361
<click selector="{{AdminStoresGridSection.resetButton}}" stepKey="clickOnResetButton"/>
6462
<waitForPageLoad time="10" stepKey="waitForPageAdminStoresGridLoadAfterResetButton"/>
6563
<fillField selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="Main Website Store" stepKey="fillFieldOnWebsiteStore"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@
7474
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
7575
</after>
7676
<!--Grab new store view code-->
77-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="navigateToNewWebsitePage"/>
78-
<waitForPageLoad stepKey="waitForStoresPageLoad"/>
77+
<actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="navigateToNewWebsitePage"/>
7978
<fillField userInput="{{NewWebSiteData.name}}" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillSearchWebsiteField"/>
8079
<click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
8180
<click selector="{{AdminStoresGridSection.storeNameInFirstRow}}" stepKey="clickFirstRow"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3030
</after>
3131

32-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
33-
<waitForPageLoad stepKey="waitForSystemStorePage"/>
32+
<actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnAdminSystemStorePage"/>
3433
<click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
3534
<fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
3635
<fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
</actionGroup>
3737

3838
<!--Create Store view -->
39-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
40-
<waitForPageLoad stepKey="waitForSystemStorePage"/>
39+
<actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnAdminSystemStorePage"/>
4140
<click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
4241
<waitForPageLoad stepKey="waitForProductPageLoad"/>
4342
<waitForElementVisible selector="//legend[contains(., 'Store View Information')]" stepKey="waitForNewStorePageToOpen"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
</actionGroup>
3737

3838
<!--Create Store view -->
39-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
40-
<waitForPageLoad stepKey="waitForSystemStorePage"/>
39+
<actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnAdminSystemStorePage"/>
4140
<click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
4241
<waitForPageLoad stepKey="waitForProductPageLoad"/>
4342
<waitForElementVisible selector="//legend[contains(., 'Store View Information')]" stepKey="waitForNewStorePageToOpen"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
</after>
3434

3535
<!--Open Store Page -->
36-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
37-
<waitForPageLoad stepKey="waitForSystemStorePage"/>
36+
<actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnAdminSystemStorePage"/>
3837

3938
<!--Create Custom Store -->
4039
<click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@
5656
<argument name="parentCategory" value="$$createNewRootCategoryA.name$$"/>
5757
</actionGroup>
5858
<!-- Change root category for Main Website Store. -->
59-
<amOnPage stepKey="s1" url="{{AdminSystemStorePage.url}}"/>
60-
<waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad" />
59+
<actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="s1"/>
6160
<click stepKey="s2" selector="{{AdminStoresGridSection.resetButton}}"/>
6261
<waitForPageLoad stepKey="waitForPageAdminStoresGridLoadAfterResetButton" time="10"/>
6362
<fillField stepKey="s4" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="Main Website Store"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
</actionGroup>
3535

3636
<!--Create Store view -->
37-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
38-
<waitForPageLoad stepKey="waitForAdminSystemStorePage"/>
37+
<actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnAdminSystemStorePage"/>
3938
<click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
4039
<waitForPageLoad stepKey="waitForProductPageLoad"/>
4140
<selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<deleteData createDataKey="createSimpleProductTwo" stepKey="deleteSimpleProductTwo"/>
3737

3838
<!-- Delete the catalog price rule -->
39-
<amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
39+
<actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage"/>
4040
<actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
4141
<argument name="name" value="{{_defaultCatalogRule.name}}"/>
4242
<argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
@@ -46,8 +46,7 @@
4646
</after>
4747

4848
<!-- 1. Begin creating a new catalog price rule -->
49-
<amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage"/>
50-
<waitForPageLoad stepKey="waitForPriceRulePage"/>
49+
<actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage"/>
5150
<click selector="{{AdminGridMainControls.add}}" stepKey="addNewRule"/>
5251
<waitForPageLoad stepKey="waitForIndividualRulePage"/>
5352
<fillField selector="{{AdminNewCatalogPriceRule.ruleName}}" userInput="{{_defaultCatalogRule.name}}" stepKey="fillName"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromConfigurableProductTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,7 @@
105105
</after>
106106

107107
<!-- Delete the simple product and catalog price rule -->
108-
<amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage1"/>
109-
<waitForPageLoad stepKey="waitForPriceRulePage"/>
108+
<actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage1"/>
110109
<actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule1">
111110
<argument name="name" value="{{DeleteActiveCatalogPriceRuleWithConditions.name}}"/>
112111
<argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromSimpleProductTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@
4949
</after>
5050

5151
<!-- Delete the simple product and catalog price rule -->
52-
<amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage1"/>
53-
<waitForPageLoad stepKey="waitForPriceRulePage"/>
52+
<actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage1"/>
5453
<actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule1">
5554
<argument name="name" value="{{DeleteActiveCatalogPriceRuleWithConditions.name}}"/>
5655
<argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$0.90" stepKey="seeCorrectPrice2"/>
7676

7777
<!-- Delete the rule -->
78-
<amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage"/>
78+
<actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage"/>
7979
<actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule">
8080
<argument name="name" value="{{_defaultCatalogRule.name}}"/>
8181
<argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<after>
5050

5151
<!--Delete created data-->
52-
<amOnPage url="{{CatalogRulePage.url}}" stepKey="goToCatalogPriceRulePage"/>
52+
<actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToCatalogPriceRulePage"/>
5353
<actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule">
5454
<argument name="name" value="{{CatalogRuleWithAllCustomerGroups.name}}"/>
5555
<argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
@@ -68,8 +68,7 @@
6868
</after>
6969

7070
<!--Create catalog price rule-->
71-
<amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage"/>
72-
<waitForPageLoad stepKey="waitForPriceRulePage"/>
71+
<actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage"/>
7372
<actionGroup ref="CreateCatalogPriceRuleActionGroup" stepKey="createCatalogPriceRule">
7473
<argument name="catalogRule" value="CatalogRuleWithAllCustomerGroups"/>
7574
</actionGroup>
@@ -104,7 +103,7 @@
104103

105104
<!--Delete previous attribute and Catalog Price Rule-->
106105
<deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
107-
<amOnPage url="{{CatalogRulePage.url}}" stepKey="goToCatalogPriceRulePage"/>
106+
<actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToCatalogPriceRulePage"/>
108107
<actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule">
109108
<argument name="name" value="{{CatalogRuleWithAllCustomerGroups.name}}"/>
110109
<argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
@@ -116,8 +115,7 @@
116115
</createData>
117116

118117
<!--Create new Catalog Price Rule-->
119-
<amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage1"/>
120-
<waitForPageLoad stepKey="waitForPriceRulePage1"/>
118+
<actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage1"/>
121119
<actionGroup ref="CreateCatalogPriceRuleActionGroup" stepKey="createCatalogPriceRule1">
122120
<argument name="catalogRule" value="CatalogRuleWithAllCustomerGroups"/>
123121
</actionGroup>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
9898
<deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
9999

100-
<amOnPage url="{{CatalogRulePage.url}}" stepKey="goToCatalogPriceRulePage"/>
100+
<actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToCatalogPriceRulePage"/>
101101
<actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule">
102102
<argument name="name" value="{{SimpleCatalogPriceRule.name}}"/>
103103
<argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleAndConfigurableProductTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
</before>
8282
<after>
8383
<!-- Delete the catalog price rule -->
84-
<amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
84+
<actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage"/>
8585
<actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
8686
<argument name="name" value="{{_defaultCatalogRule.name}}"/>
8787
<argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductAndFixedMethodTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
4242

4343
<!-- Delete the catalog price rule -->
44-
<amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
44+
<actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage"/>
4545
<actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
4646
<argument name="name" value="{{CatalogRuleByFixed.name}}"/>
4747
<argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductForNewCustomerGroupTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<deleteData createDataKey="customerGroup" stepKey="deleteCustomerGroup"/>
4747

4848
<!-- Delete the catalog price rule -->
49-
<amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
49+
<actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage"/>
5050
<actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
5151
<argument name="name" value="{{CatalogRuleByFixed.name}}"/>
5252
<argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
5050

5151
<!-- Delete the catalog price rule -->
52-
<amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
52+
<actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage"/>
5353
<actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
5454
<argument name="name" value="{{_defaultCatalogRule.name}}"/>
5555
<argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
</actionGroup>
9595

9696
<!--Create Store view -->
97-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
97+
<actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnAdminSystemStorePage"/>
9898
<click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
9999
<waitForPageLoad stepKey="waitForProductPageLoad"/>
100100
<selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>

‎app/code/Magento/Customer/Block/Account/Navigation.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
namespace Magento\Customer\Block\Account;
99

10-
use \Magento\Framework\View\Element\Html\Links;
11-
use \Magento\Customer\Block\Account\SortLinkInterface;
10+
use Magento\Framework\View\Element\Html\Links;
11+
use Magento\Customer\Block\Account\SortLinkInterface;
1212

1313
/**
1414
* Class for sorting links in navigation panels.
@@ -19,7 +19,7 @@
1919
class Navigation extends Links
2020
{
2121
/**
22-
* {@inheritdoc}
22+
* @inheritdoc
2323
* @since 100.2.0
2424
*/
2525
public function getLinks()
@@ -47,6 +47,6 @@ public function getLinks()
4747
*/
4848
private function compare(SortLinkInterface $firstLink, SortLinkInterface $secondLink): int
4949
{
50-
return $secondLink->getSortOrder() <=> $firstLink->getSortOrder();
50+
return $firstLink->getSortOrder() <=> $secondLink->getSortOrder();
5151
}
5252
}

‎app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2727
<!--Create new website,store and store view-->
2828
<comment userInput="Create new website,store and store view" stepKey="createWebsite"/>
29-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="goToAdminSystemStorePage"/>
29+
<actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="goToAdminSystemStorePage"/>
3030
<actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="adminCreateNewWebsite">
3131
<argument name="newWebsiteName" value="{{NewWebSiteData.name}}"/>
3232
<argument name="websiteCode" value="{{NewWebSiteData.code}}"/>

‎app/code/Magento/Customer/Test/Unit/Block/Account/NavigationTest.php

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818

1919
class NavigationTest extends TestCase
2020
{
21+
/**
22+
* Stub name top links
23+
*/
24+
private const STUB_TOP_LINKS_NAME_IN_LAYOUT = 'top.links';
25+
2126
/**
2227
* @var ObjectManagerHelper
2328
*/
@@ -62,7 +67,7 @@ protected function setUp(): void
6267
*
6368
* @return void
6469
*/
65-
public function testGetLinksWithCustomerAndWishList()
70+
public function testGetLinksWithCustomerAndWishList(): void
6671
{
6772
$wishListLinkMock = $this->getMockBuilder(WishListLink::class)
6873
->disableOriginalConstructor()
@@ -76,30 +81,30 @@ public function testGetLinksWithCustomerAndWishList()
7681

7782
$wishListLinkMock->expects($this->any())
7883
->method('getSortOrder')
79-
->willReturn(100);
84+
->willReturn(30);
8085

8186
$customerAccountLinkMock->expects($this->any())
8287
->method('getSortOrder')
83-
->willReturn(20);
88+
->willReturn(0);
8489

85-
$nameInLayout = 'top.links';
90+
$topLinksNameInLayout = self::STUB_TOP_LINKS_NAME_IN_LAYOUT;
8691

8792
$blockChildren = [
88-
'wishListLink' => $wishListLinkMock,
89-
'customerAccountLink' => $customerAccountLinkMock
93+
'customerAccountLink' => $customerAccountLinkMock,
94+
'wishListLink' => $wishListLinkMock
9095
];
9196

92-
$this->navigation->setNameInLayout($nameInLayout);
97+
$this->navigation->setNameInLayout($topLinksNameInLayout);
9398
$this->layoutMock->expects($this->any())
9499
->method('getChildBlocks')
95-
->with($nameInLayout)
100+
->with($topLinksNameInLayout)
96101
->willReturn($blockChildren);
97102

98103
/* Assertion */
99104
$this->assertEquals(
100105
[
101-
0 => $wishListLinkMock,
102-
1 => $customerAccountLinkMock
106+
0 => $customerAccountLinkMock,
107+
1 => $wishListLinkMock
103108
],
104109
$this->navigation->getLinks()
105110
);

0 commit comments

Comments
 (0)