Skip to content

Commit e366ef0

Browse files
dimonovpdimonovp
committed
Merge remote-tracking branch 'origin/MAGETWO-96221' into 2.2-develop-mftf-pr11
2 parents 150ce4a + 028df77 commit e366ef0

File tree

5 files changed

+47
-8
lines changed

5 files changed

+47
-8
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,11 @@
8787
<see selector="{{AdminCategoryProductsGridSection.skuColumn}}" userInput="{{product.sku}}" stepKey="seeProductSkuInGrid"/>
8888
<see selector="{{AdminCategoryProductsGridSection.priceColumn}}" userInput="{{product.price}}" stepKey="seeProductPriceInGrid"/>
8989
</actionGroup>
90+
91+
<!-- Save category form -->
92+
<actionGroup name="saveCategoryForm">
93+
<seeInCurrentUrl url="{{AdminCategoryPage.url}}" stepKey="seeOnCategoryPage"/>
94+
<click selector="{{AdminMainActionsSection.save}}" stepKey="saveCategory"/>
95+
<seeElement selector="{{AdminMessagesSection.success}}" stepKey="assertSuccess"/>
96+
</actionGroup>
9097
</actionGroups>

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

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,10 @@
9797
<argument name="website"/>
9898
</arguments>
9999
<scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToWebsites"/>
100-
<click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="clickToOpenProductInWebsite"/>
100+
<conditionalClick selector="{{ProductInWebsitesSection.sectionHeader}}" dependentSelector="{{ProductInWebsitesSection.website(website.name)}}" visible="false" stepKey="clickToOpenProductInWebsite"/>
101101
<waitForPageLoad stepKey="waitForPageOpened"/>
102102
<click selector="{{ProductInWebsitesSection.website(website.name)}}" stepKey="selectWebsite"/>
103103
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
104-
<waitForPageLoad time='60' stepKey="waitForPageOpened1"/>
105104
</actionGroup>
106105

107106
<actionGroup name="ProductSetAdvancedPricing">
@@ -149,7 +148,6 @@
149148
</arguments>
150149
<scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToWebsites"/>
151150
<click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="clickToOpenProductInWebsite"/>
152-
<waitForPageLoad stepKey="waitForPageOpened"/>
153151
<checkOption selector="{{ProductInWebsitesSection.website(website)}}" stepKey="selectWebsite"/>
154152
</actionGroup>
155153

@@ -188,4 +186,29 @@
188186
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
189187
<see selector="{{AdminMessagesSection.success}}" userInput="You saved the product." stepKey="seeSaveConfirmation"/>
190188
</actionGroup>
189+
190+
<!--Create simple product and assign to category in Admin-->
191+
<actionGroup name="AdminCreateSimpleProductAndAssignToCategory">
192+
<arguments>
193+
<argument name="category"/>
194+
<argument name="simpleProduct"/>
195+
</arguments>
196+
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
197+
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
198+
<click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
199+
<fillField userInput="{{simpleProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
200+
<fillField userInput="{{simpleProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
201+
<fillField userInput="{{simpleProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
202+
<fillField userInput="{{simpleProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
203+
<searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{category.name}}]" stepKey="searchAndSelectCategory"/>
204+
<click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
205+
<fillField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
206+
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
207+
<seeElement selector="{{AdminMessagesSection.success}}" stepKey="assertSaveMessageSuccess"/>
208+
<seeInField userInput="{{simpleProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="assertFieldName"/>
209+
<seeInField userInput="{{simpleProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="assertFieldSku"/>
210+
<seeInField userInput="{{simpleProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="assertFieldPrice"/>
211+
<click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSectionAssert"/>
212+
<seeInField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="assertFieldUrlKey"/>
213+
</actionGroup>
191214
</actionGroups>

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

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

99
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
11-
<page name="AdminCategoryPage" url="catalog/category/" area="admin" module="Catalog">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
11+
<page name="AdminCategoryPage" url="catalog/category/" area="admin" module="Magento_Catalog">
1212
<section name="AdminCategorySidebarActionSection"/>
1313
<section name="AdminCategorySidebarTreeSection"/>
1414
<section name="AdminCategoryBasicFieldSection"/>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
<severity value="CRITICAL"/>
1717
<testCaseId value="MAGETWO-76081"/>
1818
<group value="configurable_product"/>
19-
<skip>
20-
<issueId value="MAGETWO-96271"/>
21-
</skip>
2219
</annotations>
2320
<before>
2421
<createData entity="ApiCategory" stepKey="createCategory"/>

‎app/code/Magento/Store/Test/Mftf/Page/StorefrontStoreHomePage.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
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+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
9+
<page name="StorefrontStoreHomePage" url="/{{store_view}}/" area="storefront" module="Magento_Store" parameterized="true">
10+
<section name="StorefrontHeaderSection"/>
11+
</page>
12+
</pages>

0 commit comments

Comments
 (0)