Skip to content
Snippets Groups Projects
Commit fa9b9f06 authored by Olga Matviienko's avatar Olga Matviienko
Browse files

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

- Fixing test
parent e963f7f7
Branches
No related merge requests found
...@@ -86,8 +86,7 @@ T: {{var telephone}} ...@@ -86,8 +86,7 @@ T: {{var telephone}}
{{depend street2}}{{var street2}}|{{/depend}} {{depend street2}}{{var street2}}|{{/depend}}
{{depend street3}}{{var street3}}|{{/depend}} {{depend street3}}{{var street3}}|{{/depend}}
{{depend street4}}{{var street4}}|{{/depend}} {{depend street4}}{{var street4}}|{{/depend}}
{{if city}}{{var city}}, {{/if}} {{if city}}{{var city}}, {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}|
{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}|
{{var country}}| {{var country}}|
{{depend telephone}}T: {{var telephone}}|{{/depend}} {{depend telephone}}T: {{var telephone}}|{{/depend}}
{{depend fax}}F: {{var fax}}|{{/depend}}| {{depend fax}}F: {{var fax}}|{{/depend}}|
......
...@@ -56,7 +56,7 @@ class DefaultRendererTest extends \PHPUnit_Framework_TestCase ...@@ -56,7 +56,7 @@ class DefaultRendererTest extends \PHPUnit_Framework_TestCase
[ [
$addressAttributes, $addressAttributes,
AttributeDataFactory::OUTPUT_FORMAT_PDF, 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, $addressAttributes,
...@@ -112,7 +112,7 @@ United States<br/>\nT: <a href=\"tel:3468676\">3468676</a>\n\n", ...@@ -112,7 +112,7 @@ United States<br/>\nT: <a href=\"tel:3468676\">3468676</a>\n\n",
[ [
$address, $address,
AttributeDataFactory::OUTPUT_FORMAT_PDF, 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|" United States|\nT: 3468676|\n|\n|"
], ],
[ [
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment