MAGETWO-37672: Responsive Email Foundation

Erik Hansen · Erik Hansen · commit d96951c54d44 · 2015-06-29T18:47:53.000-05:00
- Fixed failing unit tests
diff --git a/app/code/Magento/Email/Model/BackendTemplate.php b/app/code/Magento/Email/Model/BackendTemplate.php
@@ -54,8 +54,8 @@ public function __construct(
         $this->_structure = $structure;
         parent::__construct(
             $context,
-            $registry,
             $design,
+            $registry,
             $appEmulation,
             $storeManager,
             $assetRepo,
diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php
@@ -204,7 +204,7 @@ public function testGetProcessedTemplateSubject()
      * @param $storeId int
      * @param $expectedVariables array
      * @param $expectedResult string
-     * @dataProvider getProcessedTemplateProvider
+     * @dataProvider getProcessedTemplateDataProvider
      */
     public function testGetProcessedTemplate($variables, $templateType, $storeId, $expectedVariables, $expectedResult)
     {

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ public function testGetProcessedTemplateSubject()`
`204`	`204`	`* @param $storeId int`
`205`	`205`	`* @param $expectedVariables array`
`206`	`206`	`* @param $expectedResult string`
`207`		`- * @dataProvider getProcessedTemplateProvider`
	`207`	`+ * @dataProvider getProcessedTemplateDataProvider`
`208`	`208`	`*/`
`209`	`209`	`public function testGetProcessedTemplate($variables, $templateType, $storeId, $expectedVariables, $expectedResult)`
`210`	`210`	`{`