Merge remote-tracking branch 'origin/MAGETWO-69240' into SEGFAULT_BANNERS_PR

Author: Yaroslav Onischenko

app/code/Magento/Review/Test/Unit/Model/ResourceModel/Review/Product/CollectionTest.php

@@ -34,6 +34,8 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
+        $this->markTestSkipped('MAGETWO-59234: Code under the test depends on a virtual type which cannot be mocked.');
+
         $attribute = $this->getMock(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class, null, [], '', false);
         $eavConfig = $this->getMock(\Magento\Eav\Model\Config::class, ['getAttribute'], [], '', false);
         $eavConfig->expects($this->any())->method('getAttribute')->will($this->returnValue($attribute));

dev/tests/unit/phpunit.xml.dist

@@ -38,6 +38,9 @@
             </exclude>
         </whitelist>
     </filter>
+    <listeners>
+        <listener class="Magento\Framework\TestFramework\Unit\Listener\ReplaceObjectManager"/>
+    </listeners>
     <logging>
         <!--coverage_html_placeholder
             <log type="coverage-html" target="{{coverage_dir}}/test-reports/coverage" charset="UTF-8" yui="true" highlight="true"/>

lib/internal/Magento/Framework/TestFramework/Unit/Listener/ReplaceObjectManager.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\TestFramework\Unit\Listener;
+
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * The event listener which instantiates ObjectManager before test run
+ */
+class ReplaceObjectManager extends \PHPUnit_Framework_BaseTestListener
+{
+    /**
+     * Replaces ObjectManager before run for each test
+     *
+     * Replace existing instance of the Application's ObjectManager with the mock.
+     *
+     * This avoids the issue with a not initialized ObjectManager
+     * and makes working with ObjectManager predictable as it always contains clear mock for each test
+     *
+     * @param \PHPUnit_Framework_Test $test
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function startTest(\PHPUnit_Framework_Test $test)
+    {
+        if ($test instanceof \PHPUnit_Framework_TestCase) {
+            $objectManagerMock = $test->getMockBuilder(ObjectManagerInterface::class)
+                ->getMockForAbstractClass();
+            $createMockCallback = function ($type) use ($test) {
+                return $test->getMockBuilder($type)
+                    ->disableOriginalConstructor()
+                    ->getMockForAbstractClass();
+            };
+            $objectManagerMock->method('create')->willReturnCallback($createMockCallback);
+            $objectManagerMock->method('get')->willReturnCallback($createMockCallback);
+            ObjectManager::setInstance($objectManagerMock);
+        }
+    }
+}