Skip to content

Commit 2268edc

Browse files
authored
Merge pull request #5257 from magento-engcom/2.4-develop-temporary-five-prs
[Magento Community Engineering] Community Contributions
2 parents 90a479f + 5f42ddb commit 2268edc

File tree

27 files changed

+48
-24
lines changed

27 files changed

+48
-24
lines changed

app/code/Magento/Backend/Test/Mftf/Test/AdminLoginTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@
2424
<seeInCurrentUrl url="{{AdminLoginPage.url}}" stepKey="seeAdminLoginUrl"/>
2525
<actionGroup ref="logout" stepKey="logoutFromAdmin"/>
2626
</test>
27-
</tests>
27+
</tests>

app/code/Magento/CardinalCommerce/Test/Mftf/Test/AdminCardinalCommerceSettingsHiddenTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1010
<test name="AdminCardinalCommerceSettingsHiddenTest">
1111
<annotations>
12+
<stories value="Cardinal Commerce Settings"/>
1213
<features value="CardinalCommerce"/>
1314
<title value="CardinalCommerce settings hidden" />
1415
<description value="CardinalCommerce config shouldn't be visible if the 3D secure is disabled for Authorize.Net."/>

app/code/Magento/Catalog/Test/Mftf/Test/ProductAttributeWithoutValueInCompareListTest.xml

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

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="ProductAttributeWithoutValueInCompareListTest">
1212
<annotations>
1313
<features value="Catalog"/>
14+
<stories value="Product Comparison"/>
1415
<title value="Product attribute without value in compare list test"/>
15-
<description
16-
value="The product attribute that has no value should output 'N/A' on the product comparison page."/>
16+
<description value="The product attribute that has no value should output 'N/A' on the product comparison page."/>
1717
<severity value="MINOR"/>
1818
<group value="Catalog"/>
1919
</annotations>
@@ -22,7 +22,7 @@
2222
<createData entity="textProductAttribute" stepKey="createProductAttribute"/>
2323
<createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
2424
<amOnPage url="{{AdminProductAttributeSetEditPage.url}}/$$createAttributeSet.attribute_set_id$$/"
25-
stepKey="onAttributeSetEdit"/>
25+
stepKey="onAttributeSetEdit"/>
2626
<actionGroup ref="AssignAttributeToGroupActionGroup" stepKey="assignAttributeToGroup">
2727
<argument name="group" value="Product Details"/>
2828
<argument name="attribute" value="$$createProductAttribute.attribute_code$$"/>
@@ -69,11 +69,11 @@
6969
</actionGroup>
7070
<!--See attribute default value in the comparison list-->
7171
<see userInput="$createProductAttribute.defaultValue$"
72-
selector="{{StorefrontProductCompareMainSection.ProductAttributeByCodeAndProductName(ProductAttributeFrontendLabel.label, $createProductCustom.name$)}}"
73-
stepKey="assertAttributeValueForProductCustom"/>
72+
selector="{{StorefrontProductCompareMainSection.ProductAttributeByCodeAndProductName(ProductAttributeFrontendLabel.label, $createProductCustom.name$)}}"
73+
stepKey="assertAttributeValueForProductCustom"/>
7474
<!--See N/A if attribute has no value in the comparison list-->
7575
<see userInput="N/A"
76-
selector="{{StorefrontProductCompareMainSection.ProductAttributeByCodeAndProductName(ProductAttributeFrontendLabel.label, $createProductDefault.name$)}}"
77-
stepKey="assertNAForProductDefault"/>
76+
selector="{{StorefrontProductCompareMainSection.ProductAttributeByCodeAndProductName(ProductAttributeFrontendLabel.label, $createProductDefault.name$)}}"
77+
stepKey="assertNAForProductDefault"/>
7878
</test>
7979
</tests>

app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/StorefrontCategoryAccessibleWhenSuffixIsNullTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1010
<test name="StorefrontCategoryAccessibleWhenSuffixIsNullTest">
1111
<annotations>
12+
<stories value="Url rewrites"/>
1213
<title value="Storefront category is accessible when url suffix is set to null test"/>
1314
<description value="Check no crash occurs on Category page when catalog/seo/category_url_suffix is set to null"/>
1415
<features value="CatalogUrlRewrite"/>

app/code/Magento/CheckoutAgreements/Test/Mftf/ActionGroup/DeleteTermActionGroup.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="DeleteTermActionGroup">
1212
<arguments>
13-
<argument name="term" />
13+
<argument name="term"/>
1414
</arguments>
1515
<amOnPage url="{{AdminTermsPage.url}}" stepKey="onTermGridPage"/>
1616
<waitForPageLoad stepKey="waitForAdminTermsGridPageLoad"/>
@@ -19,8 +19,8 @@
1919
<click selector="{{AdminTermGridSection.firstRowConditionId}}" stepKey="clickFirstRow"/>
2020
<waitForPageLoad stepKey="waitForEditTermPageLoad"/>
2121
<click selector="{{AdminEditTermFormSection.delete}}" stepKey="clickDeleteButton"/>
22+
<waitForElementVisible selector="{{AdminEditTermFormSection.acceptPopupButton}}" stepKey="waitForElement"/>
2223
<click selector="{{AdminEditTermFormSection.acceptPopupButton}}" stepKey="clickDeleteOkButton"/>
23-
<waitForPageLoad stepKey="waitForAdminTermsGridPageLoad2"/>
24-
<see selector="{{AdminTermFormMessagesSection.successMessage}}" userInput="You deleted the condition." stepKey="seeSuccessMessage"/>
24+
<waitForText selector="{{AdminTermFormMessagesSection.successMessage}}" userInput="You deleted the condition." stepKey="seeSuccessMessage"/>
2525
</actionGroup>
26-
</actionGroups>
26+
</actionGroups>

app/code/Magento/Cms/Test/Mftf/Test/AdminCMSPageCreateDisabledPageTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<test name="AdminCMSPageCreateDisabledPageTest">
1111
<annotations>
1212
<features value="Cms"/>
13+
<stories value="Create a CMS Page via the Admin"/>
1314
<title value="Create disabled CMS Page via the Admin"/>
1415
<description value="Admin should be able to create a CMS Page"/>
1516
<severity value="CRITICAL"/>

app/code/Magento/Cms/Test/Mftf/Test/AdminCMSPageCreatePageForDefaultStoreTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<test name="AdminCMSPageCreatePageForDefaultStoreTest">
1111
<annotations>
1212
<features value="Cms"/>
13+
<stories value="Create a CMS Page via the Admin"/>
1314
<title value="Create CMS Page via the Admin for default store"/>
1415
<description value="Admin should be able to create a CMS Page"/>
1516
<severity value="CRITICAL"/>

app/code/Magento/Cms/Test/Mftf/Test/AdminCMSPageCreatePageInSingleStoreModeTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<test name="AdminCMSPageCreatePageInSingleStoreModeTest">
1111
<annotations>
1212
<features value="Cms"/>
13+
<stories value="Create a CMS Page via the Admin"/>
1314
<title value="Create CMS Page via the Admin in single store mode"/>
1415
<description value="Admin should be able to create a CMS Page"/>
1516
<severity value="CRITICAL"/>

app/code/Magento/Cms/Test/Mftf/Test/AdminCMSPageCreatePageTest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1010
<test name="AdminCMSPageCreatePageTest">
1111
<annotations>
1212
<features value="Cms"/>
13+
<stories value="Create a CMS Page via the Admin"/>
1314
<title value="Create CMS Page via the Admin"/>
1415
<description value="Admin should be able to create a CMS Page"/>
1516
<severity value="CRITICAL"/>

app/code/Magento/Cms/Test/Mftf/Test/AdminCMSPageCreatePageWithBlockTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<test name="AdminCMSPageCreatePageWithBlockTest">
1111
<annotations>
1212
<features value="Cms"/>
13+
<stories value="Create a CMS Page via the Admin"/>
1314
<title value="Create CMS Page that contains block content via the Admin"/>
1415
<description value="Admin should be able to create a CMS Page"/>
1516
<severity value="CRITICAL"/>

0 commit comments

Comments
 (0)