Skip to content

Commit 24b3fba

Browse files
engcom-Charlieengcom-Charlie
committed
fix mftf
1 parent ecc4ef5 commit 24b3fba

4 files changed

+77
-24
lines changed

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="AssertStorefrontProductDetailPageFinalPriceActionGroup">
11+
<arguments>
12+
<argument name="finalProductPrice" type="string"/>
13+
</arguments>
14+
<grabTextFrom selector="{{StorefrontProductInfoMainSection.price}}" stepKey="productPriceText"/>
15+
<assertEquals stepKey="assertProductPriceOnProductPage">
16+
<expectedResult type="string">${{finalProductPrice}}</expectedResult>
17+
<actualResult type="variable">productPriceText</actualResult>
18+
</assertEquals>
19+
</actionGroup>
20+
</actionGroups>

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="AssertStorefrontProductDetailPageNameActionGroup">
11+
<arguments>
12+
<argument name="productName" type="string"/>
13+
</arguments>
14+
<grabTextFrom selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="productNameText"/>
15+
<assertEquals stepKey="assertProductNameOnProductPage">
16+
<expectedResult type="string">{{productName}}</expectedResult>
17+
<actualResult type="variable">productNameText</actualResult>
18+
</assertEquals>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductDetailPageTierPriceActionGroup.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="AssertStorefrontProductDetailPageTierPriceActionGroup">
11+
<arguments>
12+
<argument name="tierProductPriceDiscountQuantity" type="string"/>
13+
<argument name="productPriceWithAppliedTierPriceDiscount" type="string"/>
14+
<argument name="productSavedPricePercent" type="string"/>
15+
</arguments>
16+
<grabTextFrom selector="{{StorefrontProductInfoMainSection.tierPriceText}}" stepKey="tierPriceText"/>
17+
<assertEquals stepKey="assertTierPriceTextOnProductPage">
18+
<expectedResult type="string">Buy {{tierProductPriceDiscountQuantity}} for ${{productPriceWithAppliedTierPriceDiscount}} each and save {{productSavedPricePercent}}%</expectedResult>
19+
<actualResult type="variable">tierPriceText</actualResult>
20+
</assertEquals>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontSimpleProductWithSpecialAndTierDiscountPriceTest.xml

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,17 @@
1616
<group value="Catalog"/>
1717
</annotations>
1818
<before>
19-
<!-- Create category -->
2019
<createData entity="_defaultCategory" stepKey="createCategory"/>
2120

22-
<!-- Create product -->
2321
<createData entity="ApiSimpleProduct" stepKey="createProduct">
2422
<requiredEntity createDataKey="createCategory"/>
2523
<field key="price">100.00</field>
2624
</createData>
2725

28-
<!-- Add tier price to product -->
2926
<createData entity="tierProductPriceDiscount" stepKey="addTierPrice">
3027
<requiredEntity createDataKey="createProduct"/>
3128
</createData>
3229

33-
<!-- Add special price to product -->
3430
<createData entity="specialProductPrice2" stepKey="addSpecialToSimpleProduct">
3531
<requiredEntity createDataKey="createProduct"/>
3632
<field key="price">65.00</field>
@@ -40,29 +36,24 @@
4036
<deleteData createDataKey="createProduct" stepKey="deleteSimpleProduct"/>
4137
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
4238
</after>
43-
<!-- Open product page -->
44-
<amOnPage url="{{StorefrontProductPage.url($createProduct.sku$)}}" stepKey="openProductPage"/>
39+
40+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage">
41+
<argument name="productUrl" value="$createProduct.custom_attributes[url_key]$"/>
42+
</actionGroup>
4543
<waitForPageLoad stepKey="waitForProductPageLoad"/>
4644

47-
<!-- Assert product name on product page -->
48-
<grabTextFrom selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="productNameText"/>
49-
<assertEquals stepKey="assertProductNameOnProductPage">
50-
<expectedResult type="string">$createProduct.name$</expectedResult>
51-
<actualResult type="variable">productNameText</actualResult>
52-
</assertEquals>
45+
<actionGroup ref="AssertStorefrontProductDetailPageNameActionGroup" stepKey="assertProductNameText">
46+
<argument name="productName" value="$createProduct.name$"/>
47+
</actionGroup>
5348

54-
<!-- Assert product tier price on product page -->
55-
<grabTextFrom selector="{{StorefrontProductInfoMainSection.tierPriceText}}" stepKey="tierPriceText"/>
56-
<assertEquals stepKey="assertTierPriceTextOnProductPage">
57-
<expectedResult type="string">Buy {{tierProductPriceDiscount.quantity}} for $64.00 each and save 2%</expectedResult>
58-
<actualResult type="variable">tierPriceText</actualResult>
59-
</assertEquals>
49+
<actionGroup ref="AssertStorefrontProductDetailPageTierPriceActionGroup" stepKey="assertProductTierPriceText">
50+
<argument name="tierProductPriceDiscountQuantity" value="{{tierProductPriceDiscount.quantity}}"/>
51+
<argument name="productPriceWithAppliedTierPriceDiscount" value="64.00"/>
52+
<argument name="productSavedPricePercent" value="2"/>
53+
</actionGroup>
6054

61-
<!-- Assert final product price on product page -->
62-
<grabTextFrom selector="{{StorefrontProductInfoMainSection.price}}" stepKey="productPriceText"/>
63-
<assertEquals stepKey="assertProductPriceOnProductPage">
64-
<expectedResult type="string">$65.00</expectedResult>
65-
<actualResult type="variable">productPriceText</actualResult>
66-
</assertEquals>
55+
<actionGroup ref="AssertStorefrontProductDetailPageFinalPriceActionGroup" stepKey="assertProductFinalPriceText">
56+
<argument name="finalProductPrice" value="65.00"/>
57+
</actionGroup>
6758
</test>
6859
</tests>

0 commit comments

Comments
 (0)