Merge remote-tracking branch 'mainline/develop' into MAGETWO-50211-changelog

slavvka · slavvka · commit 7394a59a818b · 2016-06-22T17:12:57.000+03:00
diff --git a/app/code/Magento/Theme/Model/Design/Config/Validator.php b/app/code/Magento/Theme/Model/Design/Config/Validator.php
@@ -83,7 +83,8 @@ public function validate(DesignConfigInterface $designConfig)
                     if (isset($params['config_path']) && $params['config_path'] == $data['config_path']) {
                         throw new LocalizedException(
                             __(
-                                "Incorrect configuration for %templateName. Template body has a reference to itself",
+                                "The %templateName contains an incorrect configuration. The template has " .
+                                "a reference to itself. Either remove or change the reference.",
                                 ["templateName" => $name]
                             )
                         );
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Config/ValidatorTest.php b/app/code/Magento/Theme/Test/Unit/Model/Config/ValidatorTest.php
@@ -39,7 +39,7 @@ protected function setUp()
 
     /**
      * @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
      */
     public function testValidateHasRecursiveReference()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Model/Config/ValidatorTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/Config/ValidatorTest.php
@@ -32,7 +32,7 @@ protected function setUp()
     /**
      * @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
      */
     public function testValidateHasRecursiveReference()
     {

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ protected function setUp()`
`39`	`39`
`40`	`40`	`/**`
`41`	`41`	`* @expectedException \Magento\Framework\Exception\LocalizedException`
`42`		`- * @expectedExceptionMessage Incorrect configuration for email_header_template. Template body has a reference to`
	`42`	`+ * @expectedExceptionMessage The email_header_template contains an incorrect configuration. The template has a`
`43`	`43`	`*/`
`44`	`44`	`public function testValidateHasRecursiveReference()`
`45`	`45`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ protected function setUp()`
`32`	`32`	`/**`
`33`	`33`	`* @magentoDataFixture Magento/Email/Model/_files/email_template.php`
`34`	`34`	`* @expectedException \Magento\Framework\Exception\LocalizedException`
`35`		`- * @expectedExceptionMessage Incorrect configuration for email_header_template. Template body has a reference to`
	`35`	`+ * @expectedExceptionMessage The email_header_template contains an incorrect configuration. The template has a`
`36`	`36`	`*/`
`37`	`37`	`public function testValidateHasRecursiveReference()`
`38`	`38`	`{`