MC-30290: Non-cacheable block added to default handle makes every page non-cacheable

ameysar · ameysar · commit e63e5df79293 · 2020-02-05T11:23:53.000+02:00
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layout/DepersonalizePluginTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layout/DepersonalizePluginTest.php
@@ -9,7 +9,7 @@
 
 use Magento\Catalog\Model\Layout\DepersonalizePlugin;
 use Magento\Catalog\Model\Session as CatalogSession;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\View\LayoutInterface;
 use Magento\PageCache\Model\DepersonalizeChecker;
 use PHPUnit\Framework\TestCase;
@@ -44,11 +44,11 @@ class DepersonalizePluginTest extends TestCase
      */
     protected function setUp()
     {
-        $this->layoutMock = $this->getMockBuilder(LayoutInterface::class)->setMethods([])->getMockForAbstractClass();
+        $this->layoutMock = $this->getMockForAbstractClass(LayoutInterface::class);
         $this->catalogSessionMock = $this->createPartialMock(CatalogSession::class, ['clearStorage']);
         $this->depersonalizeCheckerMock = $this->createMock(DepersonalizeChecker::class);
 
-        $this->plugin = (new ObjectManager($this))->getObject(
+        $this->plugin = (new ObjectManagerHelper($this))->getObject(
             DepersonalizePlugin::class,
             [
                 'catalogSession' => $this->catalogSessionMock,
@@ -66,7 +66,7 @@ public function testAfterGenerateElements(): void
     {
         $this->catalogSessionMock->expects($this->once())->method('clearStorage');
         $this->depersonalizeCheckerMock->expects($this->once())->method('checkIfDepersonalize')->willReturn(true);
-        $this->plugin->afterGenerateElements($this->layoutMock);
+        $this->assertEmpty($this->plugin->afterGenerateElements($this->layoutMock));
     }
 
     /**
@@ -78,6 +78,6 @@ public function testAfterGenerateElementsNoDepersonalize(): void
     {
         $this->catalogSessionMock->expects($this->never())->method('clearStorage');
         $this->depersonalizeCheckerMock->expects($this->once())->method('checkIfDepersonalize')->willReturn(false);
-        $this->plugin->afterGenerateElements($this->layoutMock);
+        $this->assertEmpty($this->plugin->afterGenerateElements($this->layoutMock));
     }
 }
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/Layout/DepersonalizePluginTest.php b/app/code/Magento/Checkout/Test/Unit/Model/Layout/DepersonalizePluginTest.php
@@ -9,7 +9,7 @@
 
 use Magento\Checkout\Model\Layout\DepersonalizePlugin;
 use Magento\Checkout\Model\Session as CheckoutSession;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\View\LayoutInterface;
 use Magento\PageCache\Model\DepersonalizeChecker;
 use PHPUnit\Framework\TestCase;
@@ -44,11 +44,11 @@ class DepersonalizePluginTest extends TestCase
      */
     protected function setUp()
     {
-        $this->layoutMock = $this->getMockBuilder(LayoutInterface::class)->getMockForAbstractClass();
+        $this->layoutMock = $this->getMockForAbstractClass(LayoutInterface::class);
         $this->checkoutSessionMock = $this->createPartialMock(CheckoutSession::class, ['clearStorage']);
         $this->depersonalizeCheckerMock = $this->createMock(DepersonalizeChecker::class);
 
-        $this->plugin = (new ObjectManager($this))->getObject(
+        $this->plugin = (new ObjectManagerHelper($this))->getObject(
             DepersonalizePlugin::class,
             [
                 'depersonalizeChecker' => $this->depersonalizeCheckerMock,
@@ -70,7 +70,7 @@ public function testAfterGenerateElements(): void
             ->method('clearStorage')
             ->willReturnSelf();
 
-        $this->plugin->afterGenerateElements($this->layoutMock);
+        $this->assertEmpty($this->plugin->afterGenerateElements($this->layoutMock));
     }
 
     /**
@@ -86,6 +86,6 @@ public function testAfterGenerateElementsNoDepersonalize(): void
             ->method('clearStorage')
             ->willReturnSelf();
 
-        $this->plugin->afterGenerateElements($this->layoutMock);
+        $this->assertEmpty($this->plugin->afterGenerateElements($this->layoutMock));
     }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Layout/DepersonalizePluginTest.php b/app/code/Magento/Customer/Test/Unit/Model/Layout/DepersonalizePluginTest.php
@@ -14,7 +14,7 @@
 use Magento\Customer\Model\Visitor as VisitorModel;
 use Magento\Framework\Data\Form\FormKey;
 use Magento\Framework\Session\Generic as GenericSession;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\View\LayoutInterface;
 use Magento\PageCache\Model\DepersonalizeChecker;
 use PHPUnit\Framework\TestCase;
@@ -71,7 +71,7 @@ class DepersonalizePluginTest extends TestCase
      */
     protected function setUp()
     {
-        $this->layoutMock = $this->createMock(LayoutInterface::class);
+        $this->layoutMock = $this->getMockForAbstractClass(LayoutInterface::class);
         $this->sessionMock = $this->createPartialMock(
             GenericSession::class,
             ['clearStorage', 'setData', 'getData']
@@ -91,7 +91,7 @@ protected function setUp()
             ->willReturn($this->customerMock);
         $this->depersonalizeCheckerMock = $this->createMock(DepersonalizeChecker::class);
 
-        $this->plugin = (new ObjectManager($this))->getObject(
+        $this->plugin = (new ObjectManagerHelper($this))->getObject(
             DepersonalizePlugin::class,
             [
                 'depersonalizeChecker' => $this->depersonalizeCheckerMock,
@@ -159,7 +159,7 @@ public function testAfterGenerateElements(): void
             ->expects($this->once())
             ->method('setCustomer')
             ->with($this->equalTo($this->customerMock));
-        $this->plugin->afterGenerateElements($this->layoutMock);
+        $this->assertEmpty($this->plugin->afterGenerateElements($this->layoutMock));
     }
 
     /**
@@ -178,6 +178,6 @@ public function testAfterGenerateElementsNoDepersonalize(): void
         $this->customerMock->expects($this->never())->method('setGroupId');
         $this->sessionMock->expects($this->never())->method('setData');
         $this->customerSessionMock->expects($this->never())->method('setCustomer');
-        $this->plugin->afterGenerateElements($this->layoutMock);
+        $this->assertEmpty($this->plugin->afterGenerateElements($this->layoutMock));
     }
 }
diff --git a/app/code/Magento/PageCache/Test/Unit/Model/Layout/DepersonalizePluginTest.php b/app/code/Magento/PageCache/Test/Unit/Model/Layout/DepersonalizePluginTest.php
@@ -9,7 +9,7 @@
 
 use Magento\Framework\Event\Manager;
 use Magento\Framework\Message\Session;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\View\LayoutInterface;
 use Magento\PageCache\Model\DepersonalizeChecker;
 use Magento\PageCache\Model\Layout\DepersonalizePlugin;
@@ -51,14 +51,14 @@ class DepersonalizePluginTest extends TestCase
      */
     protected function setUp()
     {
-        $this->layoutMock = $this->createMock(LayoutInterface::class);
+        $this->layoutMock = $this->getMockForAbstractClass(LayoutInterface::class);
         $this->eventManagerMock = $this->createMock(Manager::class);
         $this->messageSessionMock = $this->createPartialMock(
             Session::class,
             ['clearStorage']
         );
         $this->depersonalizeCheckerMock = $this->createMock(DepersonalizeChecker::class);
-        $this->plugin = (new ObjectManager($this))->getObject(
+        $this->plugin = (new ObjectManagerHelper($this))->getObject(
             DepersonalizePlugin::class,
             [
                 'depersonalizeChecker' => $this->depersonalizeCheckerMock,
@@ -81,7 +81,7 @@ public function testAfterGenerateElements(): void
         $this->messageSessionMock->expects($this->once())->method('clearStorage');
         $this->depersonalizeCheckerMock->expects($this->once())->method('checkIfDepersonalize')->willReturn(true);
 
-        $this->plugin->afterGenerateElements($this->layoutMock);
+        $this->assertEmpty($this->plugin->afterGenerateElements($this->layoutMock));
     }
 
     /**
@@ -95,6 +95,6 @@ public function testAfterGenerateElementsNoDepersonalize(): void
         $this->eventManagerMock->expects($this->never())->method('dispatch');
         $this->messageSessionMock->expects($this->never())->method('clearStorage');
 
-        $this->plugin->afterGenerateElements($this->layoutMock);
+        $this->assertEmpty($this->plugin->afterGenerateElements($this->layoutMock));
     }
 }
diff --git a/app/code/Magento/PageCache/Test/Unit/Model/Layout/LayoutPluginTest.php b/app/code/Magento/PageCache/Test/Unit/Model/Layout/LayoutPluginTest.php
@@ -10,7 +10,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Response\Http;
 use Magento\Framework\App\ResponseInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\View\Layout;
 use Magento\PageCache\Model\Config;
 use Magento\PageCache\Model\Layout\LayoutPlugin;
@@ -52,7 +52,7 @@ protected function setUp()
         $this->responseMock = $this->createMock(Http::class);
         $this->configMock = $this->createMock(Config::class);
 
-        $this->model = (new ObjectManager($this))->getObject(
+        $this->model = (new ObjectManagerHelper($this))->getObject(
             LayoutPlugin::class,
             [
                 'response' => $this->responseMock,
@@ -81,7 +81,7 @@ public function testAfterGenerateElements($cacheState, $layoutIsCacheable): void
             $this->responseMock->expects($this->never())->method('setPublicHeaders');
         }
 
-        $this->model->afterGenerateElements($this->layoutMock);
+        $this->assertEmpty($this->model->afterGenerateElements($this->layoutMock));
     }
 
     /**
diff --git a/app/code/Magento/Persistent/Test/Unit/Model/Layout/DepersonalizePluginTest.php b/app/code/Magento/Persistent/Test/Unit/Model/Layout/DepersonalizePluginTest.php
@@ -7,26 +7,26 @@
 
 namespace Magento\Persistent\Test\Unit\Model\Layout;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\View\LayoutInterface;
 use Magento\PageCache\Model\DepersonalizeChecker;
 use Magento\Persistent\Model\Layout\DepersonalizePlugin;
 use Magento\Persistent\Model\Session as PersistentSession;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use PHPUnit_Framework_MockObject_MockObject;
 
 /**
  * Tests \Magento\Persistent\Model\Layout\DepersonalizePlugin.
  */
 class DepersonalizePluginTest extends TestCase
 {
     /**
-     * @var PersistentSession|PHPUnit_Framework_MockObject_MockObject
+     * @var PersistentSession|MockObject
      */
     private $persistentSessionMock;
 
     /**
-     * @var ObjectManager
+     * @var ObjectManagerHelper
      */
     private $objectManager;
 
@@ -36,17 +36,23 @@ class DepersonalizePluginTest extends TestCase
     private $plugin;
 
     /**
-     * @var DepersonalizeChecker|PHPUnit_Framework_MockObject_MockObject
+     * @var DepersonalizeChecker|MockObject
      */
     private $depersonalizeCheckerMock;
 
+    /**
+     * @var LayoutInterface|MockObject
+     */
+    private $layoutMock;
+
     /**
      * @inheritdoc
      */
     protected function setUp()
     {
-        $this->objectManager = new ObjectManager($this);
+        $this->objectManager = new ObjectManagerHelper($this);
 
+        $this->layoutMock = $this->getMockForAbstractClass(LayoutInterface::class);
         $this->persistentSessionMock = $this->createPartialMock(PersistentSession::class, ['setCustomerId']);
         $this->depersonalizeCheckerMock = $this->createMock(DepersonalizeChecker::class);
 
@@ -66,13 +72,10 @@ protected function setUp()
      */
     public function testAfterGenerateElements(): void
     {
-        /** @var LayoutInterface|PHPUnit_Framework_MockObject_MockObject $subjectMock */
-        $subjectMock = $this->getMockForAbstractClass(LayoutInterface::class);
-
         $this->depersonalizeCheckerMock->expects($this->once())->method('checkIfDepersonalize')->willReturn(true);
         $this->persistentSessionMock->expects($this->once())->method('setCustomerId')->with(null);
 
-        $this->plugin->afterGenerateElements($subjectMock);
+        $this->assertEmpty($this->plugin->afterGenerateElements($this->layoutMock));
     }
 
     /**
@@ -82,12 +85,9 @@ public function testAfterGenerateElements(): void
      */
     public function testAfterGenerateElementsNoDepersonalize(): void
     {
-        /** @var LayoutInterface|PHPUnit_Framework_MockObject_MockObject $subjectMock */
-        $subjectMock = $this->getMockForAbstractClass(LayoutInterface::class);
-
         $this->depersonalizeCheckerMock->expects($this->once())->method('checkIfDepersonalize')->willReturn(false);
         $this->persistentSessionMock->expects($this->never())->method('setCustomerId');
 
-        $this->plugin->afterGenerateElements($subjectMock);
+        $this->assertEmpty($this->plugin->afterGenerateElements($this->layoutMock));
     }
 }
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Layout/DepersonalizePluginTest.php b/app/code/Magento/Tax/Test/Unit/Model/Layout/DepersonalizePluginTest.php
@@ -8,7 +8,7 @@
 namespace Magento\Tax\Test\Unit\Model\Layout;
 
 use Magento\Customer\Model\Session as CustomerSession;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\View\LayoutInterface;
 use Magento\PageCache\Model\DepersonalizeChecker;
 use Magento\Tax\Model\Layout\DepersonalizePlugin;
@@ -56,9 +56,9 @@ protected function setUp()
             ]
         );
         $this->depersonalizeCheckerMock = $this->createMock(DepersonalizeChecker::class);
-        $this->layoutMock = $this->createMock(LayoutInterface::class);
+        $this->layoutMock = $this->getMockForAbstractClass(LayoutInterface::class);
 
-        $this->plugin = (new ObjectManager($this))->getObject(
+        $this->plugin = (new ObjectManagerHelper($this))->getObject(
             DepersonalizePlugin::class,
             [
                 'customerSession' => $this->customerSessionMock,
@@ -106,7 +106,7 @@ public function testAfterGenerateElements(): void
         $this->customerSessionMock->expects($this->once())->method('setDefaultTaxBillingAddress');
         $this->customerSessionMock->expects($this->once())->method('setDefaultTaxShippingAddress');
         $this->customerSessionMock->expects($this->once())->method('setCustomerTaxClassId');
-        $this->plugin->afterGenerateElements($this->layoutMock);
+        $this->assertEmpty($this->plugin->afterGenerateElements($this->layoutMock));
     }
 
     /**
@@ -119,7 +119,7 @@ public function testAfterGenerateElementsNoDepersonalize(): void
         $this->customerSessionMock->expects($this->never())->method('setDefaultTaxBillingAddress');
         $this->customerSessionMock->expects($this->never())->method('setDefaultTaxShippingAddress');
         $this->customerSessionMock->expects($this->never())->method('setCustomerTaxClassId');
-        $this->plugin->afterGenerateElements($this->layoutMock);
+        $this->assertEmpty($this->plugin->afterGenerateElements($this->layoutMock));
     }
 
     /**
@@ -159,6 +159,6 @@ public function testBeforeAndAfter(): void
             ->method('setCustomerTaxClassId')
             ->with($customerTaxClassId);
 
-        $this->plugin->afterGenerateElements($this->layoutMock);
+        $this->assertEmpty($this->plugin->afterGenerateElements($this->layoutMock));
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layout/DepersonalizePluginTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layout/DepersonalizePluginTest.php
@@ -87,7 +87,7 @@ public function afterGenerateElementsDataProvider(): array
             ],
             'nonCacheableBlockWithoutReference' => [
                 'layout' => INTEGRATION_TESTS_DIR
-                . '/testsuite/Magento/Framework/View/_files/layout/non_cacheable_block_with_undeclared_reference.xml',
+                . '/testsuite/Magento/Framework/View/_files/layout/non_cacheable_block_with_missing_refference.xml',
                 'expectedResult' => [],
             ],
             'nonCacheableBlockWithExistedReference' => [
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout/non_cacheable_block_with_missing_refference.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/layout/non_cacheable_block_with_missing_refference.xml
diff --git a/dev/tests/integration/testsuite/Magento/PageCache/Model/Layout/DepersonalizePluginTest.php b/dev/tests/integration/testsuite/Magento/PageCache/Model/Layout/DepersonalizePluginTest.php
@@ -92,7 +92,7 @@ public function afterGenerateElementsDataProvider(): array
             ],
             'nonCacheableBlockWithoutReference' => [
                 'layout' => INTEGRATION_TESTS_DIR
-                . '/testsuite/Magento/Framework/View/_files/layout/non_cacheable_block_with_undeclared_reference.xml',
+                . '/testsuite/Magento/Framework/View/_files/layout/non_cacheable_block_with_missing_refference.xml',
                 'expectedResult' => [],
             ],
             'nonCacheableBlockWithExistedReference' => [
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/LayoutTest.php b/lib/internal/Magento/Framework/View/Test/Unit/LayoutTest.php
@@ -152,20 +152,16 @@ protected function setUp()
         $this->processorFactoryMock = $this->createPartialMock(ProcessorFactory::class, ['create']);
         $this->themeResolverMock = $this->getMockForAbstractClass(ResolverInterface::class);
         $this->processorMock = $this->createMock(Merge::class);
-        $this->eventManagerMock = $this->createMock(EventManager::class);
+        $this->eventManagerMock = $this->getMockForAbstractClass(EventManager::class);
         $this->generatorBlockMock = $this->getMockBuilder(Block::class)
             ->disableOriginalConstructor()->getMock();
         $this->generatorContainerMock = $this->getMockBuilder(Container::class)
             ->disableOriginalConstructor()->getMock();
-        $this->cacheMock = $this->getMockBuilder(FrontendInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->cacheMock = $this->getMockForAbstractClass(FrontendInterface::class);
         $this->readerPoolMock = $this->getMockBuilder(ReaderPool::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->messageManagerMock = $this->getMockBuilder(ManagerInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->messageManagerMock = $this->getMockForAbstractClass(ManagerInterface::class);
         $this->generatorPoolMock = $this->getMockBuilder(GeneratorPool::class)
             ->disableOriginalConstructor()->getMock();
         $this->generatorPoolMock->expects($this->any())
@@ -198,9 +194,8 @@ protected function setUp()
         $this->appStateMock = $this->getMockBuilder(State::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->loggerMock = $this->getMockBuilder(LoggerInterface::class)
-            ->getMock();
-        $this->serializer = $this->createMock(SerializerInterface::class);
+        $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
+        $this->serializer = $this->getMockForAbstractClass(SerializerInterface::class);
         $this->serializer->expects($this->any())->method('serialize')
             ->willReturnCallback(
                 function ($value) {
@@ -753,7 +748,7 @@ public function isCacheableDataProvider(): array
                 'xml' => '<?xml version="1.0"?><layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">'
                     . '<block></block></layout>',
                 'blockName' => '',
-                'hasElement' => false,
+                'hasElement' => true,
                 'cacheable' => true,
             ],
             'notCacheableBlockWithoutName' => [

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`use Magento\Catalog\Model\Layout\DepersonalizePlugin;`
`11`	`11`	`use Magento\Catalog\Model\Session as CatalogSession;`
`12`		`-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;`
	`12`	`+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;`
`13`	`13`	`use Magento\Framework\View\LayoutInterface;`
`14`	`14`	`use Magento\PageCache\Model\DepersonalizeChecker;`
`15`	`15`	`use PHPUnit\Framework\TestCase;`
`@@ -44,11 +44,11 @@ class DepersonalizePluginTest extends TestCase`
`44`	`44`	`*/`
`45`	`45`	`protected function setUp()`
`46`	`46`	`{`
`47`		`- $this->layoutMock = $this->getMockBuilder(LayoutInterface::class)->setMethods([])->getMockForAbstractClass();`
	`47`	`+ $this->layoutMock = $this->getMockForAbstractClass(LayoutInterface::class);`
`48`	`48`	`$this->catalogSessionMock = $this->createPartialMock(CatalogSession::class, ['clearStorage']);`
`49`	`49`	`$this->depersonalizeCheckerMock = $this->createMock(DepersonalizeChecker::class);`
`50`	`50`
`51`		`- $this->plugin = (new ObjectManager($this))->getObject(`
	`51`	`+ $this->plugin = (new ObjectManagerHelper($this))->getObject(`
`52`	`52`	`DepersonalizePlugin::class,`
`53`	`53`	`[`
`54`	`54`	`'catalogSession' => $this->catalogSessionMock,`
`@@ -66,7 +66,7 @@ public function testAfterGenerateElements(): void`
`66`	`66`	`{`
`67`	`67`	`$this->catalogSessionMock->expects($this->once())->method('clearStorage');`
`68`	`68`	`$this->depersonalizeCheckerMock->expects($this->once())->method('checkIfDepersonalize')->willReturn(true);`
`69`		`- $this->plugin->afterGenerateElements($this->layoutMock);`
	`69`	`+ $this->assertEmpty($this->plugin->afterGenerateElements($this->layoutMock));`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`/**`
`@@ -78,6 +78,6 @@ public function testAfterGenerateElementsNoDepersonalize(): void`
`78`	`78`	`{`
`79`	`79`	`$this->catalogSessionMock->expects($this->never())->method('clearStorage');`
`80`	`80`	`$this->depersonalizeCheckerMock->expects($this->once())->method('checkIfDepersonalize')->willReturn(false);`
`81`		`- $this->plugin->afterGenerateElements($this->layoutMock);`
	`81`	`+ $this->assertEmpty($this->plugin->afterGenerateElements($this->layoutMock));`
`82`	`82`	`}`
`83`	`83`	`}`