Merge remote-tracking branch 'mavericks/MTA-3791-PR' into mavericks-PR

Author: rliukshyn

dev/tests/functional/lib/Magento/Mtf/App/State/State1.php

@@ -25,7 +25,7 @@ class State1 extends AbstractState
      *
      * @var string
      */
-    protected $config ='admin_session_lifetime_1_hour, wysiwyg_disabled, admin_account_sharing_enable';
+    protected $config ='admin_session_lifetime_1_hour, wysiwyg_disabled, admin_account_sharing_enable, log_to_file';
 
     /**
      * @construct

dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml

@@ -150,6 +150,15 @@
             </field>
         </dataset>
 
+        <dataset name="log_to_file">
+            <field name="dev/debug/debug_logging" xsi:type="array">
+                <item name="scope" xsi:type="string">default</item>
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+        </dataset>
+
         <dataset name="enable_https_frontend_admin">
             <field name="web/secure/use_in_frontend" xsi:type="array">
                 <item name="scope" xsi:type="string">default</item>
@@ -164,6 +173,21 @@
                 <item name="value" xsi:type="number">1</item>
             </field>
         </dataset>
+
+        <dataset name="enable_https_frontend_admin_rollback">
+            <field name="web/secure/use_in_frontend" xsi:type="array">
+                <item name="scope" xsi:type="string">default</item>
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+            <field name="web/secure/use_in_adminhtml" xsi:type="array">
+                <item name="scope" xsi:type="string">default</item>
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+        </dataset>
         <dataset name="enable_hsts">
             <field name="web/secure/enable_hsts" xsi:type="array">
                 <item name="scope" xsi:type="string">default</item>

dev/tests/functional/tests/app/Magento/Config/Test/TestStep/SetupConfigurationStep.php

@@ -8,6 +8,7 @@
 
 use Magento\Mtf\Fixture\FixtureFactory;
 use Magento\Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Util\Command\Cli\Cache;
 use Magento\PageCache\Test\Page\Adminhtml\AdminCache;
 
 /**
@@ -50,19 +51,28 @@ class SetupConfigurationStep implements TestStepInterface
      */
     protected $flushCache;
 
+    /**
+     * Cli command to do operations with cache.
+     *
+     * @var Cache
+     */
+    private $cache;
+
     /**
      * Preparing step properties.
      *
      * @constructor
      * @param FixtureFactory $fixtureFactory
      * @param AdminCache $adminCache
+     * @param Cache $cache
      * @param string $configData
      * @param bool $rollback
      * @param bool $flushCache
      */
     public function __construct(
         FixtureFactory $fixtureFactory,
         AdminCache $adminCache,
+        Cache $cache,
         $configData = null,
         $rollback = false,
         $flushCache = false
@@ -72,6 +82,7 @@ public function __construct(
         $this->configData = $configData;
         $this->rollback = $rollback;
         $this->flushCache = $flushCache;
+        $this->cache = $cache;
     }
 
     /**
@@ -95,13 +106,11 @@ public function run()
                 $config->persist();
                 $result[] = $config;
             }
+            if ($this->flushCache) {
+                $this->cache->flush();
+            }
         }
-        
-        if ($this->flushCache) {
-            $this->adminCache->open();
-            $this->adminCache->getActionsBlock()->flushMagentoCache();
-            $this->adminCache->getMessagesBlock()->waitSuccessMessage();
-        }
+
 
         return ['config' => $result];
     }