Skip to content

Commit 52fdc3a

Browse files
thomas-kl1thomas-kl1
authored
Merge branch '2.4-develop' into patch-24
2 parents 7f819b7 + 71432ae commit 52fdc3a

File tree

65 files changed

+2252
-103
lines changed

Some content is hidden

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

65 files changed

+2252
-103
lines changed

‎app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ define([
7575
byteConvert(currentFile.size);
7676

7777
// check if file is allowed to upload and resize
78-
allowedResize = $.inArray(currentFile.extension, allowedExt) !== -1;
78+
allowedResize = $.inArray(currentFile.extension?.toLowerCase(), allowedExt) !== -1;
7979

8080
if (!allowedResize) {
8181
fileUploader.aggregateError(currentFile.name,

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

Lines changed: 3 additions & 0 deletions
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

Lines changed: 350 additions & 0 deletions
Large diffs are not rendered by default.

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

Lines changed: 10 additions & 8 deletions
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/Checkout/view/frontend/web/js/view/billing-address.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,9 @@ function (
141141
* Update address action
142142
*/
143143
updateAddress: function () {
144-
var addressData, newBillingAddress;
144+
var addressData, newBillingAddress, needsToUpdateAddress;
145145

146+
needsToUpdateAddress = true;
146147
addressUpdated = true;
147148

148149
if (this.selectedAddress() && !this.isAddressFormVisible()) {
@@ -156,7 +157,9 @@ function (
156157
this.source.trigger(this.dataScopePrefix + '.custom_attributes.data.validate');
157158
}
158159

159-
if (!this.source.get('params.invalid')) {
160+
if (this.source.get('params.invalid')) {
161+
needsToUpdateAddress = false;
162+
} else {
160163
addressData = this.source.get(this.dataScopePrefix);
161164

162165
if (customer.isLoggedIn() && !this.customerHasAddresses) { //eslint-disable-line max-depth
@@ -168,9 +171,9 @@ function (
168171
selectBillingAddress(newBillingAddress);
169172
checkoutData.setSelectedBillingAddress(newBillingAddress.getKey());
170173
checkoutData.setNewCustomerBillingAddress(addressData);
171-
this.updateAddresses(true);
172174
}
173175
}
176+
this.updateAddresses(needsToUpdateAddress);
174177
},
175178

176179
/**

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

Lines changed: 18 additions & 0 deletions
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

Lines changed: 5 additions & 0 deletions
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

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="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

Lines changed: 29 additions & 0 deletions
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

Lines changed: 5 additions & 0 deletions
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>

0 commit comments

Comments
 (0)