Merge remote-tracking branch 'troll-ce/MC-20322' into MC-16108

adifucan · adifucan · commit b7edb74db1ee · 2019-11-05T17:08:13.000-06:00
diff --git a/app/code/Magento/Reports/Setup/Patch/Data/ReportDisableNotification.php b/app/code/Magento/Reports/Setup/Patch/Data/ReportDisableNotification.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Reports\Setup\Patch\Data;
+
+use Magento\Framework\Notification\NotifierInterface;
+
+/**
+ * Report Disable Notification
+ */
+class ReportDisableNotification implements \Magento\Framework\Setup\Patch\DataPatchInterface
+{
+    /**
+     * @var NotifierInterface
+     */
+    private $notifier;
+
+    /**
+     * @param NotifierInterface $notifier
+     */
+    public function __construct(
+        NotifierInterface $notifier
+    ) {
+        $this->notifier = $notifier;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        $message = <<<"MESSAGE"
+To improve performance, collecting statistics for the Magento Report module is disabled by default. 
+You can enable it in System Config.
+MESSAGE;
+        $this->notifier->addNotice(__('Disable Notice'), __($message));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Reports/etc/config.xml b/app/code/Magento/Reports/etc/config.xml
@@ -20,7 +20,7 @@
                 <mtd_start>1</mtd_start>
             </dashboard>
             <options>
-                <enabled>1</enabled>
+                <enabled>0</enabled>
                 <product_view_enabled>1</product_view_enabled>
                 <product_send_enabled>1</product_send_enabled>
                 <product_compare_enabled>1</product_compare_enabled>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml
@@ -54,6 +54,9 @@
                 <requiredEntity createDataKey="createBundleOption"/>
                 <requiredEntity createDataKey="createSecondProduct"/>
             </createData>
+            <!-- Change configuration -->
+            <magentoCLI command="config:set reports/options/enabled 1" stepKey="enableReportModule"/>
+
             <magentoCLI command="indexer:reindex" stepKey="reindex"/>
         </before>
         <after>
@@ -73,6 +76,9 @@
 
             <!-- Delete category -->
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- Change configuration -->
+            <magentoCLI command="config:set reports/options/enabled 0" stepKey="disableReportModule"/>
         </after>
 
         <!-- Login as customer -->
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedConfigurableProductOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedConfigurableProductOnOrderPageTest.xml
@@ -57,6 +57,8 @@
                 <requiredEntity createDataKey="createConfigProduct"/>
                 <requiredEntity createDataKey="createConfigChildProduct"/>
             </createData>
+            <!-- Change configuration -->
+            <magentoCLI command="config:set reports/options/enabled 1" stepKey="enableReportModule"/>
         </before>
         <after>
             <!-- Admin logout -->
@@ -75,6 +77,9 @@
 
             <!-- Delete category -->
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- Change configuration -->
+            <magentoCLI command="config:set reports/options/enabled 0" stepKey="disableReportModule"/>
         </after>
 
         <!-- Login as customer -->
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyComparedProductsOnOrderPageTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyComparedProductsOnOrderPageTest.php
@@ -8,10 +8,13 @@
 
 use Magento\Catalog\Test\Page\Product\CatalogProductCompare;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
+use Magento\Catalog\Test\TestStep\CreateProductsStep;
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Customer\Test\Fixture\Customer;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
+use Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep;
+use Magento\Mtf\Util\Command\Cli\Config;
 use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
 use Magento\Mtf\Client\BrowserInterface;
 use Magento\Mtf\TestCase\Injectable;
@@ -91,21 +94,27 @@ class MoveRecentlyComparedProductsOnOrderPageTest extends Injectable
      */
     protected $catalogProductCompare;
 
+    /**
+     * @var Config
+     */
+    private $config;
+
     /**
      * Create customer.
-     *
      * @param Customer $customer
      * @param BrowserInterface $browser
+     * @param Config $config
      * @return array
      */
-    public function __prepare(Customer $customer, BrowserInterface $browser)
+    public function __prepare(Customer $customer, BrowserInterface $browser, Config $config)
     {
         $customer->persist();
         // Login under customer
         $this->objectManager
-            ->create(\Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep::class, ['customer' => $customer])
+            ->create(LoginCustomerOnFrontendStep::class, ['customer' => $customer])
             ->run();
         $this->browser = $browser;
+        $this->config = $config;
 
         return ['customer' => $customer];
     }
@@ -137,20 +146,26 @@ public function __inject(
         $this->catalogProductCompare = $catalogProductCompare;
     }
 
+    public function setUp()
+    {
+        $this->config->setConfig('reports/options/enabled', 1);
+        parent::setUp();
+    }
+
     /**
      * Move recently compared products on order page.
-     *
      * @param Customer $customer
      * @param string $products
      * @param bool $productsIsConfigured
      * @return array
+     * @throws \Exception
      */
     public function test(Customer $customer, $products, $productsIsConfigured = false)
     {
         // Preconditions
         // Create product
         $products = $this->objectManager->create(
-            \Magento\Catalog\Test\TestStep\CreateProductsStep::class,
+            CreateProductsStep::class,
             ['products' => $products]
         )->run()['products'];
         foreach ($products as $itemProduct) {
@@ -171,4 +186,10 @@ public function test(Customer $customer, $products, $productsIsConfigured = fals
 
         return ['products' => $products, 'productsIsConfigured' => $productsIsConfigured];
     }
+
+    public function tearDown()
+    {
+        $this->config->setConfig('reports/options/enabled', 0);
+        parent::tearDown();
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/Tab/Products/ViewedTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/Tab/Products/ViewedTest.php
@@ -49,6 +49,7 @@ protected function setUp()
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/reports/options/enabled 1
      */
     public function testGetPreparedCollectionProductPrice()
     {
@@ -57,9 +58,11 @@ public function testGetPreparedCollectionProductPrice()
         $product = $this->productRepository->getById(1);
         $this->eventManager->dispatch('catalog_controller_product_view', ['product' => $product]);
 
+        $collection = $viewedProductsTabBlock->getPreparedCollection();
+
         $this->assertEquals(
             10,
-            $viewedProductsTabBlock->getPreparedCollection()->getFirstItem()->getDataByKey('price')
+            $collection->getFirstItem()->getDataByKey('price')
         );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php
@@ -15,6 +15,7 @@ class ProductsViewedTest extends \Magento\TestFramework\TestCase\AbstractBackend
     /**
      * @magentoAppArea adminhtml
      * @magentoDataFixture Magento/Reports/_files/viewed_products.php
+     * @magentoConfigFixture default/reports/options/enabled 1
      */
     public function testExecute()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Reports/Model/ResourceModel/Report/Product/Viewed/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Reports/Model/ResourceModel/Report/Product/Viewed/CollectionTest.php
@@ -27,6 +27,7 @@ protected function setUp()
 
     /**
      * @magentoDataFixture Magento/Reports/_files/viewed_products.php
+     * @magentoConfigFixture default/reports/options/enabled 1
      */
     public function testGetItems()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/viewed_products.php b/dev/tests/integration/testsuite/Magento/Reports/_files/viewed_products.php
@@ -20,6 +20,15 @@
 $simpleDuplicatedId = $productRepository->get('simple-1')->getId();
 $virtualId = $productRepository->get('virtual-product')->getId();
 
+$config = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+    \Magento\Framework\App\Config\MutableScopeConfigInterface::class
+);
+$config->setValue(
+    'reports/options/enabled',
+    1,
+    \Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+);
+
 // imitate product views
 /** @var \Magento\Reports\Observer\CatalogProductViewObserver $reportObserver */
 $reportObserver = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ protected function setUp()`
`49`	`49`	`* @magentoDataFixture Magento/Catalog/_files/product_simple.php`
`50`	`50`	`* @magentoDbIsolation enabled`
`51`	`51`	`* @magentoAppIsolation enabled`
	`52`	`+ * @magentoConfigFixture default/reports/options/enabled 1`
`52`	`53`	`*/`
`53`	`54`	`public function testGetPreparedCollectionProductPrice()`
`54`	`55`	`{`
`@@ -57,9 +58,11 @@ public function testGetPreparedCollectionProductPrice()`
`57`	`58`	`$product = $this->productRepository->getById(1);`
`58`	`59`	`$this->eventManager->dispatch('catalog_controller_product_view', ['product' => $product]);`
`59`	`60`
	`61`	`+ $collection = $viewedProductsTabBlock->getPreparedCollection();`
	`62`	`+`
`60`	`63`	`$this->assertEquals(`
`61`	`64`	`10,`
`62`		`- $viewedProductsTabBlock->getPreparedCollection()->getFirstItem()->getDataByKey('price')`
	`65`	`+ $collection->getFirstItem()->getDataByKey('price')`
`63`	`66`	`);`
`64`	`67`	`}`
`65`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ class ProductsViewedTest extends \Magento\TestFramework\TestCase\AbstractBackend`
`15`	`15`	`/**`
`16`	`16`	`* @magentoAppArea adminhtml`
`17`	`17`	`* @magentoDataFixture Magento/Reports/_files/viewed_products.php`
	`18`	`+ * @magentoConfigFixture default/reports/options/enabled 1`
`18`	`19`	`*/`
`19`	`20`	`public function testExecute()`
`20`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ protected function setUp()`
`27`	`27`
`28`	`28`	`/**`
`29`	`29`	`* @magentoDataFixture Magento/Reports/_files/viewed_products.php`
	`30`	`+ * @magentoConfigFixture default/reports/options/enabled 1`
`30`	`31`	`*/`
`31`	`32`	`public function testGetItems()`
`32`	`33`	`{`