Skip to content

Commit b3f3913

Browse files
Manjusha.SManjusha.S
Manjusha.S
authored and
Manjusha.S
committed
Merge branch 'AC-2803-1' into functional-testing-automation
2 parents cdd40bb + 2d5f8b7 commit b3f3913

File tree

4 files changed

+91
-0
lines changed

4 files changed

+91
-0
lines changed

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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="AdminAddMultipleSimpleProductToBundleProductActionGroup">
12+
<annotations>
13+
<description>Admin Add multiple Simple Product to bundled products</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="product" defaultValue="_defaultProduct"/>
17+
</arguments>
18+
<conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
19+
<click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
20+
<fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillProductSkuFilter"/>
21+
<click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
22+
<waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad" time="30"/>
23+
<checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
24+
</actionGroup>
25+
</actionGroups>

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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="AdminAddOptionToBundleProductActionGroup">
12+
<annotations>
13+
<description>Admin Add Option to bundled products</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="categoryName" type="string"/>
17+
<argument name="website" defaultValue="Main Website" type="string"/>
18+
</arguments>
19+
<click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="openDropDown"/>
20+
<checkOption selector="{{AdminProductFormSection.selectCategory(categoryName)}}" stepKey="selectCategory"/>
21+
<conditionalClick selector="{{AdminProductGridSection.productCollapsibleColumns('closed','Product in Websites')}}" dependentSelector="{{AdminProductGridSection.productCollapsibleColumns('closed','Product in Websites')}}" visible="true" stepKey="expandProductInWebsites"/>
22+
<checkOption selector="{{AdminProductGridSection.checkOtherWebsites(website)}}" stepKey="checkMainWebsite"/>
23+
<scrollTo selector="{{AdminProductFormBundleSection.contentDropDown}}" stepKey="scrollToBundleSection"/>
24+
<conditionalClick selector="{{AdminProductGridSection.productCollapsibleColumns('closed','Product in Websites')}}" dependentSelector="{{AdminProductGridSection.productCollapsibleColumns('closed','Product in Websites')}}" visible="true" stepKey="expandBundleItem"/>
25+
<selectOption userInput="Separately" selector="{{AdminProductFormBundleSection.shipmentType}}" stepKey="SelectShipBundleItemsAsTogether"/>
26+
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption"/>
27+
<waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForAddOptionLoad" time="30"/>
28+
<wait time="5" stepKey="waitForOptionsToPopulate"/>
29+
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="option1" stepKey="fillOptionTitle"/>
30+
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="Drop-down" stepKey="selectInputTypeAsDropDown"/>
31+
<waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
32+
<click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
33+
<waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
34+
</actionGroup>
35+
</actionGroups>

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="StorefrontAddMultipleSimpleProductToBundleProductActionGroup">
11+
<annotations>
12+
<description>"Adding multiple simple product under bundle products" </description>
13+
</annotations>
14+
15+
<click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomizeAndAddToCart"/>
16+
<click selector="{{StorefrontBundleProductActionSection.dropdownSelectOption}}" stepKey="clickOnSelectOption"/>
17+
<seeElement selector="{{StorefrontBundleProductActionSection.dropdownProductSelection('$$product1.name$$ +$$$product1.price$$')}}" stepKey="seeOption1Product1Details"/>
18+
<seeElement selector="{{StorefrontBundleProductActionSection.dropdownProductSelection('$$product2.name$$ +$$$product2.price$$')}}" stepKey="seeOption1Product2Details"/>
19+
<seeElement selector="{{StorefrontBundleProductActionSection.dropdownProductSelection('$$product3.name$$ +$$$product3.price$$')}}" stepKey="seeOption1Product3Details"/>
20+
<click selector="{{StorefrontBundleProductActionSection.dropdownProductSelection('$$product1.name$$)}}" stepKey="selecteProduct1"/>
21+
<click selector="{{StorefrontBundleProductActionSection.addToCartButton($$product1.name$$)}}" stepKey="addProduct1InCart"/>
22+
<click selector="{{StorefrontBundleProductActionSection.dropdownSelectOption}}" stepKey="clickOnSelectOption2"/>
23+
<click selector="{{StorefrontBundleProductActionSection.dropdownProductSelection('$$product2.name$$)}}" stepKey="selecteProduct2"/>
24+
<click selector="{{StorefrontBundleProductActionSection.addToCartButton($$product2.name$$)}}" stepKey="addProduct2InCart"/>
25+
<click selector="{{StorefrontBundleProductActionSection.dropdownSelectOption}}" stepKey="clickOnSelectOption3"/>
26+
<click selector="{{StorefrontBundleProductActionSection.dropdownProductSelection('$$product3.name$$)}}" stepKey="selecteProduct3"/>
27+
<click selector="{{StorefrontBundleProductActionSection.addToCartButton($$product3.name$$)}}" stepKey="addProduct3InCart"/>
28+
</actionGroup>
29+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,7 @@
2424
<element name="attributeLabel" type="text" selector="//label[contains(.,'{{attributeLabel}}')]" parameterized="true"/>
2525
<element name="paymentInformation" type="text" selector="//div[@class='order-payment-method-title']"/>
2626
<element name="orderId" type="text" selector="|Order # (\d+)|"/>
27+
<element name="orderStatusUnderViewM" type="text" selector="//td//div[contains(text(),'{{product}}')]/../..//td[@class='col-status' and contains(text(),'{{status}}')]" parameterized="true" timeout="30"/>
28+
<element name="orderStatusUnderViewS" type="text" selector="//tr//div[contains(text(),'{{product}}')]/../../..//td[@class='col-status' and contains(text(),'{{status}}')]" parameterized="true" timeout="30"/>
2729
</section>
2830
</sections>

0 commit comments

Comments
 (0)