Skip to content

Commit 4d13845

Browse files
committed
Merge branch '646-checkout-js-validation-test' of https://github.com/rogyar/magento-functional-tests-migration into community-tests-migration-pr
2 parents 464ffc2 + a4734a9 commit 4d13845

File tree

4 files changed

+52
-1
lines changed

4 files changed

+52
-1
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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="StorefrontAssertNoValidationErrorForCheckoutAddressFieldsActionGroup">
12+
<dontSeeElement selector="{{CheckoutShippingSection.addressFieldValidationError}}" stepKey="checkFieldsValidationIsPassed"/>
13+
</actionGroup>
14+
</actionGroups>

app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<element name="editActiveAddress" type="button" selector="//div[@class='shipping-address-item selected-item']//span[text()='Edit']" timeout="30"/>
4040
<element name="loginButton" type="button" selector=".action.login" timeout="30"/>
4141
<element name="shipHereButton" type="button" selector="//div[text()='{{street}}']/button[@class='action action-select-shipping-item']" parameterized="true" timeout="30"/>
42+
<element name="addressFieldValidationError" type="text" selector="div.address div.field .field-error"/>
4243
<element name="textFieldAttrRequireMessage" type="text" selector="//input[@name='custom_attributes[{{attribute}}]']/ancestor::div[contains(@class, 'control')]/div/span" parameterized="true" timeout="30"/>
4344
<element name="textFieldAttribute" type="input" selector="[name*='custom_attributes[{{attribute}}]']" parameterized="true" timeout="30"/>
4445
</section>
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="StorefrontOnePageCheckoutJsValidationTest">
12+
<annotations>
13+
<features value="Checkout"/>
14+
<title value="Js validation error messages must be absent for required fields after checkout start."/>
15+
<description value="Js validation error messages must be absent for required fields after checkout start."/>
16+
<group value="shoppingCart"/>
17+
<group value="mtf_migrated"/>
18+
</annotations>
19+
<before>
20+
<createData entity="_defaultCategory" stepKey="createCategory"/>
21+
<createData entity="ApiSimpleProduct" stepKey="createProduct">
22+
<requiredEntity createDataKey="createCategory"/>
23+
</createData>
24+
</before>
25+
<after>
26+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
27+
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
28+
</after>
29+
30+
<actionGroup ref="AddSimpleProductToCart" stepKey="addToCartFromStorefrontProductPage">
31+
<argument name="product" value="$$createProduct$$"/>
32+
</actionGroup>
33+
<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="guestGoToCheckout"/>
34+
<actionGroup ref="StorefrontAssertNoValidationErrorForCheckoutAddressFieldsActionGroup" stepKey="seeNoValidationErrors"/>
35+
</test>
36+
</tests>

dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutJsValidationTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutJsValidationTest" summary="JS validation verification for Checkout flow" ticketId="MAGETWO-59697">
1010
<variation name="OnePageCheckoutJsValidationTestVariation1" summary="JS validation is not applied for empty required checkout fields if customer did not fill them">
1111
<data name="issue" xsi:type="string">MAGETWO-97990: [MTF] OnePageCheckoutJsValidationTestVariation1_0 randomly fails on jenkins</data>
12-
<data name="tag" xsi:type="string">severity:S2</data>
12+
<data name="tag" xsi:type="string">severity:S2,mftf_migrated:yes</data>
1313
<data name="products/0" xsi:type="string">catalogProductSimple::default</data>
1414
<data name="checkoutMethod" xsi:type="string">guest</data>
1515
<constraint name="Magento\Checkout\Test\Constraint\AssertShippingAddressJsValidationMessagesIsAbsent" />

0 commit comments

Comments
 (0)