Skip to content

Commit cad2b8a

Browse files
glo82145glo82145
authored
Merge branch '2.4-develop' into Spartans_246_quality_mainlinepr
2 parents 96f5608 + 46fe3fe commit cad2b8a

File tree

45 files changed

+1125
-1092
lines changed

Some content is hidden

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

45 files changed

+1125
-1092
lines changed

‎app/code/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ public function validate($object)
5656
);
5757
}
5858

59+
if (strcasecmp($attrCode, 'sku') >= 0 && strlen($value) === 0) {
60+
throw new LocalizedException(
61+
__('The "%1" attribute value is empty.', $attrCode)
62+
);
63+
}
64+
5965
if ($this->string->strlen($object->getSku()) > self::SKU_MAX_LENGTH) {
6066
throw new LocalizedException(
6167
__('SKU length should be %1 characters maximum.', self::SKU_MAX_LENGTH)

‎app/code/Magento/Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ public function execute(
6868
$regularPrice + $optionPrice,
6969
$product
7070
);
71-
$finalOptionPrice = $totalCatalogRulePrice - $catalogRulePrice;
72-
return $this->priceCurrency->convertAndRound($finalOptionPrice);
71+
return $totalCatalogRulePrice - $catalogRulePrice;
7372
}
7473

7574
return null;

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

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1010
<test name="AdminAddImageToWYSIWYGCatalogTest">
11-
<before>
12-
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
13-
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
14-
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
15-
</before>
1611
<annotations>
1712
<features value="Catalog"/>
1813
<stories value="MAGETWO-42041-Default WYSIWYG toolbar configuration with Magento Media Gallery"/>
@@ -22,6 +17,34 @@
2217
<severity value="CRITICAL"/>
2318
<testCaseId value="MAGETWO-84373"/>
2419
</annotations>
20+
<before>
21+
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
22+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
23+
<argument name="enabled" value="0"/>
24+
</actionGroup>
25+
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
26+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
27+
</before>
28+
<after>
29+
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
30+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
31+
<argument name="FolderName" value="Storage Root"/>
32+
</actionGroup>
33+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
34+
<argument name="FolderName" value="wysiwyg"/>
35+
</actionGroup>
36+
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
37+
<argument name="ImageFolder" value="ImageFolder"/>
38+
</actionGroup>
39+
<actionGroup ref="DeleteCategoryActionGroup" stepKey="DeleteCategory">
40+
<argument name="categoryEntity" value="SimpleSubCategory"/>
41+
</actionGroup>
42+
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
43+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
44+
<argument name="enabled" value="1"/>
45+
</actionGroup>
46+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
47+
</after>
2548
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="navigateToNewCatalog"/>
2649
<comment userInput="BIC workaround" stepKey="wait2"/>
2750
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
@@ -57,22 +80,5 @@
5780
<waitForPageLoad stepKey="waitForPageLoad2"/>
5881
<seeElement selector="{{StorefrontCategoryMainSection.mediaDescription(ImageUpload3.content)}}" stepKey="assertMediaDescription"/>
5982
<seeElementInDOM selector="{{StorefrontCategoryMainSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
60-
<after>
61-
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
62-
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
63-
<argument name="FolderName" value="Storage Root"/>
64-
</actionGroup>
65-
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
66-
<argument name="FolderName" value="wysiwyg"/>
67-
</actionGroup>
68-
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
69-
<argument name="ImageFolder" value="ImageFolder"/>
70-
</actionGroup>
71-
<actionGroup ref="DeleteCategoryActionGroup" stepKey="DeleteCategory">
72-
<argument name="categoryEntity" value="SimpleSubCategory"/>
73-
</actionGroup>
74-
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
75-
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
76-
</after>
7783
</test>
7884
</tests>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020

2121
<before>
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
23+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
24+
<argument name="enabled" value="0"/>
25+
</actionGroup>
2326
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
2427
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
2528
</before>
@@ -36,6 +39,9 @@
3639
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteFolderFromMediaGallery">
3740
<argument name="Image" value="{{ImageFolder.name}}"/>
3841
</actionGroup>
42+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
43+
<argument name="enabled" value="1"/>
44+
</actionGroup>
3945
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4046
</after>
4147

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminCreateSimpleProductEmptySKUTest.xml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminCannotCreateSimpleProductWithEmptySKUTest">
11+
<annotations>
12+
<features value="Catalog"/>
13+
<stories value="Admin should not be able to create a product with SKU empty"/>
14+
<title value="Admin should not be able to create a product with SKU empty"/>
15+
<description value="Admin should not be able to create a product with SKU empty"/>
16+
<severity value="AVERAGE"/>
17+
<testCaseId value="AC-6020"/>
18+
<group value="product"/>
19+
<group value="pr_exclude"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23+
<actionGroup ref="NavigateToEditProductAttributeActionGroup" stepKey="goToEditPage">
24+
<argument name="ProductAttribute" value="sku"/>
25+
</actionGroup>
26+
<selectOption userInput="0" selector="#is_required" stepKey="selectOptionNo"/>
27+
<click stepKey="saveAttribute" selector="#save" />
28+
<waitForPageLoad stepKey="waitForSaveAttribute"/>
29+
</before>
30+
<after>
31+
<actionGroup ref="NavigateToEditProductAttributeActionGroup" stepKey="goToEditPage">
32+
<argument name="ProductAttribute" value="sku"/>
33+
</actionGroup>
34+
<selectOption userInput="1" selector="#is_required" stepKey="selectOptionYes"/>
35+
<click stepKey="saveAttribute" selector="#save" />
36+
<waitForPageLoad stepKey="waitForSaveAttribute" />
37+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
38+
</after>
39+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToCreateProduct"/>
40+
<waitForPageLoad stepKey="waitForAdminOpenNewProductFormPageActionGroup" />
41+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="wait1"/>
42+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillName"/>
43+
<actionGroup ref="FillMainProductFormByStringActionGroup" stepKey="fillSKU">
44+
<argument name="productName" value="{{SimpleProduct.name}}"/>
45+
<argument name="productSku" value=""/>
46+
<argument name="productPrice" value="100"/>
47+
<argument name="productQuantity" value="{{SimpleProduct.quantity}}"/>
48+
<argument name="productStatus" value="{{SimpleProduct.status}}"/>
49+
<argument name="productWeight" value="{{SimpleProduct.weight}}"/>
50+
</actionGroup>
51+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSave"/>
52+
<waitForPageLoad stepKey="waitForAdminProductFormSaveActionGroup"/>
53+
<see selector="The &quot;sku&quot; attribute value is empty." stepKey="seeErrorMessage"/>
54+
</test>
55+
</tests>

‎app/code/Magento/Catalog/i18n/en_US.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ Category,Category
318318
"There is no MediaGalleryEntryConverter for given type","There is no MediaGalleryEntryConverter for given type"
319319
"Please enter a number 0 or greater in this field.","Please enter a number 0 or greater in this field."
320320
"The value of attribute ""%1"" must be set","The value of attribute ""%1"" must be set"
321+
"The "%1" attribute value is empty.","The "%1" attribute value is empty."
321322
"SKU length should be %1 characters maximum.","SKU length should be %1 characters maximum."
322323
"Please enter a valid number in this field.","Please enter a valid number in this field."
323324
"We found a duplicate website, tier price, customer group and quantity.","We found a duplicate website, tier price, customer group and quantity."

‎app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductCategories.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public function getCategoryIdsByProduct(int $productId, int $storeId)
7070
['store_group' => $storeGroupTable],
7171
$connection->quoteInto(
7272
'store.group_id = store_group.group_id AND NOT EXISTS
73-
(SELECT 1 FROM store_group WHERE cat_index.category_id IN (store_group.root_category_id)
73+
(SELECT 1 FROM '.$storeGroupTable.' WHERE cat_index.category_id IN (store_group.root_category_id)
7474
and cat_index.product_id = ?)',
7575
$productId,
7676
\Zend_Db::INT_TYPE

‎app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontApplyCatalogRuleForSimpleProductsWithCustomOptionsMultiCurrencyStoreTest.xml

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="StorefrontApplyCatalogRuleForSimpleProductsWithCustomOptionsMultiCurrencyStoreTest">
11+
<annotations>
12+
<features value="CatalogRule"/>
13+
<stories value="Apply catalog price rule"/>
14+
<title value="Admin should be able to apply the catalog price rule for simple product with 1 custom options in multi currency store"/>
15+
<description value="Admin should be able to apply the catalog price rule for simple product with 1 custom options in multi currency store"/>
16+
<severity value="CRITICAL"/>
17+
<testCaseId value="AC-2688"/>
18+
<group value="catalogRule"/>
19+
<group value="catalog"/>
20+
</annotations>
21+
<before>
22+
<magentoCLI command="config:set {{StorefrontEnableAddStoreCodeToUrls.path}} {{StorefrontEnableAddStoreCodeToUrls.value}}" stepKey="addStoreCodeToUrlEnable"/>
23+
24+
<!-- Login as Admin -->
25+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
26+
27+
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView">
28+
<argument name="customStore" value="customStore"/>
29+
</actionGroup>
30+
31+
<actionGroup ref="AdminNavigateToCurrencySetupPageActionGroup" stepKey="goToCurrencySetupPage"/>
32+
<actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="switchToDefaultStoreView">
33+
<argument name="storeView" value="_defaultStore.name"/>
34+
</actionGroup>
35+
<uncheckOption selector="{{AdminConfigSection.allowedCurrencyCheckbox}}" stepKey="uncheckUseSystemValueDisplayCurrency"/>
36+
<uncheckOption selector="{{AdminConfigSection.defaultCurrencyCheckbox}}" stepKey="uncheckUseSystemValueAllowedCurrency"/>
37+
<selectOption selector="{{AdminConfigSection.defaultCurrency}}" userInput="Euro" stepKey="selectAllowedDisplayCurrency"/>
38+
<selectOption selector="{{AdminConfigSection.allowedCurrencies}}" parameterArray="['Euro']" stepKey="selectDefaultDisplayCurrency"/>
39+
<actionGroup ref="SaveStoreConfigurationActionGroup" stepKey="saveStoreConfiguration"/>
40+
41+
<actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="switchToDefaultStoreViewCustom">
42+
<argument name="storeView" value="customStore.name"/>
43+
</actionGroup>
44+
<uncheckOption selector="{{AdminConfigSection.allowedCurrencyCheckbox}}" stepKey="uncheckUseSystemValueDisplayCurrency1"/>
45+
<uncheckOption selector="{{AdminConfigSection.defaultCurrencyCheckbox}}" stepKey="uncheckUseSystemValueAllowedCurrency1"/>
46+
<selectOption selector="{{AdminConfigSection.defaultCurrency}}" userInput="Norwegian Krone" stepKey="selectAllowedDisplayCurrency1"/>
47+
<selectOption selector="{{AdminConfigSection.allowedCurrencies}}" parameterArray="['Norwegian Krone']" stepKey="selectDefaultDisplayCurrency1"/>
48+
<actionGroup ref="SaveStoreConfigurationActionGroup" stepKey="saveStoreConfiguration1"/>
49+
50+
<actionGroup ref="AdminOpenCurrencyRatesPageActionGroup" stepKey="gotToCurrencyRatesPageSecondTime"/>
51+
<comment userInput="Adding the comment to replace action for preserving Backward Compatibility" stepKey="waitForLoadRatesPageSecondTime"/>
52+
<actionGroup ref="AdminSetCurrencyRatesActionGroup" stepKey="setCurrencyRates">
53+
<argument name="firstCurrency" value="USD"/>
54+
<argument name="secondCurrency" value="EUR"/>
55+
<argument name="rate" value="1"/>
56+
</actionGroup>
57+
<actionGroup ref="AdminSetCurrencyRatesActionGroup" stepKey="setCurrencyRatesNOK">
58+
<argument name="firstCurrency" value="USD"/>
59+
<argument name="secondCurrency" value="NOK"/>
60+
<argument name="rate" value="10"/>
61+
</actionGroup>
62+
63+
<createData entity="_defaultCategory" stepKey="createCategory"/>
64+
<createData entity="_defaultProduct" stepKey="createProduct1">
65+
<requiredEntity createDataKey="createCategory"/>
66+
<field key="price">10</field>
67+
</createData>
68+
69+
<!-- Update all products to have custom options -->
70+
<updateData createDataKey="createProduct1" entity="productWithCheckbox" stepKey="updateProductWithOptions"/>
71+
72+
<!-- Clear all catalog price rules before test -->
73+
<actionGroup ref="AdminCatalogPriceRuleDeleteAllActionGroup" stepKey="deleteAllCatalogRulesBeforeTest"/>
74+
<magentoCron groups="index" stepKey="fixInvalidatedIndicesBeforeTest"/>
75+
</before>
76+
<after>
77+
<magentoCLI command="config:set {{StorefrontDisableAddStoreCodeToUrls.path}} {{StorefrontDisableAddStoreCodeToUrls.value}}" stepKey="addStoreCodeToUrlDisable"/>
78+
79+
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView1">
80+
<argument name="customStore" value="customStore"/>
81+
</actionGroup>
82+
83+
<actionGroup ref="AdminNavigateToCurrencySetupPageActionGroup" stepKey="goToCurrencySetupPage"/>
84+
<actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="switchToDefaultStoreView">
85+
<argument name="storeView" value="_defaultStore.name"/>
86+
</actionGroup>
87+
<actionGroup ref="AdminCheckUseSystemValueActionGroup" stepKey="checkUseSystemValueForAllowedCurrency">
88+
<argument name="rowId" value="row_currency_options_allow"/>
89+
</actionGroup>
90+
<actionGroup ref="SaveStoreConfigurationActionGroup" stepKey="saveStoreConfiguration"/>
91+
92+
<!-- Delete products and category -->
93+
<deleteData createDataKey="createProduct1" stepKey="deleteProduct1"/>
94+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
95+
96+
<!-- Delete the catalog price rule -->
97+
<actionGroup ref="AdminCatalogPriceRuleDeleteAllActionGroup" stepKey="deleteAllCatalogRulesAfterTest"/>
98+
<magentoCron groups="index" stepKey="fixInvalidatedIndicesAfterTest"/>
99+
100+
<!-- Logout -->
101+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
102+
</after>
103+
<!-- 1. Begin creating a new catalog price rule -->
104+
<actionGroup ref="AdminOpenNewCatalogPriceRuleFormPageActionGroup" stepKey="openNewCatalogPriceRulePage"/>
105+
<actionGroup ref="AdminCatalogPriceRuleFillMainInfoActionGroup" stepKey="fillMainInfoForCatalogPriceRule">
106+
<argument name="groups" value="'NOT LOGGED IN'"/>
107+
</actionGroup>
108+
<actionGroup ref="AdminFillCatalogRuleConditionActionGroup" stepKey="fillConditionsForCatalogPriceRule">
109+
<argument name="conditionValue" value="$createCategory.id$"/>
110+
</actionGroup>
111+
<actionGroup ref="AdminCatalogPriceRuleFillActionsActionGroup" stepKey="fillActionsForCatalogPriceRule">
112+
<argument name="apply" value="by_percent"/>
113+
<argument name="discountAmount" value="10"/>
114+
</actionGroup>
115+
<actionGroup ref="AdminCatalogPriceRuleSaveAndApplyActionGroup" stepKey="saveAndApplyCatalogPriceRule"/>
116+
117+
118+
<!-- Navigate to product 1 on store front -->
119+
<actionGroup ref="StorefrontOpenProductPageUsingStoreCodeInUrlActionGroup" stepKey="openProductPageUsingStoreCodeInUrl">
120+
<argument name="product" value="$createProduct1$"/>
121+
<argument name="storeView" value="customStore"/>
122+
</actionGroup>
123+
124+
<actionGroup ref="AssertStorefrontCustomOptionCheckboxByPriceActionGroup" stepKey="checkPriceProductOptionEUR">
125+
<argument name="price" value="110.7"/>
126+
</actionGroup>
127+
</test>
128+
</tests>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,16 @@
4040
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
4141
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
4242
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
43+
<!-- set shipping as default -->
44+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
45+
<actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodConfigPage"/>
46+
<conditionalClick selector="{{AdminShippingMethodFlatRateSection.carriersFlatRateTab}}" dependentSelector="{{AdminShippingMethodFlatRateSection.carriersFlatRateActive}}" visible="false" stepKey="expandFlatRateTab"/>
47+
<click selector="{{AdminShippingMethodFlatRateSection.carriersEnableFlatRateActive}}" stepKey="useDefaultValue"/>
48+
<click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfigs"/>
49+
<waitForPageLoad stepKey="waitForPageLoad"/>
50+
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the configuration." stepKey="seeSuccessMessage"/>
51+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
52+
<!-- set shipping as default -->
4353
<comment userInput="BIC workaround" stepKey="logoutCustomer"/>
4454
</after>
4555
<!-- Add simple product to cart and go to checkout-->

0 commit comments

Comments
 (0)