Skip to content

Commit bc3e29a

Browse files
committed
MC-19827: Escape translation strings.
Fix failing unit test.
1 parent 0cb9caa commit bc3e29a

File tree

1 file changed

+30
-12
lines changed

1 file changed

+30
-12
lines changed

app/code/Magento/Directory/Test/Unit/Block/DataTest.php

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ class DataTest extends \PHPUnit\Framework\TestCase
5656
/** @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject */
5757
private $serializerMock;
5858

59+
/**
60+
* @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
61+
*/
62+
private $escaperMock;
63+
5964
protected function setUp()
6065
{
6166
$objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -123,6 +128,13 @@ protected function prepareContext()
123128
$this->contextMock->expects($this->any())
124129
->method('getLayout')
125130
->willReturn($this->layoutMock);
131+
132+
$this->escaperMock = $this->createPartialMock(
133+
\Magento\Framework\Escaper::class,
134+
['escapeHtml']
135+
);
136+
137+
$this->contextMock->expects($this->once())->method('getEscaper')->willReturn($this->escaperMock);
126138
}
127139

128140
protected function prepareCountryCollection()
@@ -135,9 +147,11 @@ protected function prepareCountryCollection()
135147
\Magento\Directory\Model\ResourceModel\Country\CollectionFactory::class
136148
)
137149
->disableOriginalConstructor()
138-
->setMethods([
139-
'create'
140-
])
150+
->setMethods(
151+
[
152+
'create'
153+
]
154+
)
141155
->getMock();
142156

143157
$this->countryCollectionFactoryMock->expects($this->any())
@@ -285,17 +299,21 @@ protected function mockElementHtmlSelect($defaultCountry, $options, $resultHtml)
285299

286300
$elementHtmlSelect = $this->getMockBuilder(\Magento\Framework\View\Element\Html\Select::class)
287301
->disableOriginalConstructor()
288-
->setMethods([
289-
'setName',
290-
'setId',
291-
'setTitle',
292-
'setValue',
293-
'setOptions',
294-
'setExtraParams',
295-
'getHtml',
296-
])
302+
->setMethods(
303+
[
304+
'setName',
305+
'setId',
306+
'setTitle',
307+
'setValue',
308+
'setOptions',
309+
'setExtraParams',
310+
'getHtml',
311+
]
312+
)
297313
->getMock();
298314

315+
$this->escaperMock->expects($this->once())->method('escapeHtml')->with(__($title))->willReturn($title);
316+
299317
$elementHtmlSelect->expects($this->once())
300318
->method('setName')
301319
->with($name)

0 commit comments

Comments
 (0)