Merge pull request magento#4177 from magento-pangolin/MFTF-2.4.0-2.2

MQE-1532: Bump MFTF version in Magento - 2.2-develop

app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml

@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-15740"/>
             <useCaseId value="MAGETWO-73157"/>
+            <skip>
+                <issueId value="MC-16313"/>
+            </skip>
             <group value="catalog"/>
         </annotations>
         <before>
@@ -28,6 +31,8 @@
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
             <updateData createDataKey="createFirstProduct" entity="ProductWithFieldOptions" stepKey="updateProductCustomOptions" />
+            <magentoCLI stepKey="reindex" command="indexer:reindex"/>
+            <magentoCLI stepKey="flushCache" command="cache:flush"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
         <after>

composer.json

@@ -74,7 +74,7 @@
         "ramsey/uuid": "~3.7.3"
     },
     "require-dev": {
-        "magento/magento2-functional-testing-framework": "2.3.13",
+        "magento/magento2-functional-testing-framework": "2.4.0",
         "phpunit/phpunit": "~6.2.0",
         "squizlabs/php_codesniffer": "3.2.2",
         "phpmd/phpmd": "@stable",