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

Cari Spruiell · Cari Spruiell · commit aa4545a849c9 · 2016-06-20T16:09:13.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,12 +37,10 @@ protected function setUp()
         );
     }
 
-    //@codingStandardsIgnoreStart
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage The email_header_template contains an incorrect configuration. The template has a reference to itself. Either remove or change the reference.
+     * @expectedExceptionMessage The email_header_template contains an incorrect configuration. The template has a
      */
-    //@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,13 +29,11 @@ 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 The email_header_template contains an incorrect configuration. The template has a reference to itself. Either remove or change the reference.
+     * @expectedExceptionMessage The email_header_template contains an incorrect configuration. The template has a
      */
-    //@codingStandardsIgnoreEnd
     public function testValidateHasRecursiveReference()
     {
         $fieldConfig = [

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