Skip to content

Commit 30b5123

Browse files
committed
#4389 Widget cache error
- fixed CacheKey assignment
1 parent 82caf48 commit 30b5123

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

app/code/Magento/CatalogWidget/Block/Product/ProductsList.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,9 @@ public function getCacheKeyInfo()
167167
intval($this->getRequest()->getParam($this->getData('page_var_name'), 1)),
168168
$this->getProductsPerPage(),
169169
$conditions,
170-
$this->json->serialize($this->getRequest()->getParams())
170+
$this->json->serialize($this->getRequest()->getParams()),
171+
$this->getTemplate(),
172+
$this->getTitle()
171173
];
172174
}
173175

app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ protected function setUp()
8787
{
8888
$this->collectionFactory =
8989
$this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Product\CollectionFactory::class)
90-
->setMethods(['create'])
91-
->disableOriginalConstructor()->getMock();
90+
->setMethods(['create'])
91+
->disableOriginalConstructor()->getMock();
9292
$this->visibility = $this->getMockBuilder(\Magento\Catalog\Model\Product\Visibility::class)
9393
->setMethods(['getVisibleInCatalogIds'])
9494
->disableOriginalConstructor()
@@ -144,6 +144,8 @@ public function testGetCacheKeyInfo()
144144
$this->productsList->setData('conditions', 'some_serialized_conditions');
145145

146146
$this->productsList->setData('page_var_name', 'page_number');
147+
$this->productsList->setTemplate('test_template');
148+
$this->productsList->setData('title', 'test_title');
147149
$this->request->expects($this->once())->method('getParam')->with('page_number')->willReturn(1);
148150

149151
$this->request->expects($this->once())->method('getParams')->willReturn('request_params');
@@ -164,7 +166,9 @@ public function testGetCacheKeyInfo()
164166
1,
165167
5,
166168
'some_serialized_conditions',
167-
json_encode('request_params')
169+
json_encode('request_params'),
170+
'test_template',
171+
'test_title'
168172
];
169173
$this->assertEquals($cacheKey, $this->productsList->getCacheKeyInfo());
170174
}
@@ -249,9 +253,10 @@ public function testGetPagerHtml()
249253
* Test public `createCollection` method and protected `getPageSize` method via `createCollection`
250254
*
251255
* @param bool $pagerEnable
252-
* @param int $productsCount
253-
* @param int $productsPerPage
254-
* @param int $expectedPageSize
256+
* @param int $productsCount
257+
* @param int $productsPerPage
258+
* @param int $expectedPageSize
259+
*
255260
* @dataProvider createCollectionDataProvider
256261
*/
257262
public function testCreateCollection($pagerEnable, $productsCount, $productsPerPage, $expectedPageSize)
@@ -380,6 +385,7 @@ public function testGetIdentities()
380385

381386
/**
382387
* @param $collection
388+
*
383389
* @return \PHPUnit_Framework_MockObject_MockObject
384390
*/
385391
private function getConditionsForCollection($collection)

0 commit comments

Comments
 (0)