Skip to content

Commit 0e67c0b

Browse files
dimonovpdimonovp
committed
MAGETWO-96245: Verify that Gift Wrapping can be applied on Order Level and Ordered Items for Additional Website
1 parent 7a3ee17 commit 0e67c0b

File tree

7 files changed

+64
-3
lines changed

7 files changed

+64
-3
lines changed

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,4 +226,24 @@
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>
229249
</actionGroups>

‎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"/>

‎app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<sections 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/SectionObject.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminSalesConfigSection">
1212
<element name="enableMAPUseSystemValue" type="checkbox" selector="#sales_msrp_enabled_inherit"/>
1313
<element name="enableMAPSelect" type="select" selector="#sales_msrp_enabled"/>

‎app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,6 @@
2323
<click selector="{{AdminStoresDeleteStoreGroupSection.deleteStoreGroupButton}}" stepKey="clickDeleteWebsiteButton"/>
2424
<waitForElementVisible selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="waitForStoreGridToReload"/>
2525
<see userInput="You deleted the website." stepKey="seeSavedMessage"/>
26+
<conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
2627
</actionGroup>
2728
</actionGroups>

‎app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchWebsiteActionGroup.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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="AdminSwitchWebsiteActionGroup">
11+
<arguments>
12+
<argument name="website"/>
13+
</arguments>
14+
<scrollToTopOfPage stepKey="scrollToTopOfPage" />
15+
<click selector="{{AdminMainActionsSection.storeViewDropdown}}" stepKey="clickWebsiteSwitchDropdown"/>
16+
<waitForElementVisible selector="{{AdminMainActionsSection.websiteByName('Main Website')}}" stepKey="waitForWebsiteAreVisible"/>
17+
<click selector="{{AdminMainActionsSection.websiteByName(website.name)}}" stepKey="clickWebsiteByName"/>
18+
<waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitingForInformationModal"/>
19+
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreSwitch"/>
20+
<see userInput="{{website.name}}" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewWebsiteName"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/Store/Test/Mftf/Data/StoreData.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,24 @@
5757
<data key="store_type">store</data>
5858
<requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
5959
</entity>
60+
<entity name="CustomStoreENNotUnique" type="store">
61+
<data key="name">EN</data>
62+
<data key="code">en</data>
63+
<data key="is_active">1</data>
64+
<data key="store_id">null</data>
65+
<data key="store_action">add</data>
66+
<data key="store_type">store</data>
67+
<requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
68+
</entity>
69+
<entity name="CustomStoreNLNotUnique" type="store">
70+
<data key="name">NL</data>
71+
<data key="code">nl</data>
72+
<data key="is_active">1</data>
73+
<data key="store_id">null</data>
74+
<data key="store_action">add</data>
75+
<data key="store_type">store</data>
76+
<requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
77+
</entity>
6078
<entity name="secondStore" type="store">
6179
<data key="name">Second Store View</data>
6280
<data key="code">second_store_view</data>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
-->
88

99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminMainActionsSection">
1212
<element name="storeSwitcher" type="text" selector=".store-switcher"/>
1313
<element name="storeViewDropdown" type="button" selector="#store-change-button"/>
1414
<element name="storeViewByName" type="button" selector="//*[@class='store-switcher-store-view ']/a[contains(text(), '{{storeViewName}}')]" timeout="30" parameterized="true"/>
15+
<element name="websiteByName" type="button" selector="//*[@class='store-switcher-website ']/a[contains(text(), '{{websiteName}}')]" timeout="30" parameterized="true"/>
1516
</section>
1617
</sections>

0 commit comments

Comments
 (0)