Skip to content

Commit f70d2d9

Browse files
manjusha729manjusha729
committed
ACQE-7341 | Mainline deployment
 Test Fix
1 parent a507318 commit f70d2d9

File tree

5 files changed

+99
-1
lines changed

5 files changed

+99
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--
33
/**
44
* Copyright 2024 Adobe.
5-
* All Rights Reserved.
5+
* All Rights Reserved.
66
*/
77
-->
88

@@ -21,6 +21,8 @@
2121
<element name="productTierPriceFixedPriceInput" type="input" selector="[name='product[tier_price][{{var1}}][price]']" parameterized="true"/>
2222
<element name="productTierPricePercentageValuePriceInput" type="input" selector="[name='product[tier_price][{{var1}}][percentage_value]']" parameterized="true"/>
2323
<element name="specialPrice" type="input" selector="input[name='product[special_price]']"/>
24+
<element name="specialPriceFrom" type="input" selector="input[name='product[special_from_date]']"/>
25+
<element name="specialPriceTo" type="input" selector="input[name='product[special_to_date]']"/>
2426
<element name="cost" type="input" selector="//input[@name='product[cost]']"/>
2527
<element name="doneButton" type="button" selector=".product_form_product_form_advanced_pricing_modal button.action-primary" timeout="30"/>
2628
<element name="msrp" type="input" selector="//input[@name='product[msrp]']" timeout="30"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,6 @@
4141
<element name="filterOptionCurrencySymbol" type="text" selector="//div[@class='filter-options-content']//a//span[@class='price' and contains(text(),'{{currencySymbol}}')]" parameterized="true"/>
4242
<element name="priceDropdown" type="button" selector="//div[@class='filter-options-title']"/>
4343
<element name="priceBlockShoppingOptions" type="block" selector="//div[@class='filter-options-content']"/>
44+
<element name="widgetProduct" type="text" selector="//main//ol[@class='product-items widget-product-grid']//a[contains(text(), '{{productName}}')]" parameterized="true"/>
4445
</section>
4546
</sections>

‎app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateCatalogProductsListWidgetWithTwoConditionsActionGroup.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
<waitForElementClickable selector="{{AdminNewWidgetSection.conditionOperator}}" stepKey="clickConditionsOperator234"/>
3838
<click selector="{{AdminNewWidgetSection.conditionOperator}}" stepKey="clickConditionsOperator"/>
3939
<selectOption selector="{{AdminNewWidgetSection.selectOperator}}" userInput="{{conditionsOperator}}" stepKey="selectConditionsOperator"/>
40+
<waitForElementClickable selector="{{AdminNewWidgetSection.conditions}}" stepKey="waitForClickOnConditionsElement"/>
41+
<click selector="{{AdminNewWidgetSection.conditions}}" stepKey="clickOnConditionsELement"/>
4042
<waitForElementClickable selector="{{AdminNewWidgetSection.ruleParameter}}" stepKey="waitForConiditionParameterToBeClickable"/>
4143
<click selector="{{AdminNewWidgetSection.ruleParameter}}" stepKey="clickConditionParameter"/>
4244
<waitForElementVisible selector="{{AdminNewWidgetSection.setRuleParameter}}" stepKey="waitForConditionParameterFieldToBeVisible"/>
@@ -50,6 +52,8 @@
5052
<waitForElementClickable selector="{{AdminNewWidgetSection.secondConditionOperator}}" stepKey="waitForSecondConditionsOperatorToBeClickable"/>
5153
<click selector="{{AdminNewWidgetSection.secondConditionOperator}}" stepKey="clickSecondConditionsOperator"/>
5254
<selectOption selector="{{AdminNewWidgetSection.secondSelectOperator}}" userInput="{{secondConditionOperator}}" stepKey="selectSecondConditionsOperator"/>
55+
<waitForElementClickable selector="{{AdminNewWidgetSection.conditions}}" stepKey="againWaitForClickOnConditionsElement"/>
56+
<click selector="{{AdminNewWidgetSection.conditions}}" stepKey="againClickOnConditionsELement"/>
5357
<waitForElementClickable selector="{{AdminNewWidgetSection.secondRuleParameter}}" stepKey="waitForSecondRuleParameterToBeClickable"/>
5458
<click selector="{{AdminNewWidgetSection.secondRuleParameter}}" stepKey="clickSecondRuleParameter"/>
5559
<waitForElementVisible selector="{{AdminNewWidgetSection.setSecondRuleParameter}}" stepKey="waitForSecondConditionParameterToBeVisible"/>

‎app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
<element name="setSecondRuleParameter" type="input" selector="#conditions__1--2__value"/>
6767
<element name="selectPage" type="button" selector="//span[contains(text(),'Select Page')]"/>
6868
<element name="enableCookies" type="button" selector="//tbody//tr//td[contains(text(),'Enable Cookies')]"/>
69+
<element name="conditions" type="button" selector="//label[@class='label admin__field-label']//span[text()='Conditions']"/>
6970
</section>
7071
</sections>
7172

‎app/code/Magento/Widget/Test/Mftf/Test/StorefrontAssertsSpecialPriceToDateProductInWidgetBlockTest.xml

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2024 Adobe.
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="StorefrontAssertsSpecialPriceToDateProductInWidgetBlockTest">
11+
<annotations>
12+
<features value="Widget"/>
13+
<stories value="Catalog Products list widget"/>
14+
<title value="Storefront Asserts widget with condition Special date to"/>
15+
<description value="Testcase verifies Only 1 product which have special price to date have to be displayed in widget block."/>
16+
<severity value="MAJOR"/>
17+
<testCaseId value="AC-4492"/>
18+
</annotations>
19+
<before>
20+
<createData entity="ApiCategory" stepKey="createCategory"/>
21+
<createData entity="ApiSimpleProduct" stepKey="createFirstSimpleProduct">
22+
<requiredEntity createDataKey="createCategory"/>
23+
<field key="price">9</field>
24+
</createData>
25+
<createData entity="ApiSimpleProduct" stepKey="createSecondSimpleProduct">
26+
<requiredEntity createDataKey="createCategory"/>
27+
<field key="price">1</field>
28+
</createData>
29+
<createData entity="ApiSimpleProduct" stepKey="createThirdSimpleProduct">
30+
<requiredEntity createDataKey="createCategory"/>
31+
<field key="price">10</field>
32+
</createData>
33+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
34+
<!--Open Product On Admin Side-->
35+
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="openProductPage">
36+
<argument name="productId" value="$createFirstSimpleProduct.id$"/>
37+
</actionGroup>
38+
<actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="openAdvancedPricingDialog"/>
39+
<generateDate date="now" format="m/d/Y" stepKey="generateTodayDate"/>
40+
<generateDate date="+1 day" format="m/d/Y" stepKey="generateTomorrowDate"/>
41+
<waitForElementVisible selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" stepKey="waitForSpecialPriceToBeVisible"/>
42+
<fillField userInput="1" selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" stepKey="fillSpecialPrice"/>
43+
<waitForElementVisible selector="{{AdminProductFormAdvancedPricingSection.specialPriceFrom}}" stepKey="waitForSpecialPriceFromToBeVisible"/>
44+
<fillField userInput="{$generateTodayDate}" selector="{{AdminProductFormAdvancedPricingSection.specialPriceFrom}}" stepKey="fillSpecialPriceFrom"/>
45+
<waitForElementVisible selector="{{AdminProductFormAdvancedPricingSection.specialPriceTo}}" stepKey="waitForSpecialPriceToToBeVisible"/>
46+
<fillField userInput="{$generateTomorrowDate}" selector="{{AdminProductFormAdvancedPricingSection.specialPriceTo}}" stepKey="fillSpecialPriceTo"/>
47+
<actionGroup ref="AdminProductFormDoneAdvancedPricingDialogActionGroup" stepKey="clickDone"/>
48+
<!--Save the product-->
49+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
50+
</before>
51+
<after>
52+
<!--Delete widget catalog product list-->
53+
<actionGroup ref="AdminDeleteWidgetActionGroup" stepKey="deleteWidgetCatalogProductList">
54+
<argument name="widget" value="CatalogProductsListWidget"/>
55+
</actionGroup>
56+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
57+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
58+
<deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstSimpleProduct"/>
59+
<deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
60+
<deleteData createDataKey="createThirdSimpleProduct" stepKey="deleteThirdSimpleProduct"/>
61+
</after>
62+
<actionGroup ref="AdminCreateCatalogProductsListWidgetWithTwoConditionsActionGroup" stepKey="createProductListWidget">
63+
<argument name="widget" value="CatalogProductsListWidget"/>
64+
<argument name="title" value="Some Title"/>
65+
<argument name="displayPageControl" value="1"/>
66+
<argument name="numberOfProductsToDisplay" value="10"/>
67+
<argument name="condition" value="Category"/>
68+
<argument name="conditionsOperator" value="is"/>
69+
<argument name="conditionParameter" value="$createCategory.id$"/>
70+
<argument name="secondCondition" value="Special Price"/>
71+
<argument name="secondConditionOperator" value="is"/>
72+
<argument name="secondConditionParameter" value="1"/>
73+
</actionGroup>
74+
<actionGroup ref="AdminSaveAndContinueWidgetActionGroup" stepKey="saveWidget"/>
75+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
76+
<argument name="indices" value=""/>
77+
</actionGroup>
78+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
79+
<argument name="tags" value=""/>
80+
</actionGroup>
81+
<!-- Open category page -->
82+
<!-- Navigates to category page -->
83+
<actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="navigateToCategoryPage">
84+
<argument name="category" value="$$createCategory$$"/>
85+
</actionGroup>
86+
<waitForElementVisible selector="{{StorefrontCategoryProductSection.widgetProduct($$createFirstSimpleProduct.name$$)}}" stepKey="assertFirstSimpleProduct"/>
87+
<waitForElementNotVisible selector="{{StorefrontCategoryProductSection.widgetProduct($$createSecondSimpleProduct.name$$)}}" stepKey="assertSecondSimpleProductIsNotAvaiable"/>
88+
<waitForElementNotVisible selector="{{StorefrontCategoryProductSection.widgetProduct($$createThirdSimpleProduct.name$$)}}" stepKey="assertThirdSimpleProductIsNotAvaiable"/>
89+
</test>
90+
</tests>

0 commit comments

Comments
 (0)