From fa9b9f06473f016acc572e1595eaaa380bc684d4 Mon Sep 17 00:00:00 2001
From: Olga Matviienko <omatviienko@magento.com>
Date: Thu, 12 Jan 2017 16:25:09 +0200
Subject: [PATCH] MAGETWO-59112: [GITHUB] Invoice Address Formatting Issue
#6771
- Fixing test
---
app/code/Magento/Customer/etc/config.xml | 3 +--
.../Customer/Block/Address/Renderer/DefaultRendererTest.php | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/app/code/Magento/Customer/etc/config.xml b/app/code/Magento/Customer/etc/config.xml
index 33ea26f8de4..ccee6914e4e 100644
--- a/app/code/Magento/Customer/etc/config.xml
+++ b/app/code/Magento/Customer/etc/config.xml
@@ -86,8 +86,7 @@ T: {{var telephone}}
{{depend street2}}{{var street2}}|{{/depend}}
{{depend street3}}{{var street3}}|{{/depend}}
{{depend street4}}{{var street4}}|{{/depend}}
-{{if city}}{{var city}}, {{/if}}
-{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}|
+{{if city}}{{var city}}, {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}|
{{var country}}|
{{depend telephone}}T: {{var telephone}}|{{/depend}}
{{depend fax}}F: {{var fax}}|{{/depend}}|
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Address/Renderer/DefaultRendererTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Address/Renderer/DefaultRendererTest.php
index cdc31a9199b..14e4829ca96 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Address/Renderer/DefaultRendererTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Address/Renderer/DefaultRendererTest.php
@@ -56,7 +56,7 @@ class DefaultRendererTest extends \PHPUnit_Framework_TestCase
[
$addressAttributes,
AttributeDataFactory::OUTPUT_FORMAT_PDF,
- "John Smith|\n\nGreen str, 67\n\n\n\n\nCityM,|\nAlabama, 75477|\nUnited States|\nT: 3468676|\n|\n|"
+ "John Smith|\n\nGreen str, 67|\n\n\n\nCityM, Alabama, 75477|\nUnited States|\nT: 3468676|\n|\n|"
],
[
$addressAttributes,
@@ -112,7 +112,7 @@ United States<br/>\nT: <a href=\"tel:3468676\">3468676</a>\n\n",
[
$address,
AttributeDataFactory::OUTPUT_FORMAT_PDF,
- "John Smith|\n\nGreen str, 67\n\n\n\n\nCityM,|\nAlabama, 75477|
+ "John Smith|\n\nGreen str, 67|\n\n\n\nCityM, Alabama, 75477|
United States|\nT: 3468676|\n|\n|"
],
[
--
GitLab