MAGETWO-61786: Implementation

Author: Bohdan Korablov

app/code/Magento/Config/Model/Config/Structure/ConcealInProductionConfigList.php

@@ -78,6 +78,6 @@ public function isDisabled($path)
      */
     private function normalizePath($path)
     {
-        return trim($path ,'/');
+        return trim($path, '/');
     }
 }

dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Tabs.php

@@ -9,7 +9,7 @@
 use Magento\Mtf\Client\Locator;
 
 /**
- * Class Tabs.
+ * Block of tabs on Stores > Settings > Configuration page.
  */
 class Tabs extends Block
 {
@@ -18,47 +18,43 @@ class Tabs extends Block
      *
      * @var string
      */
-    private $topTab = ".//*//strong[contains(., '%s')]/parent::div";
+    private $topTab = ".//div[@role='tab' and *[contains(.,'%s')]]";
 
     /**
      * Selector of block with sub tabs.
      *
      * @var string
      */
-    private $subTabs = ".//*//strong[contains(., '%s')]/parent::div/parent::div/ul";
+    private $subTabs = "./following-sibling::ul";
 
     /**
-     * Selector of specific sub tab.
+     * Selector of specific sub tab name.
      *
      * @var string
      */
-    private $subTab = 'li:nth-of-type(%s)';
+    private $subTabName = 'li a span';
 
     /**
-     * Get list of sub tabs of tab.
+     * Get list of sub tabs names of tab.
      *
      * @param string $tab
      * @return array
      */
-    public function getSubTabs($tab)
+    public function getSubTabsNames($tab)
     {
-        $subTabs = [];
-        $textSelector = 'a span';
+        $subTabsNames = [];
 
-        $subTabsBlock = $this->_rootElement->find(sprintf($this->subTabs, $tab), Locator::SELECTOR_XPATH);
+        $topTab = $this->_rootElement->find(sprintf($this->topTab, $tab), Locator::SELECTOR_XPATH);
+        $subTabsBlock = $topTab->find($this->subTabs, Locator::SELECTOR_XPATH);
 
         if (!$subTabsBlock->isVisible()) {
-            $this->_rootElement->find(sprintf($this->topTab, $tab), Locator::SELECTOR_XPATH)->click();
+            $topTab->click();
         }
 
-        $count = 1;
-        while ($subTabsBlock->find(sprintf($this->subTab, $count))->isVisible()) {
-            $subTabs[] = $subTabsBlock->find(sprintf($this->subTab, $count))
-                ->find($textSelector)
-                ->getText();
-            $count++;
+        foreach ($subTabsBlock->getElements($this->subTabName) as $elements) {
+            $subTabsNames[] = $elements->getText();
         }
 
-        return $subTabs;
+        return $subTabsNames;
     }
 }

dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertDeveloperSectionVisibility.php

@@ -23,12 +23,12 @@ public function processAssert(SystemConfigEdit $configEdit)
     {
         if ($_ENV['mage_mode'] === 'production') {
             \PHPUnit_Framework_Assert::assertFalse(
-                in_array('Developer', $configEdit->getTabs()->getSubTabs('Advanced')),
+                in_array('Developer', $configEdit->getTabs()->getSubTabsNames('Advanced')),
                 'Developer section should be hidden in production mode.'
             );
         } else {
             \PHPUnit_Framework_Assert::assertTrue(
-                in_array('Developer', $configEdit->getTabs()->getSubTabs('Advanced')),
+                in_array('Developer', $configEdit->getTabs()->getSubTabsNames('Advanced')),
                 'Developer section should be not hidden in developer or default mode.'
             );
         }

dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/ConfigPageVisibilityTest.php

@@ -9,14 +9,14 @@
 use Magento\Backend\Test\Page\Adminhtml\SystemConfigEdit;
 
 /**
- * Verify visibility of Locale field and Developer section on Configuration page.
+ * Verify visibility of form elements on Configuration page.
  *
  * @ZephyrId MAGETWO-63625, MAGETWO-63624
  */
 class ConfigPageVisibilityTest extends Injectable
 {
     /* tags */
-    const TEST_TYPE = 'acceptance_test';
+    const SEVERITY = 'S1';
     /* end tags */
 
     /**

dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/ConfigPageVisibilityTest.xml

@@ -6,8 +6,8 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-    <testCase name="Magento\Backend\Test\TestCase\VisibilityLocaleCodeTest" summary="Check Developer section and Locale field">
-        <variation name="first" summary="Check Developer section and Locale field" ticketId="MAGETWO-63625, MAGETWO-63624">
+    <testCase name="Magento\Backend\Test\TestCase\ConfigPageVisibilityTest" summary="Check Developer section and Locale field">
+        <variation name="VisibilityOfDeveloperSectionAndLocaleField" summary="Check Developer section and Locale field" ticketId="MAGETWO-63625, MAGETWO-63624">
             <constraint name="Magento\Backend\Test\Constraint\AssertLocaleCodeVisibility" />
             <constraint name="Magento\Backend\Test\Constraint\AssertDeveloperSectionVisibility" />
         </variation>