Skip to content

Commit 540f8cd

Browse files
magento-engcom-teammagento-engcom-team
authored
[Magento Community Engineering] Community Contributions - 2.4.1-develop
 - merged latest code from mainline branch
2 parents e894c7a + 56ae4d5 commit 540f8cd

File tree

15 files changed

+246
-52
lines changed

15 files changed

+246
-52
lines changed

‎app/code/Magento/CatalogInventory/i18n/en_US.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,4 @@ Stock,Stock
7070
"Use Config Settings","Use Config Settings"
7171
"Qty Uses Decimals","Qty Uses Decimals"
7272
"Allow Multiple Boxes for Shipping","Allow Multiple Boxes for Shipping"
73+
"Done","Done"

‎app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<options>
1212
<option name="buttons" xsi:type="array">
1313
<item name="0" xsi:type="array">
14-
<item name="text" xsi:type="string">Done</item>
14+
<item name="text" xsi:type="string" translate="true">Done</item>
1515
<item name="class" xsi:type="string">action-primary</item>
1616
<item name="actions" xsi:type="array">
1717
<item name="0" xsi:type="array">
@@ -21,7 +21,7 @@
2121
</item>
2222
</item>
2323
</option>
24-
<option name="title" xsi:type="string">Advanced Inventory</option>
24+
<option name="title" xsi:type="string" translate="true">Advanced Inventory</option>
2525
</options>
2626
<onCancel>actionDone</onCancel>
2727
<dataScope>data.product</dataScope>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDeleteCmsPageFromGridActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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="AdminDeleteCmsPageFromGridActionGroup">
12+
<arguments>
13+
<argument name="urlKey" type="string"/>
14+
</arguments>
15+
<click selector="{{CmsPagesPageActionsSection.select(urlKey)}}" stepKey="clickSelect"/>
16+
<click selector="{{CmsPagesPageActionsSection.delete(urlKey)}}" stepKey="clickDelete"/>
17+
<waitForElementVisible selector="{{CmsPagesPageActionsSection.deleteConfirm}}" stepKey="waitForOkButtonToBeVisible"/>
18+
<click selector="{{CmsPagesPageActionsSection.deleteConfirm}}" stepKey="clickOkButton"/>
19+
<waitForPageLoad stepKey="waitForPageLoad3"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSearchCmsPageInGridByUrlKeyActionGroup.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="AdminSearchCmsPageInGridByUrlKeyActionGroup">
12+
<arguments>
13+
<argument name="urlKey" type="string"/>
14+
</arguments>
15+
<click selector="{{CmsPagesPageActionsSection.filterButton}}" stepKey="clickFilterButton"/>
16+
<fillField selector="{{CmsPagesPageActionsSection.URLKey}}" userInput="{{urlKey}}" stepKey="fillUrlKeyField"/>
17+
<click selector="{{CmsPagesPageActionsSection.ApplyFiltersBtn}}" stepKey="clickApplyFiltersButton"/>
18+
<waitForPageLoad stepKey="waitForPageLoading"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertAdminCmsPageIsNotInGridActionGroup.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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="AssertAdminCmsPageIsNotInGridActionGroup">
12+
<arguments>
13+
<argument name="urlKey" type="string"/>
14+
</arguments>
15+
<dontSee userInput="{{urlKey}}" selector="{{CmsPagesPageActionsSection.gridDataRow}}" stepKey="dontSeeCmsPageInGrid"/>
16+
</actionGroup>
17+
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,6 @@
3030
<element name="pageRowCheckboxByIdentifier" type="checkbox" selector="//table[@data-role='grid']//td[count(../../..//th[./*[.='URL Key']]/preceding-sibling::th) + 1][./*[.='{{identifier}}']]/../td//input[@data-action='select-row']" parameterized="true" />
3131
<element name="massActionsButton" type="button" selector="//div[@class='admin__data-grid-header'][(not(ancestor::*[@class='sticky-header']) and not(contains(@style,'visibility: hidden'))) or (ancestor::*[@class='sticky-header' and not(contains(@style,'display: none'))])]//button[contains(@class, 'action-select')]" />
3232
<element name="massActionsOption" type="button" selector="//div[@class='admin__data-grid-header'][(not(ancestor::*[@class='sticky-header']) and not(contains(@style,'visibility: hidden'))) or (ancestor::*[@class='sticky-header' and not(contains(@style,'display: none'))])]//span[contains(@class, 'action-menu-item') and .= '{{action}}']" parameterized="true"/>
33+
<element name="gridDataRow" type="input" selector=".data-row .data-grid-cell-content"/>
3334
</section>
3435
</sections>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminDeleteCmsPageTest.xml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminDeleteCmsPageTest">
12+
<annotations>
13+
<features value="Cms"/>
14+
<stories value="Delete a CMS Page via the Admin"/>
15+
<title value="Admin should be able to delete CMS Pages"/>
16+
<description value="Admin should be able to delete CMS Pages"/>
17+
<group value="Cms"/>
18+
<group value="WYSIWYGDisabled"/>
19+
</annotations>
20+
21+
<before>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23+
<actionGroup ref="AdminNavigateToPageGridActionGroup" stepKey="navigateToCmsPageGrid"/>
24+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridSearchFilters"/>
25+
<actionGroup ref="CreateNewPageWithBasicValues" stepKey="createNewPageWithBasicValues"/>
26+
<actionGroup ref="SaveCmsPageActionGroup" stepKey="clickSaveCmsPageButton"/>
27+
</before>
28+
<after>
29+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilters"/>
30+
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
31+
</after>
32+
33+
<actionGroup ref="AdminSearchCmsPageInGridByUrlKeyActionGroup" stepKey="findCreatedCmsPage">
34+
<argument name="urlKey" value="{{_defaultCmsPage.identifier}}"/>
35+
</actionGroup>
36+
<actionGroup ref="AdminDeleteCmsPageFromGridActionGroup" stepKey="deleteCmsPage">
37+
<argument name="urlKey" value="{{_defaultCmsPage.identifier}}"/>
38+
</actionGroup>
39+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
40+
<argument name="message" value="The page has been deleted."/>
41+
</actionGroup>
42+
<actionGroup ref="AdminSearchCmsPageInGridByUrlKeyActionGroup" stepKey="searchDeletedPage">
43+
<argument name="urlKey" value="{{_defaultCmsPage.identifier}}"/>
44+
</actionGroup>
45+
<actionGroup ref="AssertAdminCmsPageIsNotInGridActionGroup" stepKey="assertCmsPageIsNotInGrid">
46+
<argument name="urlKey" value="{{_defaultCmsPage.identifier}}"/>
47+
</actionGroup>
48+
</test>
49+
</tests>

‎app/code/Magento/Customer/i18n/en_US.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -541,3 +541,4 @@ Addresses,Addresses
541541
"The Date of Birth should not be greater than today.","The Date of Birth should not be greater than today."
542542
"The store view is not in the associated website.","The store view is not in the associated website."
543543
"The Store View selected for sending Welcome email from is not related to the customer's associated website.","The Store View selected for sending Welcome email from is not related to the customer's associated website."
544+
"Add/Update Address","Add/Update Address"

‎app/code/Magento/Customer/view/base/ui_component/customer_form.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@
474474
<modal name="customer_address_update_modal">
475475
<settings>
476476
<options>
477-
<option name="title" xsi:type="string">Add/Update Address</option>
477+
<option name="title" xsi:type="string" translate="true">Add/Update Address</option>
478478
</options>
479479
</settings>
480480
<insertForm name="update_customer_address_form_loader" component="Magento_Customer/js/form/components/insert-form">

‎app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_preview.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@
66
*/
77
-->
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
9+
<head>
10+
<remove src="extjs/resources/css/ext-all.css"/>
11+
<remove src="extjs/resources/css/ytheme-magento.css"/>
12+
<remove src="css/styles-old.css"/>
13+
<remove src="css/styles.css"/>
14+
<remove src="jquery/jstree/themes/default/style.css"/>
15+
</head>
916
<body>
1017
<attribute name="id" value="html-body"/>
1118
<attribute name="class" value="preview-window"/>

0 commit comments

Comments
 (0)