Merge remote-tracking branch 'origin/AC-6020' into Hammer_Platform_Health_246_Scope_23Nov2022

Author: glo71317

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

@@ -56,6 +56,12 @@ public function validate($object)
             );
         }
 
+        if (strcasecmp($attrCode, 'sku') >= 0 && strlen($value) === 0) {
+            throw new LocalizedException(
+                __('The "%1" attribute value is empty.', $attrCode)
+            );
+        }
+
         if ($this->string->strlen($object->getSku()) > self::SKU_MAX_LENGTH) {
             throw new LocalizedException(
                 __('SKU length should be %1 characters maximum.', self::SKU_MAX_LENGTH)

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

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCannotCreateSimpleProductWithEmptySKUTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Admin should not be able to create a product with SKU empty"/>
+            <title value="Admin should not be able to create a product with SKU empty"/>
+            <description value="Admin should not be able to create a product with SKU empty"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="AC-6020"/>
+            <group value="product"/>
+            <group value="pr_exclude"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="NavigateToEditProductAttributeActionGroup" stepKey="goToEditPage">
+                <argument name="ProductAttribute" value="sku"/>
+            </actionGroup>
+            <selectOption userInput="0" selector="#is_required" stepKey="selectOptionNo"/>
+            <click stepKey="saveAttribute" selector="#save" />
+            <waitForPageLoad stepKey="waitForSaveAttribute"/>
+        </before>
+        <after>
+            <actionGroup ref="NavigateToEditProductAttributeActionGroup" stepKey="goToEditPage">
+                <argument name="ProductAttribute" value="sku"/>
+            </actionGroup>
+            <selectOption userInput="1" selector="#is_required" stepKey="selectOptionYes"/>
+            <click stepKey="saveAttribute" selector="#save" />
+            <waitForPageLoad stepKey="waitForSaveAttribute" />
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToCreateProduct"/>
+        <waitForPageLoad stepKey="waitForAdminOpenNewProductFormPageActionGroup" />
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="wait1"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillName"/>
+        <actionGroup ref="FillMainProductFormByStringActionGroup" stepKey="fillSKU">
+            <argument name="productName" value="{{SimpleProduct.name}}"/>
+            <argument name="productSku" value=""/>
+            <argument name="productPrice" value="100"/>
+            <argument name="productQuantity" value="{{SimpleProduct.quantity}}"/>
+            <argument name="productStatus" value="{{SimpleProduct.status}}"/>
+            <argument name="productWeight" value="{{SimpleProduct.weight}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSave"/>
+        <waitForPageLoad stepKey="waitForAdminProductFormSaveActionGroup"/>
+        <see selector="The &quot;sku&quot; attribute value is empty." stepKey="seeErrorMessage"/>
+    </test>
+</tests>

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

@@ -318,6 +318,7 @@ Category,Category
 "There is no MediaGalleryEntryConverter for given type","There is no MediaGalleryEntryConverter for given type"
 "Please enter a number 0 or greater in this field.","Please enter a number 0 or greater in this field."
 "The value of attribute ""%1"" must be set","The value of attribute ""%1"" must be set"
+"The "%1" attribute value is empty.","The "%1" attribute value is empty."
 "SKU length should be %1 characters maximum.","SKU length should be %1 characters maximum."
 "Please enter a valid number in this field.","Please enter a valid number in this field."
 "We found a duplicate website, tier price, customer group and quantity.","We found a duplicate website, tier price, customer group and quantity."