Merge remote-tracking branch 'origin/MAGETWO-65001' into bugfixes

olysenko · olysenko · commit 319ac5301d45 · 2017-03-09T11:48:52.000+02:00
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerNotificationTest.php b/app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerNotificationTest.php
@@ -6,7 +6,7 @@
 namespace Magento\Analytics\Test\Unit\Model;
 
 use Magento\Analytics\Model\Connector;
-use Magento\Analytics\Model\ExportDataHandlerInterface;
+use Magento\Analytics\Model\ExportDataHandler;
 use Magento\Analytics\Model\ExportDataHandlerNotification;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
@@ -61,7 +61,7 @@ public function testThatNotifyExecuted()
      */
     private function createExportDataHandlerMock()
     {
-        return $this->getMockBuilder(ExportDataHandlerInterface::class)->getMockForAbstractClass();
+        return $this->getMockBuilder(ExportDataHandler::class)->disableOriginalConstructor()->getMock();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`namespace Magento\Analytics\Test\Unit\Model;`
`7`	`7`
`8`	`8`	`use Magento\Analytics\Model\Connector;`
`9`		`-use Magento\Analytics\Model\ExportDataHandlerInterface;`
	`9`	`+use Magento\Analytics\Model\ExportDataHandler;`
`10`	`10`	`use Magento\Analytics\Model\ExportDataHandlerNotification;`
`11`	`11`	`use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;`
`12`	`12`
`@@ -61,7 +61,7 @@ public function testThatNotifyExecuted()`
`61`	`61`	`*/`
`62`	`62`	`private function createExportDataHandlerMock()`
`63`	`63`	`{`
`64`		`- return $this->getMockBuilder(ExportDataHandlerInterface::class)->getMockForAbstractClass();`
	`64`	`+ return $this->getMockBuilder(ExportDataHandler::class)->disableOriginalConstructor()->getMock();`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`/**`