Merge remote-tracking branch 'origin/MC-40277' into 2.4-develop-pr118

Author: zakdma

app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDateTest.xml

@@ -14,8 +14,8 @@
             <title value="Admin should be able to create a Date product attribute"/>
             <description value="Admin should be able to create a Date product attribute"/>
             <severity value="BLOCKER"/>
-            <testCaseId value="MC-10895"/>
-            <group value="Catalog"/>
+            <testCaseId value="MC-26021"/>
+            <group value="catalog"/>
             <group value="mtf_migrated"/>
         </annotations>
 
@@ -34,7 +34,7 @@
 
         <!--Generate date for use as default value, needs to be MM/d/YYYY and mm/d/yy-->
         <generateDate date="now" format="m/j/Y" stepKey="generateDefaultDate"/>
-        <generateDate date="now" format="m/j/y" stepKey="generateDateCompressedFormat"/>
+        <generateDate date="now" format="n/j/y" stepKey="generateDateCompressedFormat"/>
 
         <!--Navigate to Stores > Attributes > Product.-->
         <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="goToProductAttributes"/>

dev/tests/integration/testsuite/Magento/Catalog/Block/Product/View/Options/Type/DateTest.php

@@ -20,6 +20,7 @@
 
 /**
  * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class DateTest extends TestCase
 {
@@ -96,9 +97,10 @@ protected function tearDown(): void
     }
 
     /**
-     * @magentoAppArea frontend
      * @param array $data
      * @param array $expected
+     * @magentoAppArea frontend
+     * @magentoConfigFixture current_store catalog/custom_options/year_range 2020,2030
      * @dataProvider toHtmlWithDropDownDataProvider
      */
     public function testToHtmlWithDropDown(array $data, array $expected): void
@@ -108,11 +110,12 @@ public function testToHtmlWithDropDown(array $data, array $expected): void
     }
 
     /**
-     * @magentoAppArea frontend
-     * @magentoConfigFixture current_store catalog/custom_options/use_calendar 1
      * @param array $data
      * @param array $expected
      * @param string|null $locale
+     * @magentoAppArea frontend
+     * @magentoConfigFixture current_store catalog/custom_options/use_calendar 1
+     * @magentoConfigFixture current_store catalog/custom_options/year_range 2020,2030
      * @dataProvider toHtmlWithCalendarDataProvider
      */
     public function testToHtmlWithCalendar(array $data, array $expected, ?string $locale = null): void