Skip to content

Commit 7bb4ca9

Browse files
internal-magento-queue-manager[bot]internal-magento-queue-manager[bot]
authored
Merge pull request #9703 from magento-gl/ACQE-Version4-functional-mainline-deployment
Bengals ACQE functional deployment
2 parents 9608ca2 + f334b8d commit 7bb4ca9

File tree

7 files changed

+37
-20
lines changed

7 files changed

+37
-20
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright 2024 Adobe
4+
* Copyright 2025 Adobe
55
* All Rights Reserved.
66
*/
77
-->
@@ -14,6 +14,6 @@
1414
<element name="dropdownSelectOption" type="select" selector="//div[@class='control']/select"/>
1515
<element name="dropdownProductSelection" type="select" selector="//div[@class='control']/select/option[contains(.,'{{productName}}')]" parameterized="true"/>
1616
<element name="customOptionField" type="select" selector="[class='input-text product-custom-option']"/>
17-
<element name="bundleOption" type="text" selector="//*[@id='product-options-wrapper']//div[@class='control']//span[text()='{{productName}}']" parameterized="true"/>
17+
<element name="bundleOption" type="text" selector="//select[contains(@class, 'bundle-option')]/option[contains(text(),'{{productName}}')]" parameterized="true"/>
1818
</section>
1919
</sections>

‎app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyShoppingCartPersistenceTest.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
<!--Delete Simple Product 1,customer and Category-->
4848
<deleteData createDataKey="createSimple1" stepKey="deleteSimple1"/>
4949
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
50+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexCustomerGrid">
51+
<argument name="indices" value="customer_grid"/>
52+
</actionGroup>
5053
<actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteJohnSmithCustomer">
5154
<argument name="customerEmail" value="John_Smith_Customer.email"/>
5255
</actionGroup>

‎app/code/Magento/Review/Test/Mftf/ActionGroup/AdminAddProductReviewActionGroup.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -16,8 +16,10 @@
1616
<waitForElementClickable selector="{{AdminCreateNewReviewSection.addNewReviewButton}}" stepKey="waitForElementClickOnNewReviewToBeClickable"/>
1717
<click selector="{{AdminCreateNewReviewSection.addNewReviewButton}}" stepKey="clickOnNewReview"/>
1818
<!--Select Product by SKU and Create Review -->
19-
<waitForElementClickable selector="{{AdminCreateNewReviewSection.addNewReviewBySKU(sku)}}" stepKey="waitForVisibleReviewButton"/>
20-
<click selector="{{AdminCreateNewReviewSection.addNewReviewBySKU(sku)}}" stepKey="addNewReviewBySKU"/>
19+
<fillField selector="{{AdminCreateNewReviewSection.filterName}}" userInput="{{sku}}" stepKey="fillValue"/>
20+
<pressKey parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" selector="{{AdminCreateNewReviewSection.filterName}}" stepKey="pressEnter"/>
21+
<waitForElementClickable selector="{{AdminCreateNewReviewSection.firstRowReview}}" stepKey="waitForVisibleReviewButton"/>
22+
<executeJS function="jQuery('{{AdminCreateNewReviewSection.firstRowReview}}').click()" stepKey="addNewReviewBySKU"/>
2123
<waitForElementVisible selector="{{AdminCreateNewReviewSection.select_stores}}" stepKey="waitForVisibleReviewDetails"/>
2224
<selectOption selector="{{AdminCreateNewReviewSection.select_stores}}" userInput="{{review.select_stores[0]}}" stepKey="visibilityField"/>
2325
<fillField selector="{{AdminCreateNewReviewSection.nickname}}" userInput="{{review.nickname}}" stepKey="fillNicknameField"/>

‎app/code/Magento/Review/Test/Mftf/Section/AdminCreateNewReviewSection.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
8-
98
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
109
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1110
<section name="AdminCreateNewReviewSection">
@@ -27,5 +26,7 @@
2726
<element name="grabLatestUserReviewDate" type="text" selector="//table[@class='data-grid']//tbody//tr[position()=1]//td[position()=3]"/>
2827
<element name="gridCustomer_filter_review_cnt" type="button" selector="#customers_grid_filter_review_cnt"/>
2928
<element name="CustomerSearchButton" type="button" selector="//*[@id='customers_grid']//button[contains(@title, 'Search')]"/>
29+
<element name="filterName" type="text" selector="#productGrid_product_filter_sku"/>
30+
<element name="firstRowReview" type="text" selector="#productGrid_table tbody tr:first-child td:first-child"/>
3031
</section>
3132
</sections>

‎app/code/Magento/Review/Test/Mftf/Test/AdminReviewsByProductsReportTest.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

@@ -16,7 +16,6 @@
1616
<description value="Review By Products Grid Filters"/>
1717
<severity value="AVERAGE"/>
1818
<testCaseId value="MC-32333"/>
19-
<group value="pr_exclude"/>
2019
</annotations>
2120
<before>
2221
<!--Login-->

‎app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminEnableUPSActionGroup.xml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

@@ -18,12 +18,18 @@
1818
<conditionalClick selector="{{AdminShippingMethodUPSSection.UPSTab}}" dependentSelector="{{AdminShippingMethodUPSSection.handlingFee}}" visible="false" stepKey="openUPSTab"/>
1919
<uncheckOption selector="{{AdminShippingMethodUPSSection.enableCheckoutCheckbox}}" stepKey="unCheckEnableForCheckout"/>
2020
<selectOption selector="{{AdminShippingMethodUPSSection.enableCheckoutSelect}}" userInput="{{shipping.enableCheckoutSelect}}" stepKey="selectEnableForCheckoutToYes"/>
21-
<fillField selector="{{AdminShippingMethodUPSSection.accessLicenseNumber}}" userInput="{{_CREDS.magento/carriers_ups_access_license_number}}" stepKey="enterAccessLicenseNumber"/>
22-
<fillField selector="{{AdminShippingMethodUPSSection.password}}" userInput="{{_CREDS.magento/carriers_ups_password}}" stepKey="enterPassword"/>
23-
<fillField selector="{{AdminShippingMethodUPSSection.username}}" userInput="{{_CREDS.magento/carriers_ups_username}}" stepKey="enterUsername"/>
21+
<uncheckOption selector="{{AdminShippingMethodUPSSection.carriersUPSTypeSystem}}" stepKey="unCheckTypeSystem"/>
22+
<selectOption selector="{{AdminShippingMethodUPSSection.carriersUpsType}}" userInput="UPS_REST" stepKey="selectRestOption"/>
23+
<uncheckOption selector="{{AdminShippingMethodUPSSection.carriersUpsGatewayRestUrlSystem}}" stepKey="unCheckGatewayRestUrlSystem"/>
24+
<fillField selector="{{AdminShippingMethodUPSSection.carriersUpsGatewayRestUrl}}" userInput="{{_CREDS.magento/carriers_ups_gateway_rest_url}}" stepKey="enterGateWayRestURl"/>
25+
<uncheckOption selector="{{AdminShippingMethodUPSSection.carriersUpsTrackingRestUrlSystem}}" stepKey="unCheckTrackingRestUrlSystem"/>
26+
<fillField selector="{{AdminShippingMethodUPSSection.carriersUpsTrackingRestUrl}}" userInput="{{_CREDS.magento/carriers_ups_tracking_rest_url}}" stepKey="enterTrackingRestURl"/>
27+
<comment userInput="BIC workaround" stepKey="enterAccessLicenseNumber"/>
28+
<fillField selector="{{AdminShippingMethodUPSSection.password}}" userInput="{{_CREDS.magento/carriers_ups_rest_password}}" stepKey="enterPassword"/>
29+
<fillField selector="{{AdminShippingMethodUPSSection.username}}" userInput="{{_CREDS.magento/carriers_ups_rest_username}}" stepKey="enterUsername"/>
2430
<uncheckOption selector="{{AdminShippingMethodUPSSection.modeCheckbox}}" stepKey="unCheckMode"/>
2531
<selectOption selector="{{AdminShippingMethodUPSSection.modeSelect}}" userInput="{{shipping.modeSelect}}" stepKey="selectModeToDevelopment"/>
26-
<fillField selector="{{AdminShippingMethodUPSSection.shipperNumberInput}}" userInput="{{_CREDS.magento/carriers_ups_shipper_number}}" stepKey="enterShipperNumber"/>
32+
<fillField selector="{{AdminShippingMethodUPSSection.shipperNumberInput}}" userInput="{{_CREDS.magento/carriers_ups_rest_shipper_number}}" stepKey="enterShipperNumber"/>
2733
<selectOption selector="{{AdminShippingMethodUPSSection.showMethodIfNotApplicableSelect}}" userInput="{{shipping.showMethodIfNotApplicableSelect}}" stepKey="selectShowMethodIfNotApplicableToYes"/>
2834
<selectOption selector="{{AdminShippingMethodUPSSection.debugSelect}}" userInput="{{shipping.debugSelect}}" stepKey="selectDebugToYes"/>
2935
<click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>

‎app/code/Magento/Shipping/Test/Mftf/Section/AdminShippingMethodUPSSection.xml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminShippingMethodUPSSection">
12+
<element name="carriersUPSTypeSystem" type="checkbox" selector="//*[@id='carriers_ups_type_inherit']"/>
13+
<element name="carriersUpsType" type="select" selector="//*[@id='carriers_ups_type']"/>
14+
<element name="carriersUpsGatewayRestUrlSystem" type="checkbox" selector="//*[@id='carriers_ups_gateway_rest_url_inherit']"/>
15+
<element name="carriersUpsGatewayRestUrl" type="input" selector="//*[@id='carriers_ups_gateway_rest_url']"/>
16+
<element name="carriersUpsTrackingRestUrlSystem" type="checkbox" selector="//*[@id='carriers_ups_tracking_rest_url_inherit']"/>
17+
<element name="carriersUpsTrackingRestUrl" type="input" selector="//*[@id='carriers_ups_tracking_rest_url']"/>
1218
<element name="UPSTab" type="button" selector="//div[@class='section-config']//div[@class='entry-edit-head admin__collapsible-block']//a[@id='carriers_ups-head']"/>
1319
<element name="enableCheckoutCheckbox" type="checkbox" selector="//tr[@id='row_carriers_ups_active']//td//input[@id='carriers_ups_active_inherit']"/>
1420
<element name="enableCheckoutSelect" type="select" selector="//tr[@id='row_carriers_ups_active']//td//select[@id='carriers_ups_active']"/>

0 commit comments

Comments
 (0)