Merge remote-tracking branch 'origin/MAGETWO-48535' into BUGS

Author: sevos1984

app/code/Magento/Customer/Block/Widget/Dob.php

@@ -175,7 +175,7 @@ public function getLabel()
     public function getFieldHtml()
     {
         $this->dateElement->setData([
-            'extra_params' => $this->isRequired() ? 'data-validate="{required:true}"' : '',
+            'extra_params' => $this->getHtmlExtraParams(),
             'name' => $this->getHtmlId(),
             'id' => $this->getHtmlId(),
             'class' => $this->getHtmlClass(),
@@ -201,6 +201,26 @@ public function getHtmlId()
         return 'dob';
     }
 
+    /**
+     * Return data-validate rules
+     *
+     * @return string
+     */
+    public function getHtmlExtraParams()
+    {
+        $extraParams = [
+            "'validate-date-au':true"
+        ];
+
+        if ($this->isRequired()) {
+            $extraParams[] = 'required:true';
+        }
+
+        $extraParams = implode(', ', $extraParams);
+
+        return 'data-validate="{' . $extraParams . '}"';
+    }
+
     /**
      * Returns format which will be applied for DOB in javascript
      *

app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php

@@ -464,4 +464,23 @@ public function testGetMaxDateRangeWithException()
             );
         $this->assertNull($this->_block->getMaxDateRange());
     }
+    
+    public function testGetHtmlExtraParamsWithoutRequiredOption() {
+        $this->attribute->expects($this->once())
+            ->method("isRequired")
+            ->willReturn(false);
+
+        $this->assertEquals($this->_block->getHtmlExtraParams(), 'data-validate="{\'validate-date-au\':true}"');
+    }
+
+    public function testGetHtmlExtraParamsWithRequiredOption() {
+        $this->attribute->expects($this->once())
+            ->method("isRequired")
+            ->willReturn(true);
+
+        $this->assertEquals(
+            $this->_block->getHtmlExtraParams(),
+            'data-validate="{\'validate-date-au\':true, required:true}"'
+        );
+    }
 }