Merge commit 'refs/pull/3779/head' of https://github.com/magento/magento2 into MAGETWO-56556

Author: vkorotun

app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Options/AjaxTest.php

@@ -53,7 +53,7 @@ public function testToHtml()
             ->disableOriginalConstructor()
             ->setMethods(['dispatch'])
             ->getMock();
-        $eventManager->expects($this->once())->method('dispatch')->will($this->returnValue(true));
+        $eventManager->expects($this->exactly(2))->method('dispatch')->will($this->returnValue(true));
 
         $scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config::class)
             ->setMethods(['getValue'])

app/code/Magento/Catalog/Test/Unit/Block/Product/Widget/NewWidgetTest.php

@@ -186,7 +186,7 @@ public function testGetProductsCount()
 
     protected function generalGetProductCollection()
     {
-        $this->eventManager->expects($this->once())->method('dispatch')
+        $this->eventManager->expects($this->exactly(2))->method('dispatch')
             ->will($this->returnValue(true));
         $this->scopeConfig->expects($this->once())->method('getValue')->withAnyParameters()
             ->willReturn(false);

app/code/Magento/Paypal/Test/Unit/Block/Billing/AgreementsTest.php

@@ -235,9 +235,14 @@ public function testGetWizardPaymentMethodOptions()
     public function testToHtml()
     {
         $this->eventManager
-            ->expects($this->once())
+            ->expects($this->at(0))
             ->method('dispatch')
             ->with('view_block_abstract_to_html_before', ['block' => $this->block]);
+        $transport = new \Magento\Framework\DataObject(['html' => '']);
+        $this->eventManager
+            ->expects($this->at(1))
+            ->method('dispatch')
+            ->with('view_block_abstract_to_html_after', ['block' => $this->block, 'transport' => $transport]);
         $this->scopeConfig
             ->expects($this->once())
             ->method('getValue')

app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php

@@ -261,9 +261,12 @@ public function testToHtml($customerId)
         $this->additional->setData('cache_lifetime', 789);
         $this->additional->setData('cache_key', 'cache-key');
 
-        $this->eventManagerMock->expects($this->once())
+        $this->eventManagerMock->expects($this->at(0))
             ->method('dispatch')
             ->with('view_block_abstract_to_html_before', ['block' => $this->additional]);
+        $this->eventManagerMock->expects($this->at(1))
+            ->method('dispatch')
+            ->with('view_block_abstract_to_html_after');
         $this->scopeConfigMock->expects($this->once())
             ->method('getValue')
             ->with(

app/code/Magento/Widget/Test/Unit/Block/Adminhtml/Widget/Instance/Edit/Chooser/ContainerTest.php

@@ -66,7 +66,7 @@ public function testToHtmlCatalogProductsListGroupedProduct()
             . 'Main Content Area</option><option value="content.bottom" >Main Content Bottom</option>'
             . '<option value="content.top" >Main Content Top</option></select>';
 
-        $this->eventManagerMock->expects($this->once())->method('dispatch')->willReturn(true);
+        $this->eventManagerMock->expects($this->exactly(2))->method('dispatch')->willReturn(true);
         $this->scopeConfigMock->expects($this->once())->method('getValue')->willReturn(false);
 
         $this->themeCollectionFactoryMock->expects($this->once())
@@ -153,7 +153,7 @@ public function testToHtmlCatalogCategoryLinkSimpleProduct()
             . '<option value="sidebar.additional" >Sidebar Additional</option>'
             . '<option value="sidebar.main" >Sidebar Main</option></select>';
 
-        $this->eventManagerMock->expects($this->once())->method('dispatch')->willReturn(true);
+        $this->eventManagerMock->expects($this->exactly(2))->method('dispatch')->willReturn(true);
         $this->scopeConfigMock->expects($this->once())->method('getValue')->willReturn(false);
 
         $this->themeCollectionFactoryMock->expects($this->once())
@@ -284,7 +284,7 @@ public function testToHtmlCmsStaticBlockAllProductTypes()
             . '<option value="sidebar.additional" >Sidebar Additional</option>'
             . '<option value="sidebar.main" >Sidebar Main</option></select>';
 
-        $this->eventManagerMock->expects($this->once())->method('dispatch')->willReturn(true);
+        $this->eventManagerMock->expects($this->exactly(2))->method('dispatch')->willReturn(true);
         $this->scopeConfigMock->expects($this->once())->method('getValue')->willReturn(false);
 
         $this->themeCollectionFactoryMock->expects($this->once())
@@ -402,7 +402,7 @@ public function testToHtmlOrderBySkuAllPages()
             . '<option value="sidebar.additional" >Sidebar Additional</option><option value="sidebar.main" >'
             . 'Sidebar Main</option></select>';
 
-        $this->eventManagerMock->expects($this->once())->method('dispatch')->willReturn(true);
+        $this->eventManagerMock->expects($this->exactly(2))->method('dispatch')->willReturn(true);
         $this->scopeConfigMock->expects($this->once())->method('getValue')->willReturn(false);
 
         $this->themeCollectionFactoryMock->expects($this->once())

lib/internal/Magento/Framework/View/Element/AbstractBlock.php

@@ -670,6 +670,15 @@ public function toHtml()
         }
         $html = $this->_afterToHtml($html);
 
+        /** @var \Magento\Framework\DataObject */
+        $transportObject = new \Magento\Framework\DataObject(
+            [
+                'html' => $html,
+            ]
+        );
+        $this->_eventManager->dispatch('view_block_abstract_to_html_after', ['block' => $this, 'transport' => $transportObject]);
+        $html = $transportObject->getHtml();
+
         return $html;
     }