Skip to content

Commit 7090cbf

Browse files
okolesnykokolesnyk
committed
Merge branch 'mtf-eol-pr' of github.com:magento-pangolin/magento2ce into community-tests-migration-pr
2 parents 0d5b040 + e8b963a commit 7090cbf

File tree

64 files changed

+2494
-20
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+2494
-20
lines changed

‎app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@
4141
<element name="contentDropDownIfNotShowing" type="button" selector="//div[@data-index='content']//div[contains(@class, '_hide')]"/>
4242
<element name="longDescription" type="input" selector="#product_form_description"/>
4343
<element name="shortDescription" type="input" selector="#product_form_short_description"/>
44-
<!--BundleOptinsDropDown-->
44+
<!--BundleOptionsDropDown-->
4545
<element name="bundleOptionsDropDown" type="button" selector="div[data-index='bundle-items']" timeout="30"/>
46+
<element name="currentBundleOption" type="text" selector="//div[@data-index='bundle-items']//div[contains(@class, 'admin__collapsible-title')]/span"/>
4647
<!--AddingAnOption-->
4748
<element name="addOptions" type="button" selector="//tr[@data-repeat-index='0']//td[4]" timeout="30"/>
4849
<!--SEODropdownTab-->

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,10 @@
249249
<waitForPageLoad time="60" stepKey="WaitForProductSave1"/>
250250
<see userInput="You saved the product." stepKey="seeSaveConfirmation"/>
251251
</actionGroup>
252+
<actionGroup name="ProductSetAdvancedTierFixedPricing" extends="ProductSetAdvancedPricing">
253+
<remove keyForRemoval="selectProductTierPricePriceInput"/>
254+
<fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{amount}}" stepKey="selectProductTierPricePriceInput" after="selectProductTierPriceValueType"/>
255+
</actionGroup>
252256

253257
<!--Assert text in Related, Up-Sell or Cross-Sell section in Admin Product page-->
254258
<actionGroup name="AssertTextInAdminProductRelatedUpSellCrossSellSection">

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutFillEstimateShippingAndTaxActionGroup.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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="CheckoutFillEstimateShippingAndTaxActionGroup">
12+
<arguments>
13+
<argument name="address" defaultValue="US_Address_TX" type="entity"/>
14+
</arguments>
15+
<conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.estimateShippingAndTaxSummary}}" visible="false" stepKey="openShippingDetails"/>
16+
<selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="{{address.country_id}}" stepKey="selectCountry"/>
17+
<selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{address.state}}" stepKey="selectState"/>
18+
<waitForElementVisible selector="{{CheckoutCartSummarySection.postcode}}" stepKey="waitForPostCodeVisible"/>
19+
<fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="{{address.postcode}}" stepKey="selectPostCode"/>
20+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDiappear"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/FillGuestCheckoutShippingAddressFormActionGroup.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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="FillGuestCheckoutShippingAddressFormActionGroup">
12+
<arguments>
13+
<argument name="customer" defaultValue="Simple_US_Customer" type="entity"/>
14+
<argument name="customerAddress" defaultValue="US_Address_TX" type="entity"/>
15+
</arguments>
16+
<fillField selector="{{CheckoutShippingSection.emailAddress}}" userInput="{{customer.email}}" stepKey="setCustomerEmail"/>
17+
<fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{customer.firstname}}" stepKey="SetCustomerFirstName"/>
18+
<fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{customer.lastname}}" stepKey="SetCustomerLastName"/>
19+
<fillField selector="{{CheckoutShippingSection.street}}" userInput="{{customerAddress.street[0]}}" stepKey="SetCustomerStreetAddress"/>
20+
<fillField selector="{{CheckoutShippingSection.city}}" userInput="{{customerAddress.city}}" stepKey="SetCustomerCity"/>
21+
<fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{customerAddress.postcode}}" stepKey="SetCustomerZipCode"/>
22+
<fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{customerAddress.telephone}}" stepKey="SetCustomerPhoneNumber"/>
23+
</actionGroup>
24+
<actionGroup name="FillGuestCheckoutShippingAddressWithCountryActionGroup" extends="FillGuestCheckoutShippingAddressFormActionGroup">
25+
<selectOption selector="{{CheckoutShippingSection.country}}" userInput="{{customerAddress.country_id}}" stepKey="selectCustomerCountry" after="SetCustomerCity"/>
26+
</actionGroup>
27+
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCustomerSignInPopUpActionGroup.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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="StorefrontCustomerSignInPopUpActionGroup">
12+
<arguments>
13+
<argument name="customerEmail" type="string"/>
14+
<argument name="customerPwd" type="string"/>
15+
</arguments>
16+
<waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.email}}" stepKey="waitForElementToBeVisible"/>
17+
<fillField stepKey="fillEmail" userInput="{{customerEmail}}" selector="{{StorefrontCustomerSignInPopupFormSection.email}}"/>
18+
<fillField stepKey="fillPassword" userInput="{{customerPwd}}" selector="{{StorefrontCustomerSignInPopupFormSection.password}}"/>
19+
<click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInPopupFormSection.signIn}}"/>
20+
<waitForPageLoad stepKey="waitForPageToLoad"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontRegisterCustomerAfterCheckoutActionGroup.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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="StorefrontRegisterCustomerAfterCheckoutActionGroup">
12+
<arguments>
13+
<argument name="customerPassword" defaultValue="UKCustomer.password" type="string"/>
14+
</arguments>
15+
<click selector="{{CheckoutSuccessRegisterSection.createAccountButton}}" stepKey="clickOnCreateAnAccountButton"/>
16+
<fillField selector="{{StorefrontCustomerAccountInformationSection.newPassword}}" userInput="{{customerPassword}}" stepKey="fillPassword"/>
17+
<fillField selector="{{StorefrontCustomerAccountInformationSection.confirmNewPassword}}" userInput="{{customerPassword}}" stepKey="reconfirmPassword"/>
18+
<click selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}" stepKey="clickOnCreateAnAccount"/>
19+
<seeElement selector="{{StorefrontCustomerMessagesSection.successMessage}}" stepKey="seeSuccessMessage1"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/Data/CheckoutConfigData.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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="EnableGuestCheckoutConfigData">
12+
<data key="path">checkout/options/guest_checkout</data>
13+
<data key="scope_id">0</data>
14+
<data key="label">Yes</data>
15+
<data key="value">1</data>
16+
</entity>
17+
<entity name="DisableGuestCheckoutConfigData">
18+
<data key="path">checkout/options/guest_checkout</data>
19+
<data key="scope_id">0</data>
20+
<data key="label">No</data>
21+
<data key="value">0</data>
22+
</entity>
23+
<entity name="EnableHttpsFrontendConfigData">
24+
<data key="path">web/secure/use_in_frontend</data>
25+
<data key="scope_id">0</data>
26+
<data key="label">Yes</data>
27+
<data key="value">1</data>
28+
</entity>
29+
<entity name="DisableHttpsFrontendConfigData">
30+
<data key="path">web/secure/use_in_frontend</data>
31+
<data key="scope_id">0</data>
32+
<data key="label">No</data>
33+
<data key="value">0</data>
34+
</entity>
35+
</entities>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,8 @@
4646
<element name="checkoutCartProductPrice" type="text" selector="//td[@class='col price']//span[@class='price']"/>
4747
<element name="checkoutCartSubtotal" type="text" selector="//td[@class='col subtotal']//span[@class='price']"/>
4848
<element name="emptyCart" selector=".cart-empty" type="text"/>
49+
<!-- Required attention section -->
50+
<element name="removeProductBySku" type="button" selector="//div[contains(., '{{sku}}')]/ancestor::tbody//button" parameterized="true" timeout="30"/>
51+
<element name="failedItemBySku" type="block" selector="//div[contains(.,'{{sku}}')]/ancestor::tbody" parameterized="true" timeout="30"/>
4952
</section>
5053
</sections>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<element name="countryParameterized" type="select" selector="select[name='country_id'] > option:nth-child({{var}})" timeout="10" parameterized="true"/>
2929
<element name="estimateShippingAndTax" type="text" selector="#block-shipping-heading" timeout="5"/>
3030
<element name="flatRateShippingMethod" type="input" selector="#s_method_flatrate_flatrate" timeout="30"/>
31+
<element name="estimateShippingAndTaxSummary" type="text" selector="#block-summary"/>
3132
<element name="shippingMethodLabel" type="text" selector="#co-shipping-method-form dl dt span"/>
3233
<element name="methodName" type="text" selector="#co-shipping-method-form label"/>
3334
<element name="shippingPrice" type="text" selector="#co-shipping-method-form span .price"/>

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
<element name="billingAddressNotSameCheckbox" type="checkbox" selector="#billing-address-same-as-shipping-checkmo"/>
1717
<element name="editAddress" type="button" selector="button.action.action-edit-address"/>
1818
<element name="placeOrderDisabled" type="button" selector="#checkout-payment-method-load button.disabled"/>
19-
<element name="update" type="button" selector=".payment-method-billing-address .action.action-update"/>
20-
<element name="guestFirstName" type="input" selector=".billing-address-form input[name*='firstname']"/>
21-
<element name="guestLastName" type="input" selector=".billing-address-form input[name*='lastname']"/>
22-
<element name="guestStreet" type="input" selector=".billing-address-form input[name*='street[0]']"/>
23-
<element name="guestCity" type="input" selector=".billing-address-form input[name*='city']"/>
24-
<element name="guestCountry" type="select" selector=".billing-address-form select[name*='country_id']"/>
25-
<element name="guestRegion" type="select" selector=".billing-address-form select[name*='region_id']"/>
26-
<element name="guestPostcode" type="input" selector=".billing-address-form input[name*='postcode']"/>
27-
<element name="guestTelephone" type="input" selector=".billing-address-form input[name*='telephone']"/>
19+
<element name="update" type="button" selector=".payment-method._active .payment-method-billing-address .action.action-update"/>
20+
<element name="guestFirstName" type="input" selector=".payment-method._active .billing-address-form input[name='firstname']"/>
21+
<element name="guestLastName" type="input" selector=".payment-method._active .billing-address-form input[name*='lastname']"/>
22+
<element name="guestStreet" type="input" selector=".payment-method._active .billing-address-form input[name*='street[0]']"/>
23+
<element name="guestCity" type="input" selector=".payment-method._active .billing-address-form input[name*='city']"/>
24+
<element name="guestCountry" type="select" selector=".payment-method._active .billing-address-form select[name*='country_id']"/>
25+
<element name="guestRegion" type="select" selector=".payment-method._active .billing-address-form select[name*='region_id']"/>
26+
<element name="guestPostcode" type="input" selector=".payment-method._active .billing-address-form input[name*='postcode']"/>
27+
<element name="guestTelephone" type="input" selector=".payment-method._active .billing-address-form input[name*='telephone']"/>
2828
<element name="billingAddress" type="text" selector=".payment-method._active div.billing-address-details"/>
2929
<element name="cartItems" type="text" selector="ol.minicart-items"/>
3030
<element name="cartItemsArea" type="button" selector="div.block.items-in-cart"/>
@@ -46,7 +46,6 @@
4646
<element name="productOptionsByProductItemPrice" type="text" selector="//div[@class='product-item-inner']//div[@class='subtotal']//span[@class='price'][contains(.,'{{price}}')]//ancestor::div[@class='product-item-details']//div[@class='product options']" parameterized="true"/>
4747
<element name="productOptionsActiveByProductItemPrice" type="text" selector="//div[@class='subtotal']//span[@class='price'][contains(.,'{{price}}')]//ancestor::div[@class='product-item-details']//div[@class='product options active']" parameterized="true"/>
4848
<element name="productItemPriceByName" type="text" selector="//div[@class='product-item-details'][contains(., '{{ProductName}}')]//span[@class='price']" parameterized="true"/>
49-
5049
<element name="tax" type="text" selector="[data-th='Tax'] span" timeout="30"/>
5150
<element name="taxPercentage" type="text" selector=".totals-tax-details .mark"/>
5251
<element name="orderSummaryTotalIncluding" type="text" selector="//tr[@class='grand totals incl']//span[@class='price']" />
@@ -56,6 +55,8 @@
5655
<element name="addressBook" type="button" selector="//a[text()='Address Book']"/>
5756
<element name="noQuotes" type="text" selector=".no-quotes-block"/>
5857
<element name="paymentMethodByName" type="text" selector="//*[@id='checkout-payment-method-load']//*[contains(@class, 'payment-group')]//label[normalize-space(.)='{{var1}}']" parameterized="true"/>
58+
<element name="bankTransfer" type="radio" selector="#banktransfer"/>
59+
<element name="billingAddressNotSameBankTransferCheckbox" type="checkbox" selector="#billing-address-same-as-shipping-banktransfer"/>
5960
<element name="billingAddressSelectShared" type="select" selector=".checkout-billing-address select[name='billing_address_id']"/>
6061
<element name="discount" type="block" selector="tr.totals.discount"/>
6162
<element name="discountPrice" type="text" selector=".discount .price"/>

0 commit comments

Comments
 (0)