@@ -219,6 +219,7 @@ public function testToHtmlWhenModuleIsDisabled()
219
219
* @param string|bool $cacheLifetime
220
220
* @param string|bool $dataFromCache
221
221
* @param string $dataForSaveCache
222
+ * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsDispatchEvent
222
223
* @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsCacheLoad
223
224
* @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsCacheSave
224
225
* @param string $expectedResult
@@ -229,6 +230,7 @@ public function testGetCacheLifetimeViaToHtml(
229
230
$ cacheLifetime ,
230
231
$ dataFromCache ,
231
232
$ dataForSaveCache ,
233
+ $ expectsDispatchEvent ,
232
234
$ expectsCacheLoad ,
233
235
$ expectsCacheSave ,
234
236
$ expectedResult
@@ -239,9 +241,8 @@ public function testGetCacheLifetimeViaToHtml(
239
241
$ this ->block ->setData ('module_name ' , $ moduleName );
240
242
$ this ->block ->setData ('cache_lifetime ' , $ cacheLifetime );
241
243
242
- $ this ->eventManagerMock ->expects ($ this ->any ())
243
- ->method ('dispatch ' )
244
- ->with ('view_block_abstract_to_html_before ' , ['block ' => $ this ->block ]);
244
+ $ this ->eventManagerMock ->expects ($ expectsDispatchEvent )
245
+ ->method ('dispatch ' );
245
246
$ this ->scopeConfigMock ->expects ($ this ->once ())
246
247
->method ('getValue ' )
247
248
->with ('advanced/modules_disable_output/ ' . $ moduleName , \Magento \Store \Model \ScopeInterface::SCOPE_STORE )
@@ -278,6 +279,7 @@ public function getCacheLifetimeDataProvider()
278
279
'cacheLifetime ' => null ,
279
280
'dataFromCache ' => 'dataFromCache ' ,
280
281
'dataForSaveCache ' => '' ,
282
+ 'expectsDispatchEvent ' => $ this ->exactly (2 ),
281
283
'expectsCacheLoad ' => $ this ->never (),
282
284
'expectsCacheSave ' => $ this ->never (),
283
285
'expectedResult ' => '' ,
@@ -286,6 +288,7 @@ public function getCacheLifetimeDataProvider()
286
288
'cacheLifetime ' => false ,
287
289
'dataFromCache ' => 'dataFromCache ' ,
288
290
'dataForSaveCache ' => '' ,
291
+ 'expectsDispatchEvent ' => $ this ->exactly (2 ),
289
292
'expectsCacheLoad ' => $ this ->once (),
290
293
'expectsCacheSave ' => $ this ->never (),
291
294
'expectedResult ' => 'dataFromCache ' ,
@@ -294,6 +297,7 @@ public function getCacheLifetimeDataProvider()
294
297
'cacheLifetime ' => 120 ,
295
298
'dataFromCache ' => 'dataFromCache ' ,
296
299
'dataForSaveCache ' => '' ,
300
+ 'expectsDispatchEvent ' => $ this ->exactly (2 ),
297
301
'expectsCacheLoad ' => $ this ->once (),
298
302
'expectsCacheSave ' => $ this ->never (),
299
303
'expectedResult ' => 'dataFromCache ' ,
@@ -302,6 +306,7 @@ public function getCacheLifetimeDataProvider()
302
306
'cacheLifetime ' => '120string ' ,
303
307
'dataFromCache ' => 'dataFromCache ' ,
304
308
'dataForSaveCache ' => '' ,
309
+ 'expectsDispatchEvent ' => $ this ->exactly (2 ),
305
310
'expectsCacheLoad ' => $ this ->once (),
306
311
'expectsCacheSave ' => $ this ->never (),
307
312
'expectedResult ' => 'dataFromCache ' ,
@@ -310,6 +315,7 @@ public function getCacheLifetimeDataProvider()
310
315
'cacheLifetime ' => 120 ,
311
316
'dataFromCache ' => false ,
312
317
'dataForSaveCache ' => '' ,
318
+ 'expectsDispatchEvent ' => $ this ->exactly (2 ),
313
319
'expectsCacheLoad ' => $ this ->once (),
314
320
'expectsCacheSave ' => $ this ->once (),
315
321
'expectedResult ' => '' ,
0 commit comments