MAGETWO-80081: Merge magento#11058 commit 'refs/pull/11058/head' of https://github.com/magento/magento2 into MAGETWO-80081-PR-11058

- fixed unit tests

Author: vrann

app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/AddressTest.php

@@ -47,7 +47,7 @@ public function testPrepareDataSource()
     {
         $itemName = 'itemName';
         $oldItemValue = "itemValue\n";
-        $newItemValue = 'itemValue<br/>';
+        $newItemValue = "itemValue<br />\n";
         $dataSource = [
             'data' => [
                 'items' => [
@@ -57,7 +57,7 @@ public function testPrepareDataSource()
         ];
 
         $this->model->setData('name', $itemName);
-        $this->escaper->expects($this->once())->method('escapeHtml')->with($newItemValue)->willReturnArgument(0);
+        $this->escaper->expects($this->any())->method('escapeHtml')->with($oldItemValue)->willReturnArgument(0);
         $dataSource = $this->model->prepareDataSource($dataSource);
         $this->assertEquals($newItemValue, $dataSource['data']['items'][0][$itemName]);
     }