From 274fee981c33ee22b296f99e1ca6cc009d7abaa2 Mon Sep 17 00:00:00 2001
From: Sunil Patel <patelsunil42@gmail.com>
Date: Sat, 19 May 2018 15:50:34 +0530
Subject: [PATCH 1/3] 15259 : Unable to disable without providing Industry
 value

---
 app/code/Magento/Analytics/etc/adminhtml/system.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Analytics/etc/adminhtml/system.xml b/app/code/Magento/Analytics/etc/adminhtml/system.xml
index 889517e629e04..5d80917fc4daa 100644
--- a/app/code/Magento/Analytics/etc/adminhtml/system.xml
+++ b/app/code/Magento/Analytics/etc/adminhtml/system.xml
@@ -36,6 +36,9 @@
                     <source_model>Magento\Analytics\Model\Config\Source\Vertical</source_model>
                     <backend_model>Magento\Analytics\Model\Config\Backend\Vertical</backend_model>
                     <frontend_model>Magento\Analytics\Block\Adminhtml\System\Config\Vertical</frontend_model>
+					<depends>
+						<field id="analytics/general/enabled">1</field>
+					</depends>
                 </field>
                 <field id="additional_comment" translate="label comment" type="label" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label><![CDATA[<strong>Get more insights from Magento Business Intelligence</strong>]]></label>

From 072498e01173114e1f7d96267162a212576d90c6 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 17 Oct 2018 13:38:33 +0300
Subject: [PATCH 2/3] ENGCOM-2271: Fix functional test failures.

---
 .../Test/Block/System/Config/AnalyticsForm.php        | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/Block/System/Config/AnalyticsForm.php b/dev/tests/functional/tests/app/Magento/Analytics/Test/Block/System/Config/AnalyticsForm.php
index 07b62a9518ae4..bf1f55915108b 100644
--- a/dev/tests/functional/tests/app/Magento/Analytics/Test/Block/System/Config/AnalyticsForm.php
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/Block/System/Config/AnalyticsForm.php
@@ -95,12 +95,17 @@ public function getAnalyticsStatus()
 
     /**
      * @param string $vertical
-     * @return array|string
+     * @return $this
      */
     public function setAnalyticsVertical($vertical)
     {
-        return $this->_rootElement->find($this->analyticsVertical, Locator::SELECTOR_CSS, 'select')
-            ->setValue($vertical);
+
+        $element = $this->_rootElement->find($this->analyticsVertical, Locator::SELECTOR_CSS, 'select');
+        if ($element->isVisible()) {
+            $element->setValue($vertical);
+        }
+
+        return $this;
     }
 
     /**

From 5e4f717e3f61cdd3fda4f835066f748228c2144c Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 17 Oct 2018 13:54:32 +0300
Subject: [PATCH 3/3] ENGCOM-2271: Updated functional test.

---
 .../Test/Constraint/AssertConfigAnalyticsDisabled.php        | 4 ++++
 .../Test/Constraint/AssertConfigAnalyticsEnabled.php         | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertConfigAnalyticsDisabled.php b/dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertConfigAnalyticsDisabled.php
index 0f65835a32aa7..b061a5d644484 100644
--- a/dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertConfigAnalyticsDisabled.php
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertConfigAnalyticsDisabled.php
@@ -34,6 +34,10 @@ public function processAssert(ConfigAnalytics $configAnalytics, OpenAnalyticsCon
             'Subscription status: Disabled',
             'Magento Advanced Reporting service subscription status is not disabled.'
         );
+        \PHPUnit_Framework_Assert::assertFalse(
+            (bool)$configAnalytics->getAnalyticsForm()->getAnalyticsVerticalScope(),
+            'Industry Data is visible.'
+        );
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertConfigAnalyticsEnabled.php b/dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertConfigAnalyticsEnabled.php
index 8fd04e06b14bb..46d5d8e2d5f78 100644
--- a/dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertConfigAnalyticsEnabled.php
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertConfigAnalyticsEnabled.php
@@ -29,12 +29,15 @@ public function processAssert(ConfigAnalytics $configAnalytics, OpenAnalyticsCon
             (bool)$configAnalytics->getAnalyticsForm()->isAnalyticsEnabled(),
             'Magento Advanced Reporting service is not enabled.'
         );
-
         \PHPUnit_Framework_Assert::assertEquals(
             $configAnalytics->getAnalyticsForm()->getAnalyticsStatus(),
             'Subscription status: Pending',
             'Magento Advanced Reporting service subscription status is not pending.'
         );
+        \PHPUnit_Framework_Assert::assertTrue(
+            (bool)$configAnalytics->getAnalyticsForm()->getAnalyticsVerticalScope(),
+            'Industry Data is not visible.'
+        );
     }
 
     /**