Skip to content

Commit f4c534f

Browse files
JacobBrownAustinJacobBrownAustin
authored
Merge branch '2.4-develop' into ACPT-1840
2 parents 16e740e + be7b88d commit f4c534f

File tree

27 files changed

+662
-46
lines changed

27 files changed

+662
-46
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1519,4 +1519,12 @@
15191519
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
15201520
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
15211521
</entity>
1522+
<entity name="ApiSimpleProductWithPrice1" type="product2" extends="ApiSimpleOne">
1523+
<data key="price">1</data>
1524+
<data key="weight">1</data>
1525+
</entity>
1526+
<entity name="SimpleProductWithWeight" extends="SimpleProduct50" type="product">
1527+
<data key="weight">1</data>
1528+
<data key="price">10</data>
1529+
</entity>
15221530
</entities>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@
137137
<generateDate date="now" format="m/d/Y" stepKey="generateCurrentDate"/>
138138
<generateDate date="-1 day" format="m/d/Y" stepKey="generateYesterdayDate"/>
139139
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndexPageToEditProduct1"/>
140+
<actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductFilters"/>
140141
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditSimpleProduct1">
141142
<argument name="product" value="$$createSimpleProduct1$$"/>
142143
</actionGroup>

‎app/code/Magento/Checkout/Test/Mftf/Data/CountryData.xml

Lines changed: 45 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,45 @@
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="Countries" type="countryArray">
12-
<array key="country">
13-
<item>Bahamas</item>
14-
</array>
15-
</entity>
16-
<entity name="DefaultCountriesWithRequiredRegions" type="countryArray">
17-
<array key="country">
18-
<item>Australia</item>
19-
<item>Brazil</item>
20-
<item>Canada</item>
21-
<item>Croatia</item>
22-
<item>Estonia</item>
23-
<item>India</item>
24-
<item>Latvia</item>
25-
<item>Lithuania</item>
26-
<item>Romania</item>
27-
<item>Spain</item>
28-
<item>Switzerland</item>
29-
<item>United States</item>
30-
<item>Australia</item>
31-
</array>
32-
</entity>
33-
<entity name="CustomCountryWithRequiredRegion" type="countryArray">
34-
<array key="country">
35-
<item>United Kingdom</item>
36-
</array>
37-
</entity>
38-
</entities>
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="Countries" type="countryArray">
12+
<array key="country">
13+
<item>Bahamas</item>
14+
</array>
15+
</entity>
16+
<entity name="DefaultCountriesWithRequiredRegions" type="countryArray">
17+
<array key="country">
18+
<item>Australia</item>
19+
<item>Brazil</item>
20+
<item>Canada</item>
21+
<item>Croatia</item>
22+
<item>Estonia</item>
23+
<item>India</item>
24+
<item>Latvia</item>
25+
<item>Lithuania</item>
26+
<item>Romania</item>
27+
<item>Spain</item>
28+
<item>Switzerland</item>
29+
<item>United States</item>
30+
<item>Australia</item>
31+
</array>
32+
</entity>
33+
<entity name="CustomCountryWithRequiredRegion" type="countryArray">
34+
<array key="country">
35+
<item>United Kingdom</item>
36+
</array>
37+
</entity>
38+
<entity name="EuropeanCountry" type="countryArray">
39+
<array key="country">
40+
<item>France</item>
41+
<item>Germany</item>
42+
<item>United Kingdom</item>
43+
</array>
44+
</entity>
45+
</entities>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,6 @@
3636
<element name="shippingMethodDhlMedicalExpress" type="radio" selector="#checkout-shipping-method-load input[value='dhl_Q']"/>
3737
<element name="shippingMethodFreeShippingLabel" type="text" selector="#label_carrier_freeshipping_freeshipping"/>
3838
<element name="shippingDHLErrorMessage" type="text" selector="#checkout-shipping-method-load .table-checkout-shipping-method tr.row-error .error div"/>
39+
<element name="smartPostShippingMethod" type="radio" selector="#checkout-shipping-method-load input[value='fedex_FEDEX_GROUND']"/>
3940
</section>
4041
</sections>

‎app/code/Magento/Checkout/Test/Mftf/Test/CheckoutSpecificDestinationsTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868

6969
<!--Go to shopping cart-->
7070
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="amOnPageShoppingCart2"/>
71-
71+
7272
<!--Verify country options is shown by default-->
7373
<actionGroup ref="VerifyTopDestinationsCountryActionGroup" stepKey="verifyTopDestinationsCountry2">
7474
<argument name="country" value="Afghanistan"/>

‎app/code/Magento/Config/Test/Mftf/Section/StoreConfigSection.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@
1616
<element name="Country" type="select" selector="#general_store_information_country_id"/>
1717
<element name="fillVATNumber" type="input" selector="#general_store_information_merchant_vat_number"/>
1818
<element name="validateVATNumber" type="button" selector="#general_store_information_validate_vat_number" timeout="30"/>
19+
<element name="storeName" type="input" selector="#general_store_information_name"/>
20+
<element name="storePhoneNumber" type="input" selector="#general_store_information_phone"/>
1921
</section>
2022
</sections>

‎app/code/Magento/Customer/Test/Mftf/Test/AdminGridSearchSelectAllTest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@
3636
<fillField selector="{{AdminDataGridHeaderSection.search}}" userInput="$$secondCustomer.email$$" stepKey="fillKeywordSearchFieldWithSecondCustomerEmail"/>
3737
<click selector="{{AdminDataGridHeaderSection.submitSearch}}" stepKey="clickKeywordSearch"/>
3838
<waitForPageLoad stepKey="waitForPageLoad"/>
39+
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
40+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexInvalidatedIndices">
41+
<argument name="indices" value=""/>
42+
</actionGroup>
3943
<!-- Select all from dropdown -->
4044
<actionGroup ref="AdminGridSelectAllActionGroup" stepKey="selectAllCustomers"/>
4145
<!-- Clear searching By Keyword-->

‎app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
<before>
2323
<!--Log In-->
2424
<actionGroup ref="AdminLoginActionGroup" stepKey="logIn"/>
25+
<!-- Delete All Non Default Tax Rates-->
26+
<actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRatesPage"/>
27+
<actionGroup ref="AdminDeleteMultipleTaxRatesActionGroup" stepKey="deleteAllNonDefaultTaxRates"/>
2528
<!--Create category-->
2629
<createData entity="_defaultCategory" stepKey="createCategory"/>
2730
<!--Create product-->

‎app/code/Magento/OfflineShipping/Test/Mftf/Test/StorefrontFreeShippingDisplayWithInclTaxOptionTest.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
<testCaseId value="MC-20613"/>
1919
<useCaseId value="MC-18457"/>
2020
<group value="shipping"/>
21+
<skip>
22+
<issueId value="ACQE-6511"/>
23+
</skip>
2124
</annotations>
2225
<before>
2326
<createData entity="SimpleProduct2" stepKey="createSimpleProduct">
@@ -54,6 +57,10 @@
5457
<waitForPageLoad stepKey="waitForSelectCountry"/>
5558
<selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="California" stepKey="selectCaliforniaRegion"/>
5659
<waitForPageLoad stepKey="waitForSelectRegion"/>
60+
<!-- Flush cache -->
61+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache1">
62+
<argument name="tags" value=""/>
63+
</actionGroup>
5764
<see selector="{{CheckoutPaymentSection.tax}}" userInput="$8.25" stepKey="seeTaxForCA"/>
5865
<!-- See available Free Shipping option -->
5966
<actionGroup ref="StorefrontAssertShippingMethodPresentInCartActionGroup" stepKey="assertShippingMethodLabel">

‎app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminAuthorizeAnOrderActionGroup.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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="AdminAuthorizeAnOrderActionGroup">
12+
<annotations>
13+
<description>Authorize the processing order on the Admin orders view page. Validates that the provided Order Status is present and correct.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="orderStatus" type="string" defaultValue="Processing"/>
17+
</arguments>
18+
<waitForElementClickable selector="{{AdminOrderDetailsMainActionsSection.authorize}}" stepKey="waitForAuthorizeButtonToBeClickable"/>
19+
<click selector="{{AdminOrderDetailsMainActionsSection.authorize}}" stepKey="clickAuthorizeButton"/>
20+
<waitForText selector="{{AdminConfirmationModalSection.message}}" userInput="Are you sure you want to authorize full order amount?" stepKey="seeConfirmationMessage"/>
21+
<waitForElementClickable selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForOkayButtonToAppear"/>
22+
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmOrder"/>
23+
<waitForText selector="{{AdminMessagesSection.success}}" userInput="Payment authorization has been successfully created." stepKey="seeAuthorizedSuccessMessage"/>
24+
<waitForText selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{orderStatus}}" stepKey="seeOrderStatus"/>
25+
</actionGroup>
26+
</actionGroups>

0 commit comments

Comments
 (0)