Skip to content

Commit ad3f213

Browse files
author
Oleksii Korshenko
committed
MAGETWO-70505: [2.1-backport] Fix trailing slash used in url rewrites #10164
- fixed unit tests failures
1 parent 82a7dce commit ad3f213

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

app/code/Magento/UrlRewrite/Model/Storage/AbstractStorage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ protected function createUrlRewrite($data)
109109
$this->dataObjectHelper->populateWithArray(
110110
$dataObject,
111111
$data,
112-
'\Magento\UrlRewrite\Service\V1\Data\UrlRewrite'
112+
\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class
113113
);
114114
return $dataObject;
115115
}

app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/AbstractStorageTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function testFindAllByData()
5353

5454
$this->dataObjectHelper->expects($this->at(0))
5555
->method('populateWithArray')
56-
->with($urlRewrites[0], $rows[0], '\Magento\UrlRewrite\Service\V1\Data\UrlRewrite')
56+
->with($urlRewrites[0], $rows[0], \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
5757
->will($this->returnSelf());
5858

5959
$this->urlRewriteFactory->expects($this->at(0))
@@ -62,7 +62,7 @@ public function testFindAllByData()
6262

6363
$this->dataObjectHelper->expects($this->at(1))
6464
->method('populateWithArray')
65-
->with($urlRewrites[1], $rows[1], '\Magento\UrlRewrite\Service\V1\Data\UrlRewrite')
65+
->with($urlRewrites[1], $rows[1], \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
6666
->will($this->returnSelf());
6767

6868
$this->urlRewriteFactory->expects($this->at(1))
@@ -97,7 +97,7 @@ public function testFindOneByDataIfFound()
9797

9898
$this->dataObjectHelper->expects($this->once())
9999
->method('populateWithArray')
100-
->with($urlRewrite, $row, '\Magento\UrlRewrite\Service\V1\Data\UrlRewrite')
100+
->with($urlRewrite, $row, \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
101101
->will($this->returnSelf());
102102

103103
$this->urlRewriteFactory->expects($this->any())

app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public function testFindAllByData()
9696

9797
$this->dataObjectHelper->expects($this->at(0))
9898
->method('populateWithArray')
99-
->with(['urlRewrite1'], ['row1'], '\Magento\UrlRewrite\Service\V1\Data\UrlRewrite')
99+
->with(['urlRewrite1'], ['row1'], \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
100100
->will($this->returnSelf());
101101

102102
$this->urlRewriteFactory->expects($this->at(0))
@@ -105,7 +105,7 @@ public function testFindAllByData()
105105

106106
$this->dataObjectHelper->expects($this->at(1))
107107
->method('populateWithArray')
108-
->with(['urlRewrite2'], ['row2'], '\Magento\UrlRewrite\Service\V1\Data\UrlRewrite')
108+
->with(['urlRewrite2'], ['row2'], \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
109109
->will($this->returnSelf());
110110

111111
$this->urlRewriteFactory->expects($this->at(1))
@@ -140,7 +140,7 @@ public function testFindOneByData()
140140

141141
$this->dataObjectHelper->expects($this->at(0))
142142
->method('populateWithArray')
143-
->with(['urlRewrite1'], ['row1'], '\Magento\UrlRewrite\Service\V1\Data\UrlRewrite')
143+
->with(['urlRewrite1'], ['row1'], \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
144144
->will($this->returnSelf());
145145

146146
$this->urlRewriteFactory->expects($this->at(0))

0 commit comments

Comments
 (0)