MAGETWO-43787: cache:clean command doesn't clear Varnish cache

Dale Sikkema · Dale Sikkema · commit af4f1fa51c23 · 2015-10-19T11:17:16.000-05:00
- fix unit tests
diff --git a/app/code/Magento/Backend/Test/Unit/Console/Command/AbstractCacheManageCommandTest.php b/app/code/Magento/Backend/Test/Unit/Console/Command/AbstractCacheManageCommandTest.php
@@ -13,15 +13,14 @@ abstract class AbstractCacheManageCommandTest extends AbstractCacheCommandTest
     /** @var  string */
     protected $cacheEventName;
 
-    /** @var  \Magento\Framework\Event\ManagerInterface */
+    /** @var  \Magento\Framework\Event\ManagerInterface | \PHPUnit_Framework_MockObject_MockObject */
     protected $eventManagerMock;
 
     public function setUp()
     {
         $this->eventManagerMock = $this->getMockBuilder('\Magento\Framework\Event\ManagerInterface')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->eventManagerMock->expects($this->any())->method('dispatch')->with($this->cacheEventName);
         parent::setUp();
     }
 
diff --git a/app/code/Magento/Backend/Test/Unit/Console/Command/CacheCleanCommandTest.php b/app/code/Magento/Backend/Test/Unit/Console/Command/CacheCleanCommandTest.php
@@ -28,6 +28,7 @@ public function testExecute($param, $types, $output)
     {
         $this->cacheManagerMock->expects($this->once())->method('getAvailableTypes')->willReturn(['A', 'B', 'C']);
         $this->cacheManagerMock->expects($this->once())->method('clean')->with($types);
+        $this->eventManagerMock->expects($this->once())->method('dispatch')->with($this->cacheEventName);
 
         $commandTester = new CommandTester($this->command);
         $commandTester->execute($param);
diff --git a/app/code/Magento/Backend/Test/Unit/Console/Command/CacheFlushCommandTest.php b/app/code/Magento/Backend/Test/Unit/Console/Command/CacheFlushCommandTest.php
@@ -28,6 +28,7 @@ public function testExecute($param, $types, $output)
     {
         $this->cacheManagerMock->expects($this->once())->method('getAvailableTypes')->willReturn(['A', 'B', 'C']);
         $this->cacheManagerMock->expects($this->once())->method('flush')->with($types);
+        $this->eventManagerMock->expects($this->once())->method('dispatch')->with($this->cacheEventName);
 
         $commandTester = new CommandTester($this->command);
         $commandTester->execute($param);

Original file line number	Diff line number	Diff line change
`@@ -13,15 +13,14 @@ abstract class AbstractCacheManageCommandTest extends AbstractCacheCommandTest`
`13`	`13`	`/** @var string */`
`14`	`14`	`protected $cacheEventName;`
`15`	`15`
`16`		`- /** @var \Magento\Framework\Event\ManagerInterface */`
	`16`	`+ /** @var \Magento\Framework\Event\ManagerInterface \| \PHPUnit_Framework_MockObject_MockObject */`
`17`	`17`	`protected $eventManagerMock;`
`18`	`18`
`19`	`19`	`public function setUp()`
`20`	`20`	`{`
`21`	`21`	`$this->eventManagerMock = $this->getMockBuilder('\Magento\Framework\Event\ManagerInterface')`
`22`	`22`	`->disableOriginalConstructor()`
`23`	`23`	`->getMock();`
`24`		`- $this->eventManagerMock->expects($this->any())->method('dispatch')->with($this->cacheEventName);`
`25`	`24`	`parent::setUp();`
`26`	`25`	`}`
`27`	`26`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ public function testExecute($param, $types, $output)`
`28`	`28`	`{`
`29`	`29`	`$this->cacheManagerMock->expects($this->once())->method('getAvailableTypes')->willReturn(['A', 'B', 'C']);`
`30`	`30`	`$this->cacheManagerMock->expects($this->once())->method('clean')->with($types);`
	`31`	`+ $this->eventManagerMock->expects($this->once())->method('dispatch')->with($this->cacheEventName);`
`31`	`32`
`32`	`33`	`$commandTester = new CommandTester($this->command);`
`33`	`34`	`$commandTester->execute($param);`