AC-13535: Minimum and maximum value validation does not work for DOB attribute on Storefront

Author: wip44850

app/code/Magento/Customer/Test/Unit/Plugin/ValidateDobOnSaveTest.php

@@ -50,10 +50,7 @@ public function testInvalidDobStringThrows(): void
         $this->mockAttributeRulesArray(['date_range_min' => '1980-01-01', 'date_range_max' => '2000-12-31']);
 
         $called = false;
-        $proceed = function (CustomerInterface $c, $hash = null) use (&$called) {
-            $called = true;
-            return $c;
-        };
+        $proceed = $this->proceedPlugin($called, $customer);
 
         $this->expectException(InputException::class);
         $this->expectExceptionMessage('Date of Birth is invalid.');
@@ -68,10 +65,7 @@ public function testDobBeforeMinThrows(): void
         $this->mockAttributeRulesArray(['date_range_min' => '1980-01-01', 'date_range_max' => '2000-12-31']);
 
         $called = false;
-        $proceed = function (CustomerInterface $c, $hash = null) use (&$called) {
-            $called = true;
-            return $c;
-        };
+        $proceed = $this->proceedPlugin($called, $customer);
 
         $this->expectException(InputException::class);
         $this->expectExceptionMessage('on or after 1980-01-01');
@@ -86,10 +80,7 @@ public function testDobAfterMaxThrows(): void
         $this->mockAttributeRulesArray(['date_range_min' => '1980-01-01', 'date_range_max' => '2000-12-31']);
 
         $called = false;
-        $proceed = function (CustomerInterface $c, $hash = null) use (&$called) {
-            $called = true;
-            return $c;
-        };
+        $proceed = $this->proceedPlugin($called, $customer);
 
         $this->expectException(InputException::class);
         $this->expectExceptionMessage('on or before 2000-12-31');
@@ -122,10 +113,7 @@ public function testEmptyDobSkipsValidationAndProceeds(): void
         $this->mockAttributeRulesArray(['date_range_min' => '1980-01-01', 'date_range_max' => '2000-12-31']);
 
         $called = false;
-        $proceed = function (CustomerInterface $c, $hash = null) use (&$called) {
-            $called = true;
-            return $c;
-        };
+        $proceed = $this->proceedPlugin($called, $customer);
 
         $actual = $this->plugin->aroundSave($this->repo, $proceed, $customer, null);
 
@@ -144,10 +132,7 @@ public function testRulesAsJsonStringAreUnserialized(): void
         $this->json->expects($this->once())->method('unserialize')->with($json)->willReturn($rules);
 
         $called = false;
-        $proceed = function (CustomerInterface $c, $hash = null) use (&$called) {
-            $called = true;
-            return $c;
-        };
+        $proceed = $this->proceedPlugin($called, $customer);
 
         $this->expectException(InputException::class);
         $this->expectExceptionMessage('on or after 1980-01-01');
@@ -165,10 +150,7 @@ public function testMillisecondRulesBeforeMinThrows(): void
         $this->mockAttributeRulesArray(['date_range_min' => $minMs, 'date_range_max' => $maxMs]);
 
         $called = false;
-        $proceed = function (CustomerInterface $c, $hash = null) use (&$called) {
-            $called = true;
-            return $c;
-        };
+        $proceed = $this->proceedPlugin($called, $customer);
 
         $this->expectException(InputException::class);
         $this->expectExceptionMessage('on or after 1980-01-01');
@@ -184,10 +166,7 @@ public function testDobAsMillisecondTimestampThrowsAgainstStringRule(): void
         $this->mockAttributeRulesArray(['date_range_min' => '1980-01-01', 'date_range_max' => '2000-12-31']);
 
         $called = false;
-        $proceed = function (CustomerInterface $c, $hash = null) use (&$called) {
-            $called = true;
-            return $c;
-        };
+        $proceed = $this->proceedPlugin($called, $customer);
 
         $this->expectException(InputException::class);
         $this->expectExceptionMessage('on or after 1980-01-01');
@@ -274,10 +253,7 @@ public function testFallbackToGetValidateRulesArrayIsUsed(): void
         ]);
 
         $called = false;
-        $proceed = function (CustomerInterface $c, $hash = null) use (&$called) {
-            $called = true;
-            return $c;
-        };
+        $proceed = $this->proceedPlugin($called, $customer);
 
         $this->expectException(InputException::class);
         $this->expectExceptionMessage('on or after 1980-01-01');
@@ -324,10 +300,7 @@ public function testDobZeroEpochInvalidThrows(): void
         ]);
 
         $called = false;
-        $proceed = function (CustomerInterface $c, $hash = null) use (&$called) {
-            $called = true;
-            return $c;
-        };
+        $proceed = $this->proceedPlugin($called, $customer);
 
         $this->expectException(InputException::class);
         $this->expectExceptionMessage('Date of Birth is invalid.');
@@ -336,6 +309,22 @@ public function testDobZeroEpochInvalidThrows(): void
         $this->assertFalse($called);
     }
 
+    /**
+     * Create a proceed closure that marks $called and returns either the given $result or the original $customer.
+     *
+     * @param bool $called Will be set to true when proceed is invoked
+     * @param CustomerInterface|null $result Optional value to return instead of $customer
+     * @return callable
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    private function proceedPlugin(bool &$called, ?CustomerInterface $result = null): callable
+    {
+        return function (CustomerInterface $c, $hash = null) use (&$called) {
+            $called = true;
+            return $c;
+        };
+    }
+
     /**
      * Create a customer mock with a specific DOB value.
      *