Merge remote-tracking branch 'trigger/regression-bug' into BugFixPR

Author: Joan He

app/code/Magento/LayeredNavigation/Test/Mftf/Section/LayeredNavigationSection.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="LayeredNavigationSection">
+        <element name="layeredNavigation" type="select" selector="#catalog_layered_navigation-head"/>
+        <element name="CheckIfTabExpand" type="button" selector="#catalog_layered_navigation-head:not(.open)"/>
+        <element name="NavigationStepCalculation" type="button" selector="#catalog_layered_navigation_price_range_calculation"/>
+        <element name="NavigationStepCalculationSystemValue" type="button" selector="#catalog_layered_navigation_price_range_calculation_inherit"/>
+        <element name="PriceNavigationStep" type="button" selector="#catalog_layered_navigation_price_range_step"/>
+        <element name="PriceNavigationStepSystemValue" type="button" selector="#catalog_layered_navigation_price_range_step_inherit"/>
+    </section>
+</sections>

app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminSpecifyLayerNavigationConfigurationTest.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminSpecifyLayerNavigationConfigurationTest">
+        <annotations>
+            <features value="LayerNavigation"/>
+            <group value="LayerNavigation"/>
+            <stories value="Magento_LayeredNavigation"/>
+            <title value="Admin should be able to uncheck Default Value checkbox for dependent field"/>
+            <description value="Admin should be able to uncheck Default Value checkbox for dependent field"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MAGETWO-94872"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
+        </before>
+        <amOnPage url="{{CatalogConfigPage.url}}" stepKey="navigateToConfigurationPage" />
+        <waitForPageLoad stepKey="wait1"/>
+        <conditionalClick stepKey="expandLayeredNavigationTab" selector="{{LayeredNavigationSection.layeredNavigation}}" dependentSelector="{{LayeredNavigationSection.CheckIfTabExpand}}" visible="true" />
+        <waitForElementVisible  selector="{{LayeredNavigationSection.NavigationStepCalculationSystemValue}}" stepKey="waitForUseSystemValueVisible"/>
+        <uncheckOption selector="{{LayeredNavigationSection.NavigationStepCalculationSystemValue}}" stepKey="uncheckUseSystemValue"/>
+        <selectOption selector="{{LayeredNavigationSection.NavigationStepCalculation}}" userInput="Manual" stepKey="selectOption1"/>
+        <uncheckOption selector="{{LayeredNavigationSection.PriceNavigationStepSystemValue}}" stepKey="uncheckUseSystemValue2"/>
+        <fillField selector="{{LayeredNavigationSection.PriceNavigationStep}}" userInput="102" stepKey="fillAdmin1"/>
+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
+        <waitForPageLoad stepKey="waitForSavingSystemConfiguration"/>
+        <seeInField stepKey="seeThatValueWasSaved" selector="{{LayeredNavigationSection.PriceNavigationStep}}" userInput="102"/>
+        <checkOption selector="{{LayeredNavigationSection.NavigationStepCalculationSystemValue}}" stepKey="setToDefaultValue1"/>
+        <checkOption selector="{{LayeredNavigationSection.PriceNavigationStepSystemValue}}" stepKey="setToDefaultValue2"/>
+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig2" />
+        <waitForPageLoad stepKey="waitForSavingSystemConfiguration2"/>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>

lib/web/mage/adminhtml/form.js

@@ -494,8 +494,7 @@ define([
                     inputs.each(function (item) {
                         // don't touch hidden inputs (and Use Default inputs too), bc they may have custom logic
                         if ((!item.type || item.type != 'hidden') && !($(item.id + '_inherit') && $(item.id + '_inherit').checked) && //eslint-disable-line
-                            !(currentConfig['can_edit_price'] != undefined && !currentConfig['can_edit_price']) &&  //eslint-disable-line
-                            !item.id.endsWith('_inherit')
+                            !(currentConfig['can_edit_price'] != undefined && !currentConfig['can_edit_price']) //eslint-disable-line
                         ) {
                             item.disabled = false;
                             jQuery(item).removeClass('ignore-validate');