Skip to content

Commit cbed4c8

Browse files
magento-devops-queue-mgr-svcmagento-devops-queue-mgr-svc
authored
Merge branch '2.4-develop' into Arrows_Delivery_07022024
2 parents 8b1d1c3 + 29cd372 commit cbed4c8

File tree

41 files changed

+1765
-15
lines changed

Some content is hidden

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

41 files changed

+1765
-15
lines changed

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCheckBoxOptionValidationTest.xml

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
<group value="Bundle"/>
2020
<group value="pr_exclude"/>
2121
<group value="cloud"/>
22+
<skip>
23+
<issueId value="AC-10826"/>
24+
</skip>
2225
</annotations>
2326
<before>
2427
<createData entity="ApiProductWithDescription" stepKey="simpleProduct1" before="bundleProduct"/>

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

+350
Large diffs are not rendered by default.

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

+10-8
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@
3838
<argument name="customStore" value="NewStoreViewData"/>
3939
</actionGroup>
4040
<amOnPage url="{{ConfigCurrencySetupPage.url}}" stepKey="navigateToConfigCurrencySetupPage1"/>
41-
<click selector="{{CurrencySetupSection.currencyOptions}}" stepKey="openCurrencyOptions"/>
41+
<waitForElementClickable selector="{{CurrencySetupSection.currencyOptions}}" stepKey="waitForCurrencyOptions"/>
42+
<conditionalClick selector="{{CurrencySetupSection.currencyOptions}}" dependentSelector="{{CurrencySetupSection.CheckCurrencyOptionsIfTabExpand}}" stepKey="openCurrencyOptions" visible="true"/>
43+
<waitForElementVisible selector="{{CurrencySetupSection.baseCurrencyUseDefault}}" stepKey="waitForUseDefaultCheckbox"/>
44+
<uncheckOption selector="{{CurrencySetupSection.baseCurrencyUseDefault}}" stepKey="uncheckUseDefaultOption"/>
4245
<selectOption selector="{{CurrencySetupSection.baseCurrency}}" userInput="Swedish Krona" stepKey="setBaseCurrencyField"/>
4346
<selectOption selector="{{CurrencySetupSection.allowCurrencies}}" parameterArray="['Euro', 'US Dollar']" stepKey="selectCurrencies"/>
4447
<click stepKey="saveConfigs" selector="{{AdminConfigSection.saveButton}}"/>
@@ -63,7 +66,6 @@
6366
<waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitingForInformationModal"/>
6467
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreSwitch"/>
6568
<waitForPageLoad stepKey="waitForPageLoad8"/>
66-
6769
<actionGroup ref="AdminOpenCurrencyRatesPageActionGroup" stepKey="gotToCurrencyRatesPage"/>
6870
<actionGroup ref="AdminSetCurrencyRatesActionGroup" stepKey="revertCurrencyRates1">
6971
<argument name="firstCurrency" value="EUR"/>
@@ -176,20 +178,20 @@
176178
</actionGroup>
177179
<actionGroup ref="AssertStorefrontProductDetailPageTierPriceWithCurrencyActionGroup" stepKey="assertProductTierPriceText">
178180
<argument name="tierProductPriceDiscountQuantity" value="10"/>
179-
<argument name="productPriceWithAppliedTierPriceDiscount" value="0.84"/>
180-
<argument name="productSavedPricePercent" value="92"/>
181+
<argument name="productPriceWithAppliedTierPriceDiscount" value="9.00"/>
182+
<argument name="productSavedPricePercent" value="10"/>
181183
<argument name="index" value="1"/>
182184
</actionGroup>
183185
<actionGroup ref="AssertStorefrontProductDetailPageTierPriceWithCurrencyActionGroup" stepKey="assertProductTierPriceText2">
184186
<argument name="tierProductPriceDiscountQuantity" value="20"/>
185-
<argument name="productPriceWithAppliedTierPriceDiscount" value="0.74"/>
186-
<argument name="productSavedPricePercent" value="93"/>
187+
<argument name="productPriceWithAppliedTierPriceDiscount" value="8.00"/>
188+
<argument name="productSavedPricePercent" value="20"/>
187189
<argument name="index" value="2"/>
188190
</actionGroup>
189191
<actionGroup ref="AssertStorefrontProductDetailPageTierPriceWithCurrencyActionGroup" stepKey="assertProductTierPriceText3">
190192
<argument name="tierProductPriceDiscountQuantity" value="30"/>
191-
<argument name="productPriceWithAppliedTierPriceDiscount" value="0.65"/>
192-
<argument name="productSavedPricePercent" value="94"/>
193+
<argument name="productPriceWithAppliedTierPriceDiscount" value="7.00"/>
194+
<argument name="productSavedPricePercent" value="30"/>
193195
<argument name="index" value="3"/>
194196
</actionGroup>
195197
</test>

‎app/code/Magento/Config/Test/Mftf/ActionGroup/AdminEnableDHLWithoutSpecificCountryConfigurationActionGroup.xml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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="AdminEnableDHLWithoutSpecificCountryConfigurationActionGroup" extends="AdminEnableDHLConfigurationActionGroup">
12+
<annotations>
13+
<description>Enable DHL shipping method without specific country and their configuration</description>
14+
</annotations>
15+
<remove keyForRemoval="DHLSpecificCountries"/>
16+
<remove keyForRemoval="DHLSelectSpecificCountry"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Config/Test/Mftf/Data/DHLConfigData.xml

+5
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,9 @@
8989
<data key="label">No</data>
9090
<data key="value">0</data>
9191
</entity>
92+
<entity name="AdminPoundsUnitOfMeasureDHL">
93+
<data key="path">carriers/dhl/unit_of_measure</data>
94+
<data key="label">Pounds</data>
95+
<data key="value">L</data>
96+
</entity>
9297
</entities>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminAddOptionForAttributeActionGroup.xml

+21
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="AdminAddOptionForAttributeActionGroup">
12+
<annotations>
13+
<description>Admin add default option for attribute.</description>
14+
</annotations>
15+
<!--Add option to attribute-->
16+
<waitForElementClickable selector="{{AdminNewAttributePanel.addOption}}" stepKey="waitForAddOption"/>
17+
<click selector="{{AdminNewAttributePanel.addOption}}" stepKey="clickOnAddOption"/>
18+
<waitForElementVisible selector="{{AdminNewAttributePanel.optionAdminValue('1')}}" stepKey="waitForAdminLabel"/>
19+
<fillField selector="{{AdminNewAttributePanel.optionAdminValue('1')}}" userInput="10" stepKey="fillAdminLabelForOption"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateNewDefaultAttributeForAsWithOptionActionGroup.xml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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="AdminCreateNewDefaultAttributeForAsWithOptionActionGroup">
12+
<annotations>
13+
<description>Admin add default option for attribute.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="defaultLabel" type="string"/>
17+
</arguments>
18+
<switchToIFrame selector="{{AdminNewAttributePanel.newAttributeIFrame}}" stepKey="switchToNewAttributeIFrame"/>
19+
<waitForElementVisible selector="{{AdminNewAttributePanel.defaultLabel}}" stepKey="waitFprDefaultLabelInputField"/>
20+
<fillField selector="{{AdminNewAttributePanel.defaultLabel}}" userInput="{{defaultLabel}}" stepKey="fillDefaultLabel"/>
21+
<!--Add option 1 to attribute-->
22+
<waitForElementClickable selector="{{AdminNewAttributePanel.addOption}}" stepKey="waitForAddOption"/>
23+
<click selector="{{AdminNewAttributePanel.addOption}}" stepKey="clickOnAddOption"/>
24+
<waitForElementClickable selector="{{AdminNewAttributePanel.isDefault('1')}}" time="30" stepKey="waitForOptionRow"/>
25+
<click selector="{{AdminNewAttributePanel.isDefault('1')}}" stepKey="clickOnDefault"/>
26+
<waitForElementVisible selector="{{AdminNewAttributePanel.optionAdminValue('0')}}" stepKey="waitForAdminLabelForOptionToBecomeVisible"/>
27+
<fillField selector="{{AdminNewAttributePanel.optionAdminValue('0')}}" userInput="8" stepKey="fillAdminLabelForOption1"/>
28+
</actionGroup>
29+
</actionGroups>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ProductConfigurableAttributeData.xml

+5
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,9 @@
7575
<data key="quantity">6</data>
7676
<data key="weight">1</data>
7777
</entity>
78+
<entity name="sizeAttribute" type="attribute">
79+
<data key="default_label" unique="suffix">Size</data>
80+
<data key="input_type">Dropdown</data>
81+
<data key="attribute_code">size</data>
82+
</entity>
7883
</entities>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml

+2
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,7 @@
6262
<element name="attributeRowByAttributeCode" type="block" selector="//td[count(../../..//th[./*[.='Attribute Code']]/preceding-sibling::th) + 1][./*[.='{{attribute_code}}']]/../td//input[@data-action='select-row']" parameterized="true"/>
6363
<element name="qtyForColorAttribute" type="text" selector="//span[text()='{{var1}}']/../..//input[@type='text']" parameterized="true"/>
6464
<element name="configProductName" type="text" selector="//table[@class='data-grid data-grid-configurable']//tbody//tr[{{row}}]//td[2]//span" parameterized="true"/>
65+
<element name="cancel" type="button" selector=".action-cancel"/>
66+
<element name="back" type="button" selector=".action-back-step"/>
6567
</section>
6668
</sections>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection/AdminProductFormConfigurationsSection.xml

+4
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,9 @@
6060
<element name="searchBySource" type="input" selector="//div[contains(@data-bind,'inventory_source_listing.inventory_source_listing')]/div[2]//input[@placeholder='Search by keyword']"/>
6161
<element name="clickSearch" type="button" selector="//div[contains(@data-bind,'inventory_source_listing.inventory_source_listing')]/div[2]//button[@aria-label='Search']"/>
6262
<element name="btnDoneAdvancedInventory" type="button" selector="//aside[@class='modal-slide product_form_product_form_advanced_inventory_modal _show']//button[@class='action-primary']//span[text()='Done']/.." />
63+
<element name="paginationDropDropdown" type="button" selector="//*[@data-index='configurable-matrix'][1]//div[@class='admin__control-table-pagination']//select"/>
64+
<element name="evenProduct" type="text" selector="//tr[@class='data-row'][{{row}}]/td[{{column}}]//a" parameterized="true"/>
65+
<element name="oddProduct" type="text" selector="//tr[@class='data-row _odd-row'][{{row}}]/td[{{column}}]//a" parameterized="true"/>
66+
<element name="nextPageArrow" type="text" selector="(//*[@class='action-next'])[2]"/>
6367
</section>
6468
</sections>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Section/ConfigurableProductAttributeNameDesignSection/NewProductSection.xml

+4
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,9 @@
2929
<element name="saveAttributeButton" type="button" selector="//*[@id='save']"/>
3030
<element name="advancedAttributeProperties" type="button" selector="//*[@id='advanced_fieldset-wrapper']//*[contains(text(),'Advanced Attribute Properties')]"/>
3131
<element name="attributeCodeField" type="input" selector="//*[@id='attribute_code']"/>
32+
<element name="selectAttribute" type="button" selector=".steps-wizard-navigation .active"/>
33+
<element name="title" type="button" selector="//*[text()='{{title}}']" parameterized="true"/>
34+
<element name="titleContainsText" type="button" selector=".//*[contains(text(),'{{titleContainsText}}')]" parameterized="true"/>
35+
<element name="productSku" type="input" selector="//input[@name='product[sku]']"/>
3236
</section>
3337
</sections>

0 commit comments

Comments
 (0)