Refactoring the test coverage

Author: eduard13

app/code/Magento/Config/Test/Mftf/ActionGroup/AdminExpandConfigSectionActionGroup.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminExpandConfigSectionActionGroup">
+        <annotations>
+            <description>Expands configuration section passed via argument as Section Name.</description>
+        </annotations>
+        <arguments>
+            <argument name="sectionName" type="string"/>
+        </arguments>
+
+        <conditionalClick selector="{{AdminConfigSection.collapsibleSectionByTitle(sectionName)}}" dependentSelector="{{AdminConfigSection.expandedSectionByTitle(sectionName)}}" visible="false" stepKey="expandSection" />
+        <waitForElement selector="{{AdminConfigSection.expandedSectionByTitle(sectionName)}}" stepKey="waitOpenedSection"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml

@@ -19,5 +19,8 @@
         <element name="defaultConfigButton" type="button" selector="#store-change-button" timeout="30"/>
         <element name="defaultConfigDropdown" type="button" selector="//ul[@class='dropdown-menu']" timeout="30"/>
         <element name="fieldError" type="text" selector="label.mage-error"/>
+        <element name="useSystemValue" type="checkbox" selector="#{{element}} > .use-default > input" parameterized="true"/>
+        <element name="collapsibleSectionByTitle" type="text" selector="//form[@id='config-edit-form']//div[@class='section-config'][contains(.,'{{sectionTitle}}')]" parameterized="true" />
+        <element name="expandedSectionByTitle" type="text" selector="//form[@id='config-edit-form']//div[@class='section-config active'][contains(.,'{{sectionTitle}}')]" parameterized="true" />
     </section>
 </sections>

app/code/Magento/NewRelicReporting/Test/Mftf/ActionGroup/AdminExpandNewRelicConfigTabActionGroup.xml

@@ -8,7 +8,11 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminUncheckNewRelicUseSystemValueActionGroup">
-        <uncheckOption selector="{{AdminNewRelicConfigSystemSection.useSystemValueForEnabled}}" stepKey="uncheckCheckbox"/>
+    <actionGroup name="AdminUncheckUseSystemValueActionGroup">
+        <arguments>
+            <argument name="rowId" type="string"/>
+        </arguments>
+
+        <uncheckOption selector="{{AdminConfigSection.useSystemValue(rowId)}}" stepKey="uncheckCheckbox"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/NewRelicReporting/Test/Mftf/ActionGroup/AdminUncheckNewRelicUseSystemValueActionGroup.xml

@@ -9,9 +9,8 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminNewRelicConfigSystemSection">
-        <element name="tab" type="button" selector="#newrelicreporting_{{tab}}-head" parameterized="true"/>
+        <element name="statusRowId" type="text" selector="#row_newrelicreporting_general_enable"/>
         <element name="status" type="select" selector="#row_newrelicreporting_general_enable [data-ui-id='select-groups-general-fields-enable-value']"/>
-        <element name="useSystemValueForEnabled" type="checkbox" selector="#newrelicreporting_general_enable_inherit"/>
         <element name="apiUrl" type="select" selector="input#newrelicreporting_general_api_url"/>
     </section>
 </sections>

app/code/Magento/NewRelicReporting/Test/Mftf/Section/AdminNewRelicConfigSystemSection.xml

@@ -8,20 +8,20 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminChecksSystemConfigDependencyTest">
+    <test name="AdminCheckNewRelicSystemConfigDependencyTest">
         <annotations>
             <features value="NewRelicReporting"/>
             <stories value="Admin is able to see the configuration fields only after enabling the feature"/>
             <title value="Admin can see the configuration fields only after enabling the feature"/>
             <description value="The system configs should be available only after enabling the New Relic feature."/>
-            <severity value="CRITICAL"/>
+            <severity value="MINOR"/>
             <group value="NewRelicReporting"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <actionGroup ref="AdminNavigateToNewRelicConfigurationActionGroup" stepKey="goToConfigPage"/>
-            <actionGroup ref="AdminExpandNewRelicConfigTabActionGroup" stepKey="expandingGeneralTab">
-                <argument name="tabName" value="general"/>
+            <actionGroup ref="AdminExpandConfigSectionActionGroup" stepKey="expandingGeneralSection">
+                <argument name="sectionName" value="General"/>
             </actionGroup>
         </before>
         <after>
@@ -30,7 +30,9 @@
         <actionGroup ref="AssertAdminNewRelicConfigFieldIsNotVisibleActionGroup" stepKey="checkingIfApiUrlIsNotVisible">
             <argument name="config" value="{{AdminNewRelicConfigSystemSection.apiUrl}}"/>
         </actionGroup>
-        <actionGroup ref="AdminUncheckNewRelicUseSystemValueActionGroup" stepKey="uncheckUseSystemValue"/>
+        <actionGroup ref="AdminUncheckUseSystemValueActionGroup" stepKey="uncheckUseSystemValue">
+            <argument name="rowId" value="row_newrelicreporting_general_enable"/>
+        </actionGroup>
         <actionGroup ref="AdminToggleNewRelicReportingEnabledActionGroup" stepKey="enablingNewRelicReporting">
             <argument name="state" value="Yes"/>
         </actionGroup>