Skip to content

Commit 0102b7d

Browse files
naydavnaydav
committed
Merge remote-tracking branch 'origin/2.3-develop' into graphql-develop-prs-fast
2 parents 83d5246 + cde6dba commit 0102b7d

File tree

62 files changed

+1385
-25
lines changed

Some content is hidden

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

62 files changed

+1385
-25
lines changed

‎app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,7 @@
1313
<element name="adminUserAccountText" type="text" selector=".page-header .admin-user-account-text" />
1414
<!-- Legacy heading section. Mostly used for admin 404 and 403 pages -->
1515
<element name="pageHeading" type="text" selector=".page-content .page-heading"/>
16+
<!-- Used for page not found error -->
17+
<element name="pageNotFoundTitle" type="text" selector=".page-title span"/>
1618
</section>
1719
</sections>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
<deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
3232
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
3333
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
34+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndexPage"/>
35+
<actionGroup ref="deleteProductsIfTheyExist" stepKey="deleteAllProducts"/>
3436
<actionGroup ref="logout" stepKey="logout"/>
3537
</after>
3638
<!-- go to bundle product creation page-->

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
<deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
3333
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
3434
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
35+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndexPage"/>
36+
<actionGroup ref="deleteProductsIfTheyExist" stepKey="deleteAllProducts"/>
3537
<actionGroup ref="logout" stepKey="logout"/>
3638
</after>
3739
<!-- go to bundle product creation page-->

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillProductAttributePropertiesActionGroup.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminFillProductAttributePropertiesActionGroup">
11+
<arguments>
12+
<argument name="attributeName" type="string"/>
13+
<argument name="attributeType" type="string"/>
14+
</arguments>
15+
<fillField selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{attributeName}}" stepKey="fillDefaultLabel"/>
16+
<selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="{{attributeType}}" stepKey="selectInputType"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenAttributeSetByNameActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminOpenAttributeSetByNameActionGroup">
11+
<arguments>
12+
<argument name="attributeSetName" type="string" defaultValue="Default"/>
13+
</arguments>
14+
<click selector="{{AdminProductAttributeSetGridSection.AttributeSetName(attributeSetName)}}" stepKey="chooseAttributeSet"/>
15+
<waitForPageLoad stepKey="waitForAttributeSetPageLoad"/>
16+
</actionGroup>
17+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenAttributeSetGridPageActionGroup.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminOpenAttributeSetGridPageActionGroup">
11+
<amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSetPage"/>
12+
<waitForPageLoad stepKey="waitForAttributeSetPageLoad"/>
13+
</actionGroup>
14+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenProductAttributePageActionGroup.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminOpenProductAttributePageActionGroup">
11+
<amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToAttributePage"/>
12+
<waitForPageLoad stepKey="waitForAttributePageLoad"/>
13+
</actionGroup>
14+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenProductIndexPageActionGroup.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminOpenProductIndexPageActionGroup">
11+
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndexPage"/>
12+
<waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
13+
</actionGroup>
14+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontCustomProductAttributeActionGroup.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AssertStorefrontCustomProductAttributeActionGroup">
11+
<arguments>
12+
<argument name="attributeLabel" type="string"/>
13+
<argument name="attributeValue" type="string"/>
14+
</arguments>
15+
<see userInput="{{attributeLabel}}" selector="{{StorefrontProductMoreInformationSection.customAttributeLabel(attributeLabel)}}" stepKey="seeAttributeLabel" />
16+
<see userInput="{{attributeValue}}" selector="{{StorefrontProductMoreInformationSection.customAttributeValue(attributeLabel)}}" stepKey="seeAttributeValue" />
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenStorefrontProductPageByProductNameActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="OpenStorefrontProductPageByProductNameActionGroup">
11+
<arguments>
12+
<argument name="productName" type="string" defaultValue="{{_defaultProduct.name}}"/>
13+
</arguments>
14+
<amOnPage url="{{productName}}.html" stepKey="amOnProductPage"/>
15+
<waitForPageLoad stepKey="waitForProductPageLoad"/>
16+
</actionGroup>
17+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,11 @@
110110
<data key="is_active">false</data>
111111
<data key="include_in_menu">false</data>
112112
</entity>
113+
<!-- Category from file "prepared-for-sample-data.csv"-->
114+
<entity name="Gear" type="category">
115+
<data key="name">Gear</data>
116+
<data key="name_lwr">gear</data>
117+
<data key="is_active">true</data>
118+
<data key="include_in_menu">true</data>
119+
</entity>
113120
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,4 +320,27 @@
320320
<data key="option1_admin" unique="suffix">opt1'Admin</data>
321321
<data key="option1_frontend" unique="suffix">opt1'Front</data>
322322
</entity>
323+
<entity name="productTextEditorAttribute" type="ProductAttribute">
324+
<data key="attribute_code" unique="suffix">attribute</data>
325+
<data key="frontend_input">texteditor</data>
326+
<data key="scope">global</data>
327+
<data key="is_required">false</data>
328+
<data key="is_unique">false</data>
329+
<data key="is_searchable">true</data>
330+
<data key="is_visible">true</data>
331+
<data key="backend_type">text</data>
332+
<data key="is_wysiwyg_enabled">true</data>
333+
<data key="is_visible_in_advanced_search">true</data>
334+
<data key="is_visible_on_front">true</data>
335+
<data key="is_filterable">true</data>
336+
<data key="is_filterable_in_search">true</data>
337+
<data key="used_in_product_listing">true</data>
338+
<data key="is_used_for_promo_rules">true</data>
339+
<data key="is_comparable">true</data>
340+
<data key="is_used_in_grid">true</data>
341+
<data key="is_visible_in_grid">true</data>
342+
<data key="is_filterable_in_grid">true</data>
343+
<data key="used_for_sort_by">true</data>
344+
<requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
345+
</entity>
323346
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Data/WYSIWYGConfigData.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="EnableWYSIWYG">
12+
<data key="path">cms/wysiwyg/enabled</data>
13+
<data key="scope_id">0</data>
14+
<data key="label">Yes</data>
15+
<data key="value">enabled</data>
16+
</entity>
17+
<entity name="EnableTinyMCE4">
18+
<data key="path">cms/wysiwyg/editor</data>
19+
<data key="scope_id">0</data>
20+
<data key="label">Yes</data>
21+
<data key="value">mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter</data>
22+
</entity>
23+
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
<element name="EnableWYSIWYG" type="select" selector="#enabled"/>
4949
<element name="useForPromoRuleConditions" type="select" selector="#is_used_for_promo_rules"/>
5050
<element name="StorefrontPropertiesSectionToggle" type="button" selector="#front_fieldset-wrapper"/>
51+
<element name="visibleOnCatalogPagesOnStorefront" type="select" selector="#is_visible_on_front"/>
5152
</section>
5253
<section name="WYSIWYGProductAttributeSection">
5354
<element name="ShowHideBtn" type="button" selector="#toggledefault_value_texteditor"/>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@
195195
</section>
196196
<section name="ProductDescriptionWysiwygSection">
197197
<element name="EditArea" type="text" selector="#editorproduct_form_description .mce-edit-area"/>
198+
<element name="attributeEditArea" type="textarea" selector="#product_form_{{attributeCode}}" parameterized="true" timeout="30"/>
198199
</section>
199200
<section name="ProductShortDescriptionWysiwygSection">
200201
<element name="EditArea" type="text" selector="#editorproduct_form_short_description .mce-edit-area"/>

‎app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMoreInformationSection.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
<section name="StorefrontProductMoreInformationSection">
1212
<element name="moreInformation" type="button" selector="#tab-label-additional-title" timeout="30"/>
1313
<element name="moreInformationTextArea" type="textarea" selector="#additional"/>
14+
<element name="moreInformationSpecs" type="text" selector="#product-attribute-specs-table"/>
15+
<element name="customAttributeLabel" type="text" selector="//th[./following-sibling::td[@data-th='{{attributeCode}}']]" parameterized="true" />
16+
<element name="customAttributeValue" type="text" selector="//td[@data-th='{{attributeCode}}']" parameterized="true" />
1417
<element name="attributeLabel" type="text" selector=".col.label"/>
1518
<element name="attributeValue" type="text" selector=".col.data"/>
1619
</section>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@
3434
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
3535
</before>
3636
<after>
37+
<!-- Delete product attribute -->
38+
<deleteData createDataKey="attribute" stepKey="deleteProductAttribute"/>
39+
40+
<!-- Delete product attribute set -->
41+
<deleteData createDataKey="createAttributeSet" stepKey="deleteAttributeSet"/>
42+
3743
<actionGroup ref="logout" stepKey="logout"/>
3844
</after>
3945

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

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
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="AdminCreateTextEditorProductAttributeTest">
12+
<annotations>
13+
<features value="Catalog"/>
14+
<stories value="Create product Attribute"/>
15+
<title value="Admin create text editor product attribute test"/>
16+
<description value="Create text editor product attribute with TinyMCE4 enabled"/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="MC-6338"/>
19+
<group value="catalog"/>
20+
</annotations>
21+
<before>
22+
<!-- Enable WYSIWYG editor -->
23+
<magentoCLI command="config:set {{EnableWYSIWYG.path}} {{EnableWYSIWYG.value}}" stepKey="enableWYSIWYG"/>
24+
25+
<!-- Enable TinyMCE 4 -->
26+
<magentoCLI command="config:set {{EnableTinyMCE4.path}} {{EnableTinyMCE4.value}}" stepKey="enableTinyMCE4"/>
27+
28+
<!-- Login as admin -->
29+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
30+
</before>
31+
<after>
32+
<!-- Delete attribute -->
33+
<actionGroup ref="deleteProductAttribute" stepKey="deleteAttribute">
34+
<argument name="ProductAttribute" value="productTextEditorAttribute"/>
35+
</actionGroup>
36+
37+
<!-- Delete product -->
38+
<actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
39+
<argument name="product" value="_defaultProduct"/>
40+
</actionGroup>
41+
42+
<!-- Log out -->
43+
<actionGroup ref="logout" stepKey="logout"/>
44+
</after>
45+
46+
<!-- Go to Stores > Product, click "Add New Attribute" -->
47+
<actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="openProductAttributePage"/>
48+
<click selector="{{AdminProductAttributeGridSection.createNewAttributeBtn}}" stepKey="createNewAttribute"/>
49+
50+
<!-- Input value for Default Label. Verify dropdown of "Catalog Input Type for Store Owner" -->
51+
<actionGroup ref="AdminFillProductAttributePropertiesActionGroup" stepKey="fillAttributeProperties">
52+
<argument name="attributeName" value="{{productTextEditorAttribute.attribute_code}}"/>
53+
<argument name="attributeType" value="{{productTextEditorAttribute.frontend_input}}"/>
54+
</actionGroup>
55+
56+
<!-- Input value for "Catalog Input Type for Store Owner" -->
57+
<selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="{{productAttributeWysiwyg.frontend_input}}" stepKey="updateInputType"/>
58+
59+
<!-- Click on "Storefront Properties" tab on left menu -->
60+
<click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="clickStorefrontPropertiesTab"/>
61+
<dontSeeElement selector="{{StorefrontPropertiesSection.EnableWYSIWYG}}" stepKey="dontSeeWYSIWYGEnableField"/>
62+
63+
<!-- Selection for "Visible on Catalog Pages on Storefront" -->
64+
<selectOption selector="{{StorefrontPropertiesSection.visibleOnCatalogPagesOnStorefront}}" userInput="Yes" stepKey="enableVisibleOnStorefront"/>
65+
<scrollToTopOfPage stepKey="scrollToPageTop"/>
66+
67+
<!-- Go back to "Properties" tab on left menu -->
68+
<click selector="{{AttributePropertiesSection.propertiesTab}}" stepKey="clickPropertiesTab"/>
69+
70+
<!-- Updated value for "Catalog Input Type for Store Owner" -->
71+
<selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="{{productTextEditorAttribute.frontend_input}}" stepKey="returnInputType"/>
72+
73+
<!-- Save Product Attribute -->
74+
<actionGroup ref="saveProductAttribute" stepKey="saveAttribute"/>
75+
76+
<!-- Go to Store > Attribute Set -->
77+
<actionGroup ref="AdminOpenAttributeSetGridPageActionGroup" stepKey="openAttributeSetPage"/>
78+
79+
<!-- From grid, click on attribute set Default -->
80+
<actionGroup ref="AdminOpenAttributeSetByNameActionGroup" stepKey="openDefaultAttributeSet"/>
81+
82+
<!-- Add Product Attribute to Default attribute by dragging and dropping this to the 'Project Details' folder. Then Save. -->
83+
<actionGroup ref="AssignAttributeToGroup" stepKey="assignAttributeToGroup">
84+
<argument name="group" value="Product Details"/>
85+
<argument name="attribute" value="{{productTextEditorAttribute.attribute_code}}"/>
86+
</actionGroup>
87+
<actionGroup ref="SaveAttributeSet" stepKey="saveAttributeSet"/>
88+
89+
<!-- Go Catalog > Product to create new product page -->
90+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductIndexPage"/>
91+
<actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
92+
<argument name="product" value="_defaultProduct"/>
93+
</actionGroup>
94+
95+
<!-- On product page, select Attribute Set: "Default" -->
96+
<actionGroup ref="AdminProductPageSelectAttributeSet" stepKey="selectAttributeSet">
97+
<argument name="attributeSetName" value="Default"/>
98+
</actionGroup>
99+
100+
<!-- Created product attribute appear on product form -->
101+
<seeElement selector="{{AdminProductFormSection.attributeLabelByText(productTextEditorAttribute.attribute_code)}}" stepKey="seeAttributeLabelInProductForm"/>
102+
103+
<!-- TinyMCE 4 is displayed in WYSIWYG content area -->
104+
<seeElement selector="{{TinyMCESection.TinyMCE4}}" stepKey="seeTinyMCE4"/>
105+
106+
<!-- Verify toolbar menu -->
107+
<actionGroup ref="VerifyTinyMCEActionGroup" stepKey="verifyToolbarMenu"/>
108+
109+
<!-- Click Show/Hide button and see Insert Image button -->
110+
<scrollToTopOfPage stepKey="scrollToTop"/>
111+
<click selector="{{ProductAttributeWYSIWYGSection.showHideBtn(productTextEditorAttribute.attribute_code)}}" stepKey="clickShowHideBtn"/>
112+
<waitForElementVisible selector="{{TinyMCESection.InsertImageBtn}}" stepKey="waitForInsertImageBtn"/>
113+
114+
<!-- Add content into attribute -->
115+
<fillField selector="{{ProductDescriptionWysiwygSection.attributeEditArea(productTextEditorAttribute.attribute_code)}}" userInput="This content from product page" stepKey="setContent"/>
116+
117+
<!-- Fill up all required fields for product form -->
118+
<actionGroup ref="fillMainProductForm" stepKey="fillProductForm"/>
119+
<actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
120+
121+
<!-- Assert product attribute on Storefront -->
122+
<actionGroup ref="OpenStorefrontProductPageByProductNameActionGroup" stepKey="openProductPage"/>
123+
<scrollTo stepKey="scrollToMoreInformation" selector="{{StorefrontProductMoreInformationSection.moreInformationSpecs}}" />
124+
<actionGroup ref="AssertStorefrontCustomProductAttributeActionGroup" stepKey="checkAttributeInMoreInformationTab">
125+
<argument name="attributeLabel" value="{{productTextEditorAttribute.attribute_code}}"/>
126+
<argument name="attributeValue" value="This content from product page"/>
127+
</actionGroup>
128+
</test>
129+
</tests>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertShippingMethodOptionPresentInCartActionGroup.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+
<!-- Assert shipping method name and price are present in cart -->
12+
<actionGroup name="StorefrontAssertShippingMethodOptionPresentInCartActionGroup">
13+
<arguments>
14+
<argument name="methodName" type="string"/>
15+
<argument name="price" type="string"/>
16+
</arguments>
17+
<see selector="{{CheckoutCartSummarySection.methodName}}" userInput="{{methodName}}" stepKey="seeShippingName"/>
18+
<see selector="{{CheckoutCartSummarySection.shippingPrice}}" userInput="{{price}}" stepKey="seeShippingPrice"/>
19+
</actionGroup>
20+
</actionGroups>

0 commit comments

Comments
 (0)