Skip to content

Commit 77e4817

Browse files
vrannvrann
committed
MAGETWO-65592: [GitHub][PR] Consistent HTML tags and breaks #8048
- Merge Pull Request #8048 from chickenland/magento2:patch-1
2 parents 3f75fac + 7db0aed commit 77e4817

File tree

6 files changed

+64
-64
lines changed

6 files changed

+64
-64
lines changed

‎app/code/Magento/Customer/etc/config.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,17 @@
7272
{{depend fax}}F: {{var fax}}{{/depend}}
7373
{{depend vat_id}}VAT: {{var vat_id}}{{/depend}}</text>
7474
<oneline>{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}, {{var street}}, {{var city}}, {{var region}} {{var postcode}}, {{var country}}</oneline>
75-
<html><![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}{{depend firstname}}<br/>{{/depend}}
75+
<html><![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}{{depend firstname}}<br />{{/depend}}
7676
{{depend company}}{{var company}}<br />{{/depend}}
7777
{{if street1}}{{var street1}}<br />{{/if}}
7878
{{depend street2}}{{var street2}}<br />{{/depend}}
7979
{{depend street3}}{{var street3}}<br />{{/depend}}
8080
{{depend street4}}{{var street4}}<br />{{/depend}}
81-
{{if city}}{{var city}}, {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}<br/>
82-
{{var country}}<br/>
81+
{{if city}}{{var city}}, {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}<br />
82+
{{var country}}<br />
8383
{{depend telephone}}T: <a href="tel:{{var telephone}}">{{var telephone}}</a>{{/depend}}
84-
{{depend fax}}<br/>F: {{var fax}}{{/depend}}
85-
{{depend vat_id}}<br/>VAT: {{var vat_id}}{{/depend}}]]></html>
84+
{{depend fax}}<br />F: {{var fax}}{{/depend}}
85+
{{depend vat_id}}<br />VAT: {{var vat_id}}{{/depend}}]]></html>
8686
<pdf><![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}|
8787
{{depend company}}{{var company}}|{{/depend}}
8888
{{if street1}}{{var street1}}|{{/if}}

‎dev/tests/integration/testsuite/Magento/Customer/Block/Account/Dashboard/AddressTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ public function testGetPrimaryShippingAddressHtml($customerId, $expected)
9797

9898
public function getPrimaryShippingAddressHtmlDataProvider()
9999
{
100-
$expected = "John Smith<br/>\nCompanyName<br />\nGreen str, 67<br />\n\n\n\nCityM, Alabama, 75477<br/>"
101-
. "\nUnited States<br/>\nT: <a href=\"tel:3468676\">3468676</a>\n\n";
100+
$expected = "John Smith<br />\nCompanyName<br />\nGreen str, 67<br />\n\n\n\nCityM, Alabama, 75477<br />"
101+
. "\nUnited States<br />\nT: <a href=\"tel:3468676\">3468676</a>\n\n";
102102

103103
return [
104104
'0' => [0, 'You have not set a default shipping address.'],
@@ -124,8 +124,8 @@ public function testGetPrimaryBillingAddressHtml($customerId, $expected)
124124

125125
public function getPrimaryBillingAddressHtmlDataProvider()
126126
{
127-
$expected = "John Smith<br/>\nCompanyName<br />\nGreen str, 67<br />\n\n\n\nCityM, Alabama, 75477<br/>"
128-
. "\nUnited States<br/>\nT: <a href=\"tel:3468676\">3468676</a>\n\n";
127+
$expected = "John Smith<br />\nCompanyName<br />\nGreen str, 67<br />\n\n\n\nCityM, Alabama, 75477<br />"
128+
. "\nUnited States<br />\nT: <a href=\"tel:3468676\">3468676</a>\n\n";
129129
return [
130130
'0' => [0, 'You have not set a default billing address.'],
131131
'1' => [1, $expected],

‎dev/tests/integration/testsuite/Magento/Customer/Block/Address/BookTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ public function getAdditionalAddressesDataProvider()
118118
*/
119119
public function testGetAddressHtml()
120120
{
121-
$expected = "John Smith<br/>\nCompanyName<br />\nGreen str, 67<br />\n\n\n\nCityM, Alabama, 75477<br/>" .
122-
"\nUnited States<br/>\nT: <a href=\"tel:3468676\">3468676</a>\n\n";
121+
$expected = "John Smith<br />\nCompanyName<br />\nGreen str, 67<br />\n\n\n\nCityM, Alabama, 75477<br />" .
122+
"\nUnited States<br />\nT: <a href=\"tel:3468676\">3468676</a>\n\n";
123123
$address = Bootstrap::getObjectManager()->get(
124124
\Magento\Customer\Api\AddressRepositoryInterface::class
125125
)->getById(1);

‎dev/tests/integration/testsuite/Magento/Customer/Block/Address/Renderer/DefaultRendererTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ public function renderArrayDataProvider()
4949
'telephone' => '3468676',
5050
];
5151

52-
$htmlResult = "John Smith<br/>\n\nGreen str, 67<br />\n\n\n\nCityM, Alabama, " .
53-
"75477<br/>\nUnited States<br/>\nT: <a href=\"tel:3468676\">3468676</a>\n\n";
52+
$htmlResult = "John Smith<br />\n\nGreen str, 67<br />\n\n\n\nCityM, Alabama, " .
53+
"75477<br />\nUnited States<br />\nT: <a href=\"tel:3468676\">3468676</a>\n\n";
5454
return [
5555
[$addressAttributes, AttributeDataFactory::OUTPUT_FORMAT_HTML, $htmlResult],
5656
[
@@ -106,8 +106,8 @@ public function renderDataProvider()
106106
[
107107
$address,
108108
AttributeDataFactory::OUTPUT_FORMAT_HTML,
109-
"John Smith<br/>\n\nGreen str, 67<br />\n\n\n\nCityM, Alabama, 75477<br/>
110-
United States<br/>\nT: <a href=\"tel:3468676\">3468676</a>\n\n",
109+
"John Smith<br />\n\nGreen str, 67<br />\n\n\n\nCityM, Alabama, 75477<br />
110+
United States<br />\nT: <a href=\"tel:3468676\">3468676</a>\n\n",
111111
],
112112
[
113113
$address,

‎dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,9 @@ public function testGetBillingAddressHtml()
228228
{
229229
$this->_loadCustomer();
230230
$html = $this->_block->getBillingAddressHtml();
231-
$this->assertContains('John Smith<br/>', $html);
231+
$this->assertContains('John Smith<br />', $html);
232232
$this->assertContains('Green str, 67<br />', $html);
233-
$this->assertContains('CityM, Alabama, 75477<br/>', $html);
233+
$this->assertContains('CityM, Alabama, 75477<br />', $html);
234234
}
235235

236236
public function testGetBillingAddressHtmlNoDefaultAddress()

‎dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
1-
<?php
2-
/**
3-
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
5-
*/
6-
7-
// @codingStandardsIgnoreFile
8-
9-
namespace Magento\Multishipping\Block\Checkout\Address;
10-
11-
use Magento\TestFramework\Helper\Bootstrap;
12-
13-
/**
14-
* @magentoAppArea frontend
15-
*/
16-
class SelectTest extends \PHPUnit_Framework_TestCase
17-
{
18-
/** @var \Magento\Multishipping\Block\Checkout\Address\Select */
19-
protected $_selectBlock;
20-
21-
protected function setUp()
22-
{
1+
<?php
2+
/**
3+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
// @codingStandardsIgnoreFile
8+
9+
namespace Magento\Multishipping\Block\Checkout\Address;
10+
11+
use Magento\TestFramework\Helper\Bootstrap;
12+
13+
/**
14+
* @magentoAppArea frontend
15+
*/
16+
class SelectTest extends \PHPUnit_Framework_TestCase
17+
{
18+
/** @var \Magento\Multishipping\Block\Checkout\Address\Select */
19+
protected $_selectBlock;
20+
21+
protected function setUp()
22+
{
2323
$this->_selectBlock = Bootstrap::getObjectManager()->create(
24-
\Magento\Multishipping\Block\Checkout\Address\Select::class
25-
);
26-
parent::setUp();
27-
}
28-
29-
/**
30-
* @magentoDataFixture Magento/Customer/_files/customer.php
31-
* @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
32-
*/
33-
public function testGetAddressAsHtml()
34-
{
35-
/** @var \Magento\Customer\Api\AddressRepositoryInterface $addressRepository */
24+
\Magento\Multishipping\Block\Checkout\Address\Select::class
25+
);
26+
parent::setUp();
27+
}
28+
29+
/**
30+
* @magentoDataFixture Magento/Customer/_files/customer.php
31+
* @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
32+
*/
33+
public function testGetAddressAsHtml()
34+
{
35+
/** @var \Magento\Customer\Api\AddressRepositoryInterface $addressRepository */
3636
$addressRepository = Bootstrap::getObjectManager()->create(
37-
\Magento\Customer\Api\AddressRepositoryInterface::class
38-
);
39-
$fixtureAddressId = 1;
40-
$address = $addressRepository->getById($fixtureAddressId);
41-
$addressAsHtml = $this->_selectBlock->getAddressAsHtml($address);
42-
$this->assertEquals(
43-
"John Smith<br/>CompanyName<br />Green str, 67<br />CityM, Alabama, 75477"
44-
. "<br/>United States<br/>T: <a href=\"tel:3468676\">3468676</a>",
45-
str_replace("\n", '', $addressAsHtml),
46-
"Address was represented as HTML incorrectly"
47-
);
48-
}
49-
}
37+
\Magento\Customer\Api\AddressRepositoryInterface::class
38+
);
39+
$fixtureAddressId = 1;
40+
$address = $addressRepository->getById($fixtureAddressId);
41+
$addressAsHtml = $this->_selectBlock->getAddressAsHtml($address);
42+
$this->assertEquals(
43+
"John Smith<br />CompanyName<br />Green str, 67<br />CityM, Alabama, 75477"
44+
. "<br />United States<br />T: <a href=\"tel:3468676\">3468676</a>",
45+
str_replace("\n", '', $addressAsHtml),
46+
"Address was represented as HTML incorrectly"
47+
);
48+
}
49+
}

0 commit comments

Comments
 (0)