Merge remote-tracking branch 'tango/MAGETWO-98853' into tango-PR-04

Author: dhorytskyi

app/code/Magento/NewRelicReporting/Model/Module/Collect.php

@@ -277,9 +277,7 @@ public function getModuleData($refresh = true)
                 $changes = array_diff($module, $changeTest);
                 $changesCleanArray = $this->getCleanChangesArray($changes);
 
-                if (count($changesCleanArray) > 0 ||
-                    ($this->moduleManager->isOutputEnabled($changeTest['name']) &&
-                        $module['setup_version'] != null)) {
+                if (!empty($changesCleanArray)) {
                     $data = [
                         'entity_id' => $changeTest['entity_id'],
                         'name' => $changeTest['name'],

app/code/Magento/NewRelicReporting/Test/Unit/Model/Module/CollectTest.php

@@ -162,10 +162,6 @@ public function testGetModuleDataWithoutRefresh()
             ->method('getNames')
             ->willReturn($enabledModulesMockArray);
 
-        $this->moduleManagerMock->expects($this->any())->method('isOutputEnabled')->will(
-            $this->returnValue(false)
-        );
-
         $this->assertInternalType(
             'array',
             $this->model->getModuleData()
@@ -256,10 +252,6 @@ public function testGetModuleDataRefresh($data)
             ->method('getNames')
             ->willReturn($enabledModulesMockArray);
 
-        $this->moduleManagerMock->expects($this->any())->method('isOutputEnabled')->will(
-            $this->returnValue(true)
-        );
-
         $this->assertInternalType(
             'array',
             $this->model->getModuleData()
@@ -350,10 +342,6 @@ public function testGetModuleDataRefreshOrStatement($data)
             ->method('getNames')
             ->willReturn($enabledModulesMockArray);
 
-        $this->moduleManagerMock->expects($this->any())->method('isOutputEnabled')->will(
-            $this->returnValue(true)
-        );
-
         $this->assertInternalType(
             'array',
             $this->model->getModuleData()

dev/tests/integration/testsuite/Magento/NewRelicReporting/Model/Module/CollectTest.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\NewRelicReporting\Model\Module;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+class CollectTest extends TestCase
+{
+    /**
+     * @var Collect
+     */
+    private $collect;
+
+    protected function setUp()
+    {
+        $this->collect = Bootstrap::getObjectManager()->create(Collect::class);
+    }
+
+    public function testReport()
+    {
+        $this->collect->getModuleData();
+        $moduleData = $this->collect->getModuleData();
+        $this->assertEmpty($moduleData['changes']);
+    }
+}