Skip to content

Commit d5fb71a

Browse files
Manjusha.SManjusha.S
Manjusha.S
authored and
Manjusha.S
committed
Resolved conflicts
2 parents 71cfd54 + 8019f6e commit d5fb71a

File tree

6 files changed

+60
-3
lines changed

6 files changed

+60
-3
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<element name="firstProductRow" type="text" selector="table.data-grid tr.data-row:first-of-type"/>
2121
<element name="firstProductRowName" type="text" selector="table.data-grid tr.data-row:first-of-type > td:nth-of-type(4)"/>
2222
<element name="firstProductRowEditButton" type="button" selector="table.data-grid tr.data-row td .action-menu-item:first-of-type"/>
23-
<element name="productThumbnail" type="text" selector="table.data-grid tr:nth-child({{row}}) td.data-grid-thumbnail-cell > span > span > img" parameterized="true"/>
23+
<element name="productThumbnail" type="text" selector="table.data-grid tr:nth-child({{row}}) td.data-grid-thumbnail-cell > img" parameterized="true"/>
2424
<element name="productThumbnailBySrc" type="text" selector="img.admin__control-thumbnail[src*='{{pattern}}']" parameterized="true"/>
2525
<element name="productGridCell" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[normalize-space(.)='{{column}}']/preceding-sibling::th) +1 ]" parameterized="true"/>
2626
<element name="productGridHeaderCell" type="text" selector="//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]" parameterized="true"/>
@@ -40,5 +40,8 @@
4040
<element name="productCollapsibleColumns" type="button" selector="//div[@data-state-collapsible='{{state}}']//strong[@class='admin__collapsible-title']//span[text()='{{expandTitle}}']" parameterized="true"/>
4141
<element name="allowGiftMessageCheckbox" type="checkbox" selector="//input[@type='checkbox' and @name='product[use_config_gift_message_available]']" />
4242
<element name="allowGiftMessageToggle" type="button" selector="//input[@type='checkbox' and @name='product[gift_message_available]' and @value='{{var1}}']/..//label[@class='admin__actions-switch-label']" parameterized="true"/>
43+
<element name="allowGiftsWrapCheckbox" type="checkbox" selector="//input[@type='checkbox' and @name='product[use_config_gift_wrapping_available]']" />
44+
<element name="allowGiftsWrapToggle" type="button" selector="//input[@type='checkbox' and @name='product[use_config_gift_wrapping_available]' and @value='{{var1}}']/../../../..//label[@class='admin__actions-switch-label']" parameterized="true"/>
45+
<element name="priceForGiftsWrapping" type="input" selector="//input[@name='product[gift_wrapping_price]']"/>
4346
</section>
4447
</sections>

‎app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductCartGiftOptionSection.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,26 @@
1616
<element name="update" type="button" selector=".action-update"/>
1717
<element name="cancel" type="button" selector=".action-cancel"/>
1818
<element name="viewGiftOptions" type="button" selector="//tbody[@class='cart item']//a[text()='{{product_name}}']/../../../../..//tr[@class='item-actions']//button[@class='action action-gift']" parameterized="true"/>
19+
<element name="giftWrapIcon" type="button" selector="//img[@title='{{var}}']" parameterized="true"/>
20+
<element name="giftWrapIconPreview" type="button" selector="//div[@class='gift-wrapping-preview']//img[@title='{{var}}']" parameterized="true"/>
21+
<element name="giftsWrappingItemAmt" type="button" selector="//td[@data-th='Gift Wrapping for Items' and text()='${{amt}}']" parameterized="true"/>
22+
<element name="giftsWrappingOrderAmt" type="button" selector="//td[@data-th='Gift Wrapping for Order' and text()='${{amt}}']" parameterized="true"/>
23+
<element name="giftsWrappingPrintedCard" type="button" selector="//td[@data-th='Printed Card' and text()='${{amt}}']" parameterized="true"/>
24+
<element name="editGiftSummary" type="button" selector="//div[@class='gift-summary']//button[@title='Edit']"/>
25+
<element name="removeGift_Wrapping" type="button" selector="//div[@class='gift-wrapping-title']//button[@class='action action-remove']"/>
26+
<element name="giftOptionsMessageSummary" type="text" selector="//div[@class='gift-message-summary' and text()='{{var}}']" parameterized="true"/>
27+
<element name="viewGiftOptionsOrderLevel" type="button" selector="//div[@id='gift-options-cart']//span[text()='Gift options']"/>
28+
<element name="itemLevelGiftsWrapping" type="button" selector="//tbody[@class='cart item']//a[text()='{{product_name}}']/../../../../..//div[@class='gift-summary']//span[@class='gift-wrapping-name' and text()='{{gift_wrapping_name}}']" parameterized="true"/>
29+
<element name="itemLevelGiftsWrappingPrice" type="button" selector="//tbody[@class='cart item']//a[text()='{{product_name}}']/../../../../..//div[@class='gift-summary']//span[@class='price' and text()='${{gift_wrapping_price}}']" parameterized="true"/>
30+
<element name="itemLevelGiftsWrappingMsg" type="button" selector="//tbody[@class='cart item']//div[@class='gift-message-summary']"/>
31+
<element name="giftOptionsOrderLevel" type="button" selector="//div[@class='cart-gift-item']//span[text()='Gift options']"/>
32+
<element name="giftReceipt" type="checkbox" selector="//div[@class='field choice gift-receipt']//input[@type='checkbox']"/>
33+
<element name="printedCard" type="checkbox" selector="//div[@class='field choice gift-printed-card']//input[@type='checkbox']"/>
34+
<element name="orderLevelGiftsWrapping" type="button" selector="//div[@id='gift-options-cart']//span[@class='gift-wrapping-name' and text()='{{giftsWrappingName}}']" parameterized="true"/>
35+
<element name="orderLevelGiftsWrappingPrice" type="button" selector="//div[@id='gift-options-cart']//span[@class='price' and text()='${{gift_wrapping_price}}']" parameterized="true"/>
36+
<element name="orderLevelGiftsWrappingMsg" type="button" selector="//div[@class='cart-gift-item']//div[@class='gift-message-summary']"/>
37+
<element name="orderLevelPrintedCard" type="button" selector="//div[@id='gift-options-cart']//span[text()='Printed card']"/>
38+
<element name="orderLevelPrintedCardPrice" type="button" selector="//div[@id='gift-options-cart']//span[@data-bind='text: getPrintedCardPrice()' and text()='${{printedCard_price}}']" parameterized="true"/>
39+
<element name="orderLevelGiftsReceipt" type="button" selector="//div[@id='gift-options-cart']//span[text()='Gift receipt']"/>
1940
</section>
2041
</sections>

‎app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSetDefaultWebsiteActionGroup.xml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
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+
<actionGroup name="AdminSetDefaultWebsiteActionGroup">
12+
<annotations>
13+
<description>Sets the Website as default.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="websiteName" type="string"/>
17+
</arguments>
18+
19+
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
20+
<click selector="{{AdminStoresGridSection.resetFilterButton}}" stepKey="resetSearchFilter"/>
21+
<fillField userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillSearchWebsiteField"/>
22+
<click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
23+
<see userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="verifyThatCorrectWebsiteFound"/>
24+
<click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
25+
<waitForPageLoad stepKey="waitForStoreToLoad"/>
26+
<checkOption selector="{{AdminNewWebsiteSection.setAsDefault}}" stepKey="checkSetAsDefault"/>
27+
<click selector="{{AdminNewWebsiteActionsSection.saveWebsite}}" stepKey="clickSaveWebsite"/>
28+
<waitForElementVisible selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="waitForStoreGridToReload"/>
29+
<see userInput="You saved the website." stepKey="seeSavedMessage"/>
30+
</actionGroup>
31+
</actionGroups>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
<element name="allowGiftReceipt" type="select" selector="#sales_gift_options_allow_gift_receipt"/>
1414
<element name="allowPrintedCard" type="select" selector="#sales_gift_options_allow_printed_card"/>
1515
<element name="go" type="select" selector="//a[@id='sales_gift_options-head']/ancestor::div[@class='entry-edit-head admin__collapsible-block']"/>
16-
17-
<element name="expandGiftOptions" type="select" selector="//a[@id='sales_gift_options-head' and @class='{{var}}']" parameterized="true"/>
16+
<element name="expandGiftOptions" type="button" selector="//a[@id='sales_gift_options-head' and @class='{{var}}']" parameterized="true"/>
1817
<element name="chkAllowGiftMessagesOnOrderLevel" type="checkbox" selector="//input[@id='sales_gift_options_allow_order_inherit' and @type='checkbox']"/>
1918
<element name="chkAllowGiftMessagesOnOrderItem" type="checkbox" selector="//input[@id='sales_gift_options_allow_items_inherit' and @type='checkbox']"/>
2019
<element name="selectAllowGiftMessagesOnOrderLevel" type="select" selector="//select[@id='sales_gift_options_allow_order']"/>
@@ -23,5 +22,6 @@
2322
<element name="selectAllowWrappingGiftOnItemLevel" type="select" selector="//select[@id='sales_gift_options_wrapping_allow_items']"/>
2423
<element name="selectAllowGiftReceipt" type="select" selector="//select[@id='sales_gift_options_allow_gift_receipt']"/>
2524
<element name="selectAllowPrintedCard" type="select" selector="//select[@id='sales_gift_options_allow_printed_card']"/>
25+
<element name="defaultPrice" type="text" selector="#sales_gift_options_printed_card_price"/>
2626
</section>
2727
</sections>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
<section name="AdminNewWebsiteSection">
1212
<element name="name" type="input" selector="#website_name"/>
1313
<element name="code" type="input" selector="#website_code"/>
14+
<element name="setAsDefault" type="checkbox" selector="#is_default"/>
1415
</section>
1516
</sections>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<element name="storeFilterTextField" type="input" selector="#storeGrid_filter_store_title" timeout="90"/>
1414
<element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]" timeout="30"/>
1515
<element name="resetButton" type="button" selector="button[title='Reset Filter']" timeout="30" deprecated="Use AdminDataGridHeaderSection.clearFilters instead"/>
16+
<element name="resetFilterButton" type="button" selector="//button[@title='Reset Filter']" timeout="30" />
1617
<element name="websiteNameInFirstRow" type="text" selector="tr:nth-of-type(1) &gt; .col-website_title &gt; a"/>
1718
<element name="storeGrpNameInFirstRow" type="text" selector=".col-group_title&gt;a"/>
1819
<element name="storeNameInFirstRow" type="text" selector=".col-store_title&gt;a"/>

0 commit comments

Comments
 (0)