Merge magento-partners/magento2ce#57.

Volodymyr Kublytskyi · Volodymyr Kublytskyi · commit d0e06283ba6f · 2017-11-17T17:39:30.000+02:00
diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -533,8 +533,13 @@ public function initiatePasswordReset($email, $template, $websiteId = null)
                 default:
                     throw new InputException(
                         __(
-                            'Invalid value of "%value" provided for the %fieldName field.',
-                            ['value' => $template, 'fieldName' => 'email type']
+                            'Invalid value of "%value" provided for the %fieldName field. Possible values are %template1 or %template2.',
+                            [
+                                'value' => $template,
+                                'fieldName' => 'template',
+                                'template1' => AccountManagement::EMAIL_REMINDER,
+                                'template2' => AccountManagement::EMAIL_RESET
+                            ]
                         )
                     );
             }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
@@ -1175,7 +1175,7 @@ public function testInitiatePasswordResetEmailReset()
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Invalid value of "" provided for the email type field
+     * @expectedExceptionMessage Invalid value of "" provided for the template field. Possible values are email_reminder or email_reset.
      */
     public function testInitiatePasswordResetNoTemplate()
     {

Original file line number	Diff line number	Diff line change
`@@ -1175,7 +1175,7 @@ public function testInitiatePasswordResetEmailReset()`
`1175`	`1175`
`1176`	`1176`	`/**`
`1177`	`1177`	`* @expectedException \Magento\Framework\Exception\InputException`
`1178`		`- * @expectedExceptionMessage Invalid value of "" provided for the email type field`
	`1178`	`+ * @expectedExceptionMessage Invalid value of "" provided for the template field. Possible values are email_reminder or email_reset.`
`1179`	`1179`	`*/`
`1180`	`1180`	`public function testInitiatePasswordResetNoTemplate()`
`1181`	`1181`	`{`