Merge remote-tracking branch 'ogresce/MAGETWO-33240-cron-fpc' into develop

Author: mazhalai

app/code/Magento/PageCache/Model/Observer/InvalidateCacheIfChanged.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\PageCache\Model\Observer;
+
+/**
+ * An observer to invalidate full page cache when the content given is changed
+ */
+class InvalidateCacheIfChanged
+{
+    /**
+     * @var \Magento\Framework\App\Cache\TypeListInterface
+     */
+    protected $typeList;
+
+    /**
+     * Application config object
+     *
+     * @var \Magento\PageCache\Model\Config
+     */
+    protected $config;
+
+    /**
+     * @param \Magento\PageCache\Model\Config $config
+     * @param \Magento\Framework\App\Cache\TypeListInterface $typeList
+     */
+    public function __construct(
+        \Magento\PageCache\Model\Config $config,
+        \Magento\Framework\App\Cache\TypeListInterface $typeList
+    ) {
+        $this->config = $config;
+        $this->typeList = $typeList;
+    }
+
+    /**
+     * Invalidate full page cache if content is changed
+     *
+     * @param \Magento\Framework\Event\Observer $observer
+     * @return void
+     */
+    public function execute(\Magento\Framework\Event\Observer $observer)
+    {
+        if ($this->config->isEnabled()) {
+            $object = $observer->getEvent()->getObject();
+            if ($object instanceof \Magento\Framework\Object\IdentityInterface) {
+                if ($object->getIdentities()) {
+                    $this->typeList->invalidate('full_page');
+                }
+            }
+        }
+    }
+}

app/code/Magento/PageCache/etc/events.xml

@@ -13,7 +13,7 @@
         <observer name="invalidate_builtin" instance="Magento\PageCache\Model\Observer\FlushCacheByTags" method="execute" />
     </event>
     <event name="clean_cache_after_reindex">
-        <observer name="reindex_cache_flush" instance="Magento\PageCache\Model\Observer\InvalidateCache" method="execute" />
+        <observer name="reindex_cache_flush" instance="Magento\PageCache\Model\Observer\InvalidateCacheIfChanged" method="execute" />
     </event>
     <event name="adminhtml_cache_flush_system">
         <observer name="flush_system_pagecache" instance="Magento\PageCache\Model\Observer\FlushAllCache" method="execute" />

dev/tests/unit/testsuite/Magento/PageCache/Model/Observer/InvalidateCacheIfChangedTest.php

@@ -0,0 +1,86 @@
+<?php
+/**
+ *
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\PageCache\Model\Observer;
+
+class InvalidateCacheIfChangedTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var \Magento\PageCache\Model\Observer\InvalidateCacheIfChanged */
+    protected $model;
+
+    /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\PageCache\Model\Config */
+    protected $configMock;
+
+    /** @var  \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\Cache\TypeListInterface */
+    protected $typeListMock;
+
+    /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Event\Observer */
+    protected $observerMock;
+
+    /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Object\IdentityInterface */
+    protected $objectMock;
+
+    /**
+     * Set up all mocks and data for test
+     */
+    public function setUp()
+    {
+        $this->configMock = $this->getMock(
+            'Magento\PageCache\Model\Config',
+            ['getType', 'isEnabled'],
+            [],
+            '',
+            false
+        );
+        $this->typeListMock = $this->getMock('Magento\Framework\App\Cache\TypeList', [], [], '', false);
+
+        $this->model = new \Magento\PageCache\Model\Observer\InvalidateCacheIfChanged(
+            $this->configMock,
+            $this->typeListMock
+        );
+
+        $this->observerMock = $this->getMock('Magento\Framework\Event\Observer', [], [], '', false);
+        $eventMock = $this->getMock('Magento\Framework\Event', ['getObject'], [], '', false);
+        $this->objectMock = $this->getMockForAbstractClass('Magento\Framework\Object\IdentityInterface', [], '', false);
+        $eventMock->expects($this->any())->method('getObject')->willReturn($this->objectMock);
+        $this->observerMock->expects($this->any())->method('getEvent')->willReturn($eventMock);
+    }
+
+    /**
+     * @dataProvider invalidateCacheDataProvider
+     * @param bool $cacheState
+     */
+    public function testExecuteChanged($cacheState)
+    {
+        $this->configMock->expects($this->once())->method('isEnabled')->will($this->returnValue($cacheState));
+
+        if ($cacheState) {
+            $this->typeListMock->expects($this->once())->method('invalidate')->with($this->equalTo('full_page'));
+            $this->objectMock->expects($this->once())->method('getIdentities')->will($this->returnValue(['tag_1']));
+        }
+        $this->model->execute($this->observerMock);
+    }
+
+    /**
+     * @dataProvider invalidateCacheDataProvider
+     * @param bool $cacheState
+     */
+    public function testExecuteNoChanged($cacheState)
+    {
+        $this->configMock->expects($this->once())->method('isEnabled')->will($this->returnValue($cacheState));
+        $this->typeListMock->expects($this->never())->method('invalidate');
+
+        if ($cacheState) {
+            $this->objectMock->expects($this->once())->method('getIdentities')->will($this->returnValue([]));
+        }
+        $this->model->execute($this->observerMock);
+    }
+
+    public function invalidateCacheDataProvider()
+    {
+        return [[true], [false]];
+    }
+}