AC-2391: Remove legacy variable resolver from email template processor

- update integration tests

Author: xmav

dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php

@@ -384,7 +384,7 @@ public function testTemplateLoadedFromDbIsFilteredInStrictMode()
         $this->objectManager->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class)
             ->setValue('design/email/footer_template', $template->getId(), ScopeInterface::SCOPE_STORE, 'fixturestore');
 
-        self::assertEquals('1 - some_unique_code -  - some_unique_code', $this->model->getProcessedTemplate());
+        self::assertEquals('- some_unique_code -  - some_unique_code', $this->model->getProcessedTemplate());
     }
 
     /**
@@ -393,7 +393,7 @@ public function testTemplateLoadedFromDbIsFilteredInStrictMode()
      * @magentoAppIsolation enabled
      * @magentoDbIsolation enabled
      */
-    public function testLegacyTemplateLoadedFromDbIsFilteredInLegacyMode()
+    public function testLegacyTemplateLoadedFromDbIsFilteredInStrictMode()
     {
         $this->mockModel();
 
@@ -417,7 +417,7 @@ public function testLegacyTemplateLoadedFromDbIsFilteredInLegacyMode()
         $this->objectManager->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class)
             ->setValue('design/email/footer_template', $template->getId(), ScopeInterface::SCOPE_STORE, 'fixturestore');
 
-        self::assertEquals('1 - some_unique_code - 1 - some_unique_code', $this->model->getProcessedTemplate());
+        self::assertEquals('- some_unique_code - - some_unique_code', $this->model->getProcessedTemplate());
     }
 
     /**
@@ -450,7 +450,7 @@ public function testPreviewTemplateIsFilteredInStrictMode()
         $this->objectManager->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class)
             ->setValue('design/email/footer_template', $template->getId(), ScopeInterface::SCOPE_STORE, 'fixturestore');
 
-        self::assertEquals('1 - some_unique_code -  - some_unique_code', $this->model->getProcessedTemplate());
+        self::assertEquals('- some_unique_code -  - some_unique_code', $this->model->getProcessedTemplate());
     }
 
     /**