MAGETWO-59112: [GITHUB] Invoice Address Formatting Issue #6771

zanilee · zanilee · commit fa9b9f06473f · 2017-01-12T16:25:09.000+02:00
- Fixing test
diff --git 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
@@ -56,7 +56,7 @@ public function renderArrayDataProvider()
             [
                 $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 @@ public function renderDataProvider()
             [
                 $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|"
             ],
             [

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function renderArrayDataProvider()`
`56`	`56`	`[`
`57`	`57`	`$addressAttributes,`
`58`	`58`	`AttributeDataFactory::OUTPUT_FORMAT_PDF,`
`59`		`- "John Smith\|\n\nGreen str, 67\n\n\n\n\nCityM,\|\nAlabama, 75477\|\nUnited States\|\nT: 3468676\|\n\|\n\|"`
	`59`	`+ "John Smith\|\n\nGreen str, 67\|\n\n\n\nCityM, Alabama, 75477\|\nUnited States\|\nT: 3468676\|\n\|\n\|"`
`60`	`60`	`],`
`61`	`61`	`[`
`62`	`62`	`$addressAttributes,`
`@@ -112,7 +112,7 @@ public function renderDataProvider()`
`112`	`112`	`[`
`113`	`113`	`$address,`
`114`	`114`	`AttributeDataFactory::OUTPUT_FORMAT_PDF,`
`115`		`- "John Smith\|\n\nGreen str, 67\n\n\n\n\nCityM,\|\nAlabama, 75477\|`
	`115`	`+ "John Smith\|\n\nGreen str, 67\|\n\n\n\nCityM, Alabama, 75477\|`
`116`	`116`	`United States\|\nT: 3468676\|\n\|\n\|"`
`117`	`117`	`],`
`118`	`118`	`[`