MC-42486: Region ID and Country ID values and not properly converted in Email templates

- Added Static and Integration tests

Author: devarul

app/code/Magento/Email/Model/AbstractTemplate.php

@@ -823,7 +823,7 @@ protected function getCountryName($store)
             ScopeInterface::SCOPE_STORE,
             $store
         );
-        if($countryId) {
+        if ($countryId) {
             $countryName = $this->countryInformationAcquirerInterface->getCountryInfo($countryId)->getFullNameLocale();
         }
         return $countryName;
@@ -844,7 +844,7 @@ protected function getRegionName($store)
             ScopeInterface::SCOPE_STORE,
             $store
         );
-        if($regionId) {
+        if ($regionId) {
             $regionName = $this->regionFactory->create()->load($regionId)->getName();
         }
         return $regionName;

app/code/Magento/Newsletter/composer.json

@@ -15,7 +15,8 @@
         "magento/module-require-js": "*",
         "magento/module-store": "*",
         "magento/module-widget": "*",
-        "magento/module-ui": "*"
+        "magento/module-ui": "*",
+        "magento/module-directory": "*"
     },
     "type": "magento2-module",
     "license": [

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

@@ -67,6 +67,8 @@ protected function mockModel($filesystem = null)
                     $this->objectManager->get(\Magento\Email\Model\TemplateFactory::class),
                     $this->objectManager->get(\Magento\Framework\Filter\FilterManager::class),
                     $this->objectManager->get(\Magento\Framework\UrlInterface::class),
+                    $this->objectManager->get(\Magento\Directory\Api\CountryInformationAcquirerInterface::class),
+                    $this->objectManager->get(\Magento\Directory\Model\RegionFactory::class),
                     $this->objectManager->get(\Magento\Email\Model\Template\FilterFactory::class),
                 ]
             )