Skip to content

Commit cb68a13

Browse files
aakimovaakimov
committed
Merge remote-tracking branch 'mainline/2.2-develop' into 2.2.8-develop
2 parents 098f5a6 + e592fca commit cb68a13

File tree

51 files changed

+918
-157
lines changed

Some content is hidden

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

51 files changed

+918
-157
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminMainActionsSection">
1212
<element name="save" type="button" selector="#save" timeout="30"/>
13+
<element name="saveAndContinue" type="button" selector="button[id*=save_and_]" timeout="30"/>
1314
<element name="delete" type="button" selector="#delete"/>
1415
<element name="add" type="button" selector="#add" timeout="30"/>
1516
<element name="back" type="button" selector="#back" timeout="30"/>

‎app/code/Magento/Backend/Test/Mftf/Section/AdminPopupModalSection.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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
10+
<section name="AdminPopupModalSection">
11+
<element name="message" type="text" selector="aside.modal-popup .modal-content .popup-window-content"/>
12+
<element name="ok" type="button" selector="//span[contains(text(),'Ok')]/ancestor::button"/>
13+
</section>
14+
</sections>

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,4 +226,35 @@
226226
<click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSectionAssert"/>
227227
<seeInField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="assertFieldUrlKey"/>
228228
</actionGroup>
229+
230+
<!--Create a Simple Product-->
231+
<actionGroup name="CreateSimpleProductAndAddToWebsite">
232+
<arguments>
233+
<argument name="product"/>
234+
<argument name="website" type="string"/>
235+
</arguments>
236+
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGrid"/>
237+
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
238+
<click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
239+
<fillField userInput="{{product.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillProductName"/>
240+
<fillField userInput="{{product.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillProductSKU"/>
241+
<fillField userInput="{{product.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillProductPrice"/>
242+
<fillField userInput="{{product.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillProductQuantity"/>
243+
<click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProductInWebsites"/>
244+
<click selector="{{ProductInWebsitesSection.website(website)}}" stepKey="selectWebsite"/>
245+
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
246+
<waitForPageLoad stepKey="waitForProductPageSave"/>
247+
<see selector="{{AdminMessagesSection.success}}" userInput="You saved the product." stepKey="seeSaveConfirmation"/>
248+
</actionGroup>
249+
250+
<actionGroup name="AdminAssignProductToCategory">
251+
<arguments>
252+
<argument name="productId" type="string"/>
253+
<argument name="categoryName" type="string"/>
254+
</arguments>
255+
<amOnPage url="{{AdminProductEditPage.url(productId)}}" stepKey="amOnPage"/>
256+
<searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{categoryName}}]" stepKey="selectCategory"/>
257+
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton"/>
258+
<see selector="{{AdminMessagesSection.success}}" userInput="You saved the product." stepKey="seeSaveProductMessage"/>
259+
</actionGroup>
229260
</actionGroups>

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,19 @@
260260
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
261261
<requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
262262
</entity>
263+
<entity name="ApiSimpleTwoHidden" type="product2">
264+
<data key="sku" unique="suffix">api-simple-product-two</data>
265+
<data key="type_id">simple</data>
266+
<data key="attribute_set_id">4</data>
267+
<data key="visibility">1</data>
268+
<data key="name" unique="suffix">Api Simple Product Two</data>
269+
<data key="price">234.00</data>
270+
<data key="urlKey" unique="suffix">api-simple-product-two</data>
271+
<data key="status">1</data>
272+
<data key="quantity">100</data>
273+
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
274+
<requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
275+
</entity>
263276
<entity name="ProductWithOptions2" type="product">
264277
<var key="sku" entityType="product" entityKey="sku" />
265278
<requiredEntity type="product_option">ProductOptionDropDownWithLongValuesTitle</requiredEntity>

‎app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeFormPage.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@
1212
<section name="StorefrontPropertiesSection"/>
1313
<section name="AdvancedAttributePropertiesSection"/>
1414
<section name="AdminAttributeOptionsSection"/>
15+
<section name="AttributeManageSwatchSection"/>
1516
</page>
1617
</pages>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<element name="scope" type="select" selector="#is_global"/>
2929
<element name="addToColumnOptions" type="select" selector="#is_used_in_grid"/>
3030
<element name="useInFilterOptions" type="select" selector="#is_filterable_in_grid"/>
31+
<element name="addSwatch" type="button" selector="#add_new_swatch_text_option_button"/>
3132
</section>
3233
<section name="AdminAttributeOptionsSection">
3334
<element name="addOption" type="button" selector="#add_new_option_button"/>
@@ -38,4 +39,8 @@
3839
<element name="storefrontPropertiesTab" selector="#product_attribute_tabs_front" type="button" timeout="30"/>
3940
<element name="useForPromoRuleConditions" type="select" selector="#is_used_for_promo_rules"/>
4041
</section>
42+
<section name="AttributeManageSwatchSection">
43+
<element name="swatchField" type="input" selector="input[name='swatchtext[value][option_{{option_index}}][{{index}}]'][placeholder='Swatch']" parameterized="true"/>
44+
<element name="descriptionField" type="input" selector="input[name='optiontext[value][option_{{option_index}}][{{index}}]'][placeholder='Description']" parameterized="true"/>
45+
</section>
4146
</sections>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@
105105
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
106106
<argument name="websiteName" value="{{SecondWebsite.name}}"/>
107107
</actionGroup>
108-
<actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearWebsitesFilters"/>
109108
<!--Clear products filter-->
110109
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
111110
<actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductsFilters"/>

0 commit comments

Comments
 (0)