MAGETWO-54479: [Email] Change Messaging for "502 Bad Gateway" error when "New Account" email is initiated with custom templates.

Cari Spruiell · Cari Spruiell · commit 903ff8da009d · 2016-06-20T15:46:48.000-05:00
- updated tests
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Config/ValidatorTest.php b/app/code/Magento/Theme/Test/Unit/Model/Config/ValidatorTest.php
@@ -37,10 +37,12 @@ protected function setUp()
         );
     }
 
+    //@codingStandardsIgnoreStart
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Incorrect configuration for email_header_template. Template body has a reference to
+     * @expectedExceptionMessage The email_header_template contains an incorrect configuration. The template has a reference to itself. Either remove or change the reference.
      */
+    //@codingStandardsIgnoreEnd
     public function testValidateHasRecursiveReference()
     {
         $fieldConfig = [
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Model/Config/ValidatorTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/Config/ValidatorTest.php
@@ -29,11 +29,13 @@ protected function setUp()
         $this->model = $objectManager->get('Magento\Theme\Model\Design\Config\Validator');
     }
 
+    //@codingStandardsIgnoreStart
     /**
      * @magentoDataFixture Magento/Email/Model/_files/email_template.php
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Incorrect configuration for email_header_template. Template body has a reference to
+     * @expectedExceptionMessage The email_header_template contains an incorrect configuration. The template has a reference to itself. Either remove or change the reference.
      */
+    //@codingStandardsIgnoreEnd
     public function testValidateHasRecursiveReference()
     {
         $fieldConfig = [

Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,12 @@ protected function setUp()`
`37`	`37`	`);`
`38`	`38`	`}`
`39`	`39`
	`40`	`+ //@codingStandardsIgnoreStart`
`40`	`41`	`/**`
`41`	`42`	`* @expectedException \Magento\Framework\Exception\LocalizedException`
`42`		`- * @expectedExceptionMessage Incorrect configuration for email_header_template. Template body has a reference to`
	`43`	`+ * @expectedExceptionMessage The email_header_template contains an incorrect configuration. The template has a reference to itself. Either remove or change the reference.`
`43`	`44`	`*/`
	`45`	`+ //@codingStandardsIgnoreEnd`
`44`	`46`	`public function testValidateHasRecursiveReference()`
`45`	`47`	`{`
`46`	`48`	`$fieldConfig = [`
Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,13 @@ protected function setUp()`
`29`	`29`	`$this->model = $objectManager->get('Magento\Theme\Model\Design\Config\Validator');`
`30`	`30`	`}`
`31`	`31`
	`32`	`+ //@codingStandardsIgnoreStart`
`32`	`33`	`/**`
`33`	`34`	`* @magentoDataFixture Magento/Email/Model/_files/email_template.php`
`34`	`35`	`* @expectedException \Magento\Framework\Exception\LocalizedException`
`35`		`- * @expectedExceptionMessage Incorrect configuration for email_header_template. Template body has a reference to`
	`36`	`+ * @expectedExceptionMessage The email_header_template contains an incorrect configuration. The template has a reference to itself. Either remove or change the reference.`
`36`	`37`	`*/`
	`38`	`+ //@codingStandardsIgnoreEnd`
`37`	`39`	`public function testValidateHasRecursiveReference()`
`38`	`40`	`{`
`39`	`41`	`$fieldConfig = [`