MAGETWO-80353: PHP 7.1 compatibility: Jenkins Failures related to PHP 7.1 upgrade

- fix UpdateCustomVariableEntityTest test

Author: irenelagno

dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/UpdateCustomVariableEntityTest.php

@@ -12,6 +12,7 @@
 use Magento\Store\Test\Fixture\Store;
 use Magento\Mtf\Fixture\FixtureFactory;
 use Magento\Mtf\TestCase\Injectable;
+use Magento\Mtf\TestStep\TestStepFactory;
 
 /**
  * Preconditions:
@@ -59,19 +60,36 @@ class UpdateCustomVariableEntityTest extends Injectable
      */
     protected $store = null;
 
+    /**
+     * Configuration setting.
+     *
+     * @var string
+     */
+    private $configData;
+
+    /**
+     * Factory for Test Steps.
+     *
+     * @var TestStepFactory
+     */
+    private $testStepFactory;
+
     /**
      * Injection data.
      *
      * @param SystemVariableIndex $systemVariableIndex
      * @param SystemVariableNew $systemVariableNew
+     * @param TestStepFactory $testStepFactory
      * @return void
      */
     public function __inject(
         SystemVariableIndex $systemVariableIndex,
-        SystemVariableNew $systemVariableNew
+        SystemVariableNew $systemVariableNew,
+        TestStepFactory $testStepFactory
     ) {
         $this->systemVariableIndexPage = $systemVariableIndex;
         $this->systemVariableNewPage = $systemVariableNew;
+        $this->testStepFactory = $testStepFactory;
     }
 
     /**
@@ -81,14 +99,22 @@ public function __inject(
      * @param SystemVariable $customVariable
      * @param SystemVariable $customVariableOrigin
      * @param string $saveAction
+     * @param string|null $configData [optional]
      * @return array
      */
     public function test(
         FixtureFactory $fixtureFactory,
         SystemVariable $customVariable,
         SystemVariable $customVariableOrigin,
-        $saveAction
+        $saveAction,
+        $configData = null
     ) {
+        // Preconditions
+        $this->configData = $configData;
+        $this->testStepFactory->create(
+            \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
+            ['configData' => $this->configData]
+        )->run();
         $this->store = $fixtureFactory->createByCode('store', ['dataset' => 'custom']);
         $this->store->persist();
         $customVariableOrigin->persist();

dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/UpdateCustomVariableEntityTest.xml

@@ -19,8 +19,7 @@
             <constraint name="Magento\Variable\Test\Constraint\AssertCustomVariableInPage" />
         </variation>
         <variation name="UpdateCustomVariableEntityTestVariation2">
-            <data name="tag" xsi:type="string">stable:no</data>
-            <data name="issue" xsi:type="string">MAGETWO-80353: PHP 7.1 compatibility: Jenkins Failures related to PHP 7.1 upgrade</data>
+            <data name="configData" xsi:type="string">add_store_code_to_urls</data>
             <data name="customVariable/data/code" xsi:type="string">variableCode%isolation%</data>
             <data name="customVariable/data/name" xsi:type="string">variableName%isolation%</data>
             <data name="customVariable/data/use_default_value" xsi:type="string">No</data>
@@ -32,6 +31,7 @@
             <constraint name="Magento\Variable\Test\Constraint\AssertCustomVariableInPage" />
         </variation>
         <variation name="UpdateCustomVariableEntityTestVariation3">
+            <data name="configData" xsi:type="string">add_store_code_to_urls</data>
             <data name="customVariable/data/code" xsi:type="string">variableCode%isolation%</data>
             <data name="customVariable/data/name" xsi:type="string">variableName%isolation%</data>
             <data name="customVariable/data/use_default_value" xsi:type="string">No</data>
@@ -44,8 +44,7 @@
             <constraint name="Magento\Variable\Test\Constraint\AssertCustomVariableInPage" />
         </variation>
         <variation name="UpdateCustomVariableEntityTestVariation4">
-            <data name="tag" xsi:type="string">stable:no</data>
-            <data name="issue" xsi:type="string">MAGETWO-80353: PHP 7.1 compatibility: Jenkins Failures related to PHP 7.1 upgrade</data>
+            <data name="configData" xsi:type="string">add_store_code_to_urls</data>
             <data name="customVariable/data/code" xsi:type="string">variableCode%isolation%</data>
             <data name="customVariable/data/name" xsi:type="string">variableName%isolation%</data>
             <data name="customVariable/data/use_default_value" xsi:type="string">No</data>