ENGCOM-4812: Fix #20111 - display variables in popup while editing ex…

…isting email template #22469 - Merge Pull Request #22469 from Bartlomiejsz/magento2:feature/fix_20111_email_template_variables - Merged commits: 1. 7d584ac 2. 4f6a15a 3. 65a61a5
magento · Apr 24, 2019 · 136f4a1 · 136f4a1
2 parents baae663 + 65a61a5
commit 136f4a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/code/Magento/Email/Model/Template.php b/app/code/Magento/Email/Model/Template.php
@@ -418,6 +418,8 @@ public function setOptions(array $options)
     }
 
     /**
+     *  Return filter factory.
+     *
      * @return \Magento\Email\Model\Template\FilterFactory
      */
     protected function getFilterFactory()

diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
@@ -703,8 +703,8 @@ public function testGetVariablesOptionArrayInGroup()
         $testTemplateVariables = '{"var data.name":"Sender Name","var data.email":"Sender Email"}';
         $this->model->setOrigTemplateVariables($testTemplateVariables);
         $variablesOptionArray = $this->model->getVariablesOptionArray(true);
-        $this->assertEquals('Template Variables', $variablesOptionArray['label']->getText());
-        $this->assertEquals($this->model->getVariablesOptionArray(), $variablesOptionArray['value']);
+        $this->assertEquals('Template Variables', $variablesOptionArray[0]['label']->getText());
+        $this->assertEquals($this->model->getVariablesOptionArray(), $variablesOptionArray[0]['value']);
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -418,6 +418,8 @@ public function setOptions(array $options) @@
         }
         /**
+         *  Return filter factory.
+         *
          * @return \Magento\Email\Model\Template\FilterFactory
          */
         protected function getFilterFactory()
@@ Expand Down @@