From b4bd29ead5d205413111800c268c5ed2d0fcb90d Mon Sep 17 00:00:00 2001 From: Kevin Kozan Date: Tue, 7 May 2019 11:04:07 -0500 Subject: [PATCH 1/4] MQE-1532: Bump MFTF version in Magento - MFTF version bump and lock file update --- composer.json | 2 +- composer.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 8df1d26295124..20a4b449d3ef2 100644 --- a/composer.json +++ b/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", diff --git a/composer.lock b/composer.lock index acdfe237272f1..0d33f64678e7f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "442a108524a23e16cbb70c8957cd3097", + "content-hash": "4f20e93e274aba4b8965b3da66b59a1b", "packages": [ { "name": "braintree/braintree_php", @@ -6235,16 +6235,16 @@ }, { "name": "magento/magento2-functional-testing-framework", - "version": "2.3.13", + "version": "2.4.0", "source": { "type": "git", "url": "https://github.com/magento/magento2-functional-testing-framework.git", - "reference": "2c8a4c3557c9a8412eb2ea50ce3f69abc2f47ba1" + "reference": "ef534dbcb3aeea68f9254dfd018165c546ad2edb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/2c8a4c3557c9a8412eb2ea50ce3f69abc2f47ba1", - "reference": "2c8a4c3557c9a8412eb2ea50ce3f69abc2f47ba1", + "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/ef534dbcb3aeea68f9254dfd018165c546ad2edb", + "reference": "ef534dbcb3aeea68f9254dfd018165c546ad2edb", "shasum": "" }, "require": { @@ -6257,12 +6257,12 @@ "fzaninotto/faker": "^1.6", "monolog/monolog": "^1.0", "mustache/mustache": "~2.5", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.2.0", + "php": "7.0.2||7.0.4||~7.0.6||~7.1.0||~7.2.0||~7.3.0", "symfony/process": "^2.8 || ^3.1 || ^4.0", "vlucas/phpdotenv": "^2.4" }, "require-dev": { - "brainmaestro/composer-git-hooks": "^2.3", + "brainmaestro/composer-git-hooks": "^2.3.1", "codacy/coverage": "^1.4", "codeception/aspect-mock": "^3.0", "doctrine/cache": "<1.7.0", @@ -6304,7 +6304,7 @@ "magento", "testing" ], - "time": "2019-01-29T15:31:14+00:00" + "time": "2019-04-29T20:56:26+00:00" }, { "name": "moontoast/math", From 1c80853f5898883f01f17cf9cead5ed70954a7e8 Mon Sep 17 00:00:00 2001 From: Kevin Kozan Date: Tue, 7 May 2019 15:00:47 -0500 Subject: [PATCH 2/4] MQE-1532: Bump MFTF version in Magento - Test Stabilization --- .../Test/AdminImportCustomizableOptionToProductWithSKUTest.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml index ce9337dead3f7..bf9535bcfe2df 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml @@ -28,6 +28,8 @@ + + From b358feed0c93b4a6c7c47aa1f73c9c6b9fabd006 Mon Sep 17 00:00:00 2001 From: Kevin Kozan Date: Wed, 8 May 2019 10:42:48 -0500 Subject: [PATCH 3/4] MQE-1532: Bump MFTF version in Magento - Test Stabilization --- .../Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml index e679d59fde791..91ca1f5afe3fc 100644 --- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml +++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml @@ -37,6 +37,7 @@ + From 88d0d48f2a5d1e90aff0f5a98fc5669bd70ef120 Mon Sep 17 00:00:00 2001 From: Kevin Kozan Date: Wed, 8 May 2019 11:43:17 -0500 Subject: [PATCH 4/4] MQE-1532: Bump MFTF version in Magento - Skipping MC-15740 --- .../Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml | 1 - .../Test/AdminImportCustomizableOptionToProductWithSKUTest.xml | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml index 91ca1f5afe3fc..e679d59fde791 100644 --- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml +++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml @@ -37,7 +37,6 @@ - diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml index bf9535bcfe2df..e03f5f71dbdcc 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml @@ -17,6 +17,9 @@ + + +