From 187b8c6e71e99bd2f0d40b002750c502ff081211 Mon Sep 17 00:00:00 2001 From: Soumya Unnikrishnan Date: Wed, 6 May 2020 16:02:25 -0500 Subject: [PATCH 01/18] MQE-2045: Upgrade script to remove unused arguments updated action groups to remove unused arguments --- .../ActionGroup/AdminFilterLegacyGridActionGroup.xml | 1 - .../ActionGroup/AdminCreateNewRoleActionGroup.xml | 3 --- .../Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml | 3 --- .../AdminOrderBundleProductActionGroup.xml | 1 - .../ViewBundleProductInAdminGridActionGroup.xml | 1 - ...lueWithTwoStoreViesFromProductPageActionGroup.xml | 1 - ...mpleProductWithTextOptionCharLimitActionGroup.xml | 1 - ...dminSwitchScopeForProductAttributeActionGroup.xml | 3 --- .../CheckCategoryImageInAdminActionGroup.xml | 3 --- .../CheckItemInLayeredNavigationActionGroup.xml | 1 - ...eteProductAttributeByAttributeCodeActionGroup.xml | 3 --- .../TestDynamicValidationHintActionGroup.xml | 3 --- ...reateCatalogPriceRuleWithConditionActionGroup.xml | 3 --- .../AssertCatalogPriceRuleFormActionGroup.xml | 1 - .../AssertStorefrontCheckoutCartItemsActionGroup.xml | 1 - ...sertProductAddToCartSuccessMessageActionGroup.xml | 3 --- .../AdminInsertRecentlyViewedWidgetActionGroup.xml | 1 - ...figurableProductOnAdminProductPageActionGroup.xml | 3 --- ...pecialPriceOnStorefrontProductPageActionGroup.xml | 1 - ...onfigurableProductWithAttributeSetActionGroup.xml | 1 - .../ActionGroup/CreateCustomTemplateActionGroup.xml | 3 +++ .../ActionGroup/CreateNewTemplateActionGroup.xml | 3 --- ...NewOrderPageNewCustomerSingleStoreActionGroup.xml | 3 --- .../ActionGroup/AdminFilterStoreViewActionGroup.xml | 1 - composer.json | 2 +- composer.lock | 12 ++++++------ 26 files changed, 10 insertions(+), 52 deletions(-) diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminFilterLegacyGridActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminFilterLegacyGridActionGroup.xml index f4af54d2edc45..3b1ed2c6a7670 100644 --- a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminFilterLegacyGridActionGroup.xml +++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminFilterLegacyGridActionGroup.xml @@ -10,7 +10,6 @@ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> - diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminCreateNewRoleActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminCreateNewRoleActionGroup.xml index 29000563ee87f..b71b1e492d4b6 100644 --- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminCreateNewRoleActionGroup.xml +++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminCreateNewRoleActionGroup.xml @@ -14,9 +14,6 @@ - - - diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml index 9ee3c79d1288e..3e1474d017ac8 100644 --- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml +++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml @@ -12,9 +12,6 @@ Deletes a User Role that contains the text 'Role'. PLEASE NOTE: The Action Group values are Hardcoded. - - - diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminOrderBundleProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminOrderBundleProductActionGroup.xml index d73d31c4498f8..8fcc1148aebc4 100644 --- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminOrderBundleProductActionGroup.xml +++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminOrderBundleProductActionGroup.xml @@ -10,7 +10,6 @@ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> - diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/ViewBundleProductInAdminGridActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/ViewBundleProductInAdminGridActionGroup.xml index bd0d08e4c0924..3ede9f9a7044a 100644 --- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/ViewBundleProductInAdminGridActionGroup.xml +++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/ViewBundleProductInAdminGridActionGroup.xml @@ -14,7 +14,6 @@ - diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateAttributeWithValueWithTwoStoreViesFromProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateAttributeWithValueWithTwoStoreViesFromProductPageActionGroup.xml index ec02df1fbf327..61189d6eddf0c 100644 --- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateAttributeWithValueWithTwoStoreViesFromProductPageActionGroup.xml +++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateAttributeWithValueWithTwoStoreViesFromProductPageActionGroup.xml @@ -15,7 +15,6 @@ - diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateSimpleProductWithTextOptionCharLimitActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateSimpleProductWithTextOptionCharLimitActionGroup.xml index 66620e3d9dd07..f27a08eb3e0b2 100644 --- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateSimpleProductWithTextOptionCharLimitActionGroup.xml +++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateSimpleProductWithTextOptionCharLimitActionGroup.xml @@ -15,7 +15,6 @@ - diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSwitchScopeForProductAttributeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSwitchScopeForProductAttributeActionGroup.xml index bd2414ae6e6c5..5d7e21b08905f 100644 --- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSwitchScopeForProductAttributeActionGroup.xml +++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSwitchScopeForProductAttributeActionGroup.xml @@ -9,9 +9,6 @@ - - - diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckCategoryImageInAdminActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckCategoryImageInAdminActionGroup.xml index fd01d4db5babb..b659848ebba1b 100644 --- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckCategoryImageInAdminActionGroup.xml +++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckCategoryImageInAdminActionGroup.xml @@ -12,9 +12,6 @@ Requires navigation to the Category creation/edit page. Click on the Upload button. Validates that the Image exists. - - - diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckItemInLayeredNavigationActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckItemInLayeredNavigationActionGroup.xml index 6d7214645b27a..3ad74fb8c4241 100644 --- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckItemInLayeredNavigationActionGroup.xml +++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckItemInLayeredNavigationActionGroup.xml @@ -14,7 +14,6 @@ - diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductAttributeByAttributeCodeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductAttributeByAttributeCodeActionGroup.xml index ddba6649161ef..38bce6fb2cb23 100644 --- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductAttributeByAttributeCodeActionGroup.xml +++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductAttributeByAttributeCodeActionGroup.xml @@ -12,9 +12,6 @@ Delete a Product Attribute from the Product Attribute creation/edit page. - - - diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/TestDynamicValidationHintActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/TestDynamicValidationHintActionGroup.xml index 9e3f46e0400b2..59a280376390a 100644 --- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/TestDynamicValidationHintActionGroup.xml +++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/TestDynamicValidationHintActionGroup.xml @@ -12,9 +12,6 @@ Validates that the Product Text Option Text Length Hint displays the correct Count for multiple inputs based on the provided Character Limit. - - - diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCreateCatalogPriceRuleWithConditionActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCreateCatalogPriceRuleWithConditionActionGroup.xml index 9e21ea186f67b..49d358394060f 100644 --- a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCreateCatalogPriceRuleWithConditionActionGroup.xml +++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCreateCatalogPriceRuleWithConditionActionGroup.xml @@ -9,9 +9,6 @@ - - - diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AssertCatalogPriceRuleFormActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AssertCatalogPriceRuleFormActionGroup.xml index 0a4b6366d11a8..2bb42b0354d77 100644 --- a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AssertCatalogPriceRuleFormActionGroup.xml +++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AssertCatalogPriceRuleFormActionGroup.xml @@ -14,7 +14,6 @@ - diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontCheckoutCartItemsActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontCheckoutCartItemsActionGroup.xml index 47e44e86affb8..e2d4fd2e89c2f 100644 --- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontCheckoutCartItemsActionGroup.xml +++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontCheckoutCartItemsActionGroup.xml @@ -14,7 +14,6 @@ - diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertProductAddToCartSuccessMessageActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertProductAddToCartSuccessMessageActionGroup.xml index 60c9461c53f7b..6f64fa74e6aa8 100644 --- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertProductAddToCartSuccessMessageActionGroup.xml +++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertProductAddToCartSuccessMessageActionGroup.xml @@ -8,9 +8,6 @@ - - - diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminInsertRecentlyViewedWidgetActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminInsertRecentlyViewedWidgetActionGroup.xml index 781cc32834462..fee766b69e8ec 100644 --- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminInsertRecentlyViewedWidgetActionGroup.xml +++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminInsertRecentlyViewedWidgetActionGroup.xml @@ -13,7 +13,6 @@ - diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AssertConfigurableProductOnAdminProductPageActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AssertConfigurableProductOnAdminProductPageActionGroup.xml index 88e170e3a3a90..ea76480d13242 100644 --- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AssertConfigurableProductOnAdminProductPageActionGroup.xml +++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AssertConfigurableProductOnAdminProductPageActionGroup.xml @@ -12,9 +12,6 @@ Validates that the provided Configurable Product Name, SKU and Price are present and correct on the Configurable Product creation/edit page. PLEASE NOTE: The Product Data is Hardcoded. - - - diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AssertConfigurableProductWithSpecialPriceOnStorefrontProductPageActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AssertConfigurableProductWithSpecialPriceOnStorefrontProductPageActionGroup.xml index b998b4443f446..f1a64d495459f 100644 --- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AssertConfigurableProductWithSpecialPriceOnStorefrontProductPageActionGroup.xml +++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AssertConfigurableProductWithSpecialPriceOnStorefrontProductPageActionGroup.xml @@ -15,7 +15,6 @@ - diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/CreateConfigurableProductWithAttributeSetActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/CreateConfigurableProductWithAttributeSetActionGroup.xml index cf8d36b393178..d448703bf7008 100644 --- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/CreateConfigurableProductWithAttributeSetActionGroup.xml +++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/CreateConfigurableProductWithAttributeSetActionGroup.xml @@ -14,7 +14,6 @@ - diff --git a/app/code/Magento/Email/Test/Mftf/ActionGroup/CreateCustomTemplateActionGroup.xml b/app/code/Magento/Email/Test/Mftf/ActionGroup/CreateCustomTemplateActionGroup.xml index 6fe1dfad761ff..4583e9955b351 100644 --- a/app/code/Magento/Email/Test/Mftf/ActionGroup/CreateCustomTemplateActionGroup.xml +++ b/app/code/Magento/Email/Test/Mftf/ActionGroup/CreateCustomTemplateActionGroup.xml @@ -9,6 +9,9 @@ + + + diff --git a/app/code/Magento/Email/Test/Mftf/ActionGroup/CreateNewTemplateActionGroup.xml b/app/code/Magento/Email/Test/Mftf/ActionGroup/CreateNewTemplateActionGroup.xml index c6e45ad06971a..394248709c501 100644 --- a/app/code/Magento/Email/Test/Mftf/ActionGroup/CreateNewTemplateActionGroup.xml +++ b/app/code/Magento/Email/Test/Mftf/ActionGroup/CreateNewTemplateActionGroup.xml @@ -13,9 +13,6 @@ Clicks on Add New Template. Fills the Template details. Clicks on Save. PLEASE NOTE: The values are Hardcoded. - - - diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/NavigateToNewOrderPageNewCustomerSingleStoreActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/NavigateToNewOrderPageNewCustomerSingleStoreActionGroup.xml index cd1be0ac34279..3d3efc705854d 100644 --- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/NavigateToNewOrderPageNewCustomerSingleStoreActionGroup.xml +++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/NavigateToNewOrderPageNewCustomerSingleStoreActionGroup.xml @@ -12,9 +12,6 @@ Goes to the Admin Orders grid page. Clicks on 'Create New Order'. Clicks on 'Create New Customer'. Validates that Page Title is present and correct. - - - diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminFilterStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminFilterStoreViewActionGroup.xml index 4d53d248f2592..147d86cca7f2e 100644 --- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminFilterStoreViewActionGroup.xml +++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminFilterStoreViewActionGroup.xml @@ -13,7 +13,6 @@ Filters the Admin Catalog Product page based on the provided Store Group and Custom Store. - diff --git a/composer.json b/composer.json index 5877eec988b6e..b73b3cca80941 100644 --- a/composer.json +++ b/composer.json @@ -89,7 +89,7 @@ "friendsofphp/php-cs-fixer": "~2.16.0", "lusitanian/oauth": "~0.8.10", "magento/magento-coding-standard": "*", - "magento/magento2-functional-testing-framework": "dev-3.0.0-RC2", + "magento/magento2-functional-testing-framework": "dev-MQE-2045", "pdepend/pdepend": "~2.7.1", "phpcompatibility/php-compatibility": "^9.3", "phpmd/phpmd": "^2.8.0", diff --git a/composer.lock b/composer.lock index e9398fe590d88..d58cd2b58b9c2 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": "97a85f53d759db036608b129fa3fe1af", + "content-hash": "fe503610aec6c3a4c5e1c6592e1808c7", "packages": [ { "name": "braintree/braintree_php", @@ -7130,16 +7130,16 @@ }, { "name": "magento/magento2-functional-testing-framework", - "version": "dev-3.0.0-RC2", + "version": "dev-MQE-2045", "source": { "type": "git", "url": "https://github.com/magento/magento2-functional-testing-framework.git", - "reference": "1225f25f380182cfb1cb73dd3cabbb72fc5f5bee" + "reference": "40a22525798c915718165d6c3134ae5173052163" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/1225f25f380182cfb1cb73dd3cabbb72fc5f5bee", - "reference": "1225f25f380182cfb1cb73dd3cabbb72fc5f5bee", + "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/40a22525798c915718165d6c3134ae5173052163", + "reference": "40a22525798c915718165d6c3134ae5173052163", "shasum": "" }, "require": { @@ -7213,7 +7213,7 @@ "magento", "testing" ], - "time": "2020-04-28T18:49:36+00:00" + "time": "2020-05-06T20:40:40+00:00" }, { "name": "mikey179/vfsstream", From 4038ddac74323a8160755a3ab2512e29a2a6435c Mon Sep 17 00:00:00 2001 From: Soumya Unnikrishnan Date: Fri, 8 May 2020 09:22:58 -0500 Subject: [PATCH 02/18] MQE-2105: Test steps' merging order is not consistent fixed issue with merge file to correct merging order --- .../Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml | 4 +--- .../Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml index 7d75f5d53c1f4..597e95117349f 100644 --- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml +++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml @@ -200,8 +200,6 @@ - - - + diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml index cb2c8d9aa6a90..b98743c319c50 100644 --- a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml +++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml @@ -7,9 +7,9 @@ --> - + > - + From 1e7fedc7c1b64af9864a278caad4ff05992cc0e9 Mon Sep 17 00:00:00 2001 From: Soumya Unnikrishnan Date: Fri, 8 May 2020 10:07:02 -0500 Subject: [PATCH 03/18] MQE-2105: Test steps' merging order is not consistent fixed issue with merge file to correct merging order --- ...CheckResultsOfColorAndOtherFiltersTest.xml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml index b98743c319c50..9d2ab4669adab 100644 --- a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml +++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml @@ -13,23 +13,23 @@ - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + From 854319680a3dc2b18ed039ac42d3fa5f1ee373ea Mon Sep 17 00:00:00 2001 From: Kevin Kozan Date: Tue, 12 May 2020 10:59:35 -0500 Subject: [PATCH 04/18] MQE-2047: MFTF Static Checks - Added ruleset.json for MFTF tests --- dev/tests/acceptance/staticRuleset.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 dev/tests/acceptance/staticRuleset.json diff --git a/dev/tests/acceptance/staticRuleset.json b/dev/tests/acceptance/staticRuleset.json new file mode 100644 index 0000000000000..64f8d57d6c38c --- /dev/null +++ b/dev/tests/acceptance/staticRuleset.json @@ -0,0 +1,6 @@ +{ + "tests": [ + "actionGroupArguments", + "deprecatedEntityUsage" + ] +} From e1675344b121427d41486a8264f516db2295e83e Mon Sep 17 00:00:00 2001 From: Soumya Unnikrishnan Date: Wed, 13 May 2020 17:21:29 -0500 Subject: [PATCH 05/18] MQE-2125: [3.0.0-RC3] Delivery to Magento 2.4 --- composer.json | 2 +- composer.lock | 628 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 622 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index bb70029021765..3a9c618f09e61 100644 --- a/composer.json +++ b/composer.json @@ -89,7 +89,7 @@ "friendsofphp/php-cs-fixer": "~2.16.0", "lusitanian/oauth": "~0.8.10", "magento/magento-coding-standard": "*", - "magento/magento2-functional-testing-framework": "dev-3.0.0-RC2", + "magento/magento2-functional-testing-framework": "dev-3.0.0-RC3", "pdepend/pdepend": "~2.7.1", "phpcompatibility/php-compatibility": "^9.3", "phpmd/phpmd": "^2.8.0", diff --git a/composer.lock b/composer.lock index 350a2f9c5a2ed..039bd5e9a6177 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": "087f8432a6f317056b40a0b8a160a2cf", + "content-hash": "cbf6614cb49c6de0bbb3cc9adaeaf51b", "packages": [ { "name": "braintree/braintree_php", @@ -334,6 +334,16 @@ "dependency", "package" ], + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], "time": "2020-05-06T08:28:10+00:00" }, { @@ -2309,6 +2319,12 @@ "laminas", "mail" ], + "funding": [ + { + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" + } + ], "time": "2020-04-21T16:42:19+00:00" }, { @@ -4319,6 +4335,16 @@ "parser", "validator" ], + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint", + "type": "tidelift" + } + ], "time": "2020-04-30T19:05:18+00:00" }, { @@ -4439,6 +4465,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-30T11:41:10+00:00" }, { @@ -4492,6 +4532,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -4562,6 +4616,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:54:36+00:00" }, { @@ -4670,6 +4738,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-12T14:40:17+00:00" }, { @@ -4719,6 +4801,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -5060,6 +5156,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-15T15:56:18+00:00" }, { @@ -5618,6 +5728,68 @@ ], "time": "2020-05-07T18:16:43+00:00" }, + { + "name": "beberlei/assert", + "version": "v3.2.7", + "source": { + "type": "git", + "url": "https://github.com/beberlei/assert.git", + "reference": "d63a6943fc4fd1a2aedb65994e3548715105abcf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/beberlei/assert/zipball/d63a6943fc4fd1a2aedb65994e3548715105abcf", + "reference": "d63a6943fc4fd1a2aedb65994e3548715105abcf", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-json": "*", + "ext-mbstring": "*", + "ext-simplexml": "*", + "php": "^7" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "*", + "phpstan/phpstan-shim": "*", + "phpunit/phpunit": ">=6.0.0 <8" + }, + "suggest": { + "ext-intl": "Needed to allow Assertion::count(), Assertion::isCountable(), Assertion::minCount(), and Assertion::maxCount() to operate on ResourceBundles" + }, + "type": "library", + "autoload": { + "psr-4": { + "Assert\\": "lib/Assert" + }, + "files": [ + "lib/Assert/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de", + "role": "Lead Developer" + }, + { + "name": "Richard Quadling", + "email": "rquadling@gmail.com", + "role": "Collaborator" + } + ], + "description": "Thin assertion library for input validation in business models.", + "keywords": [ + "assert", + "assertion", + "validation" + ], + "time": "2019-12-19T17:51:41+00:00" + }, { "name": "behat/gherkin", "version": "v4.6.2", @@ -5853,6 +6025,12 @@ "functional testing", "unit testing" ], + "funding": [ + { + "url": "https://opencollective.com/codeception", + "type": "open_collective" + } + ], "time": "2020-03-23T17:07:20+00:00" }, { @@ -6701,6 +6879,12 @@ } ], "description": "A tool to automatically fix PHP code style", + "funding": [ + { + "url": "https://github.com/keradus", + "type": "github" + } + ], "time": "2020-04-15T18:51:10+00:00" }, { @@ -7069,16 +7253,16 @@ }, { "name": "magento/magento2-functional-testing-framework", - "version": "dev-3.0.0-RC2", + "version": "dev-3.0.0-RC3", "source": { "type": "git", "url": "https://github.com/magento/magento2-functional-testing-framework.git", - "reference": "b525101e1ea02b2691f389982b0cb91b76c71ff4" + "reference": "545a266e9239a6eaa1640951f90c6a3727a84ceb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/b525101e1ea02b2691f389982b0cb91b76c71ff4", - "reference": "b525101e1ea02b2691f389982b0cb91b76c71ff4", + "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/545a266e9239a6eaa1640951f90c6a3727a84ceb", + "reference": "545a266e9239a6eaa1640951f90c6a3727a84ceb", "shasum": "" }, "require": { @@ -7100,6 +7284,7 @@ "mustache/mustache": "~2.5", "php": "^7.3", "php-webdriver/webdriver": "^1.8.0", + "spomky-labs/otphp": "^10.0", "symfony/console": "^4.4", "symfony/finder": "^5.0", "symfony/mime": "^5.0", @@ -7152,7 +7337,7 @@ "magento", "testing" ], - "time": "2020-04-30T14:54:28+00:00" + "time": "2020-05-13T20:40:14+00:00" }, { "name": "mikey179/vfsstream", @@ -7351,6 +7536,68 @@ ], "time": "2020-01-17T21:11:47+00:00" }, + { + "name": "paragonie/constant_time_encoding", + "version": "v2.3.0", + "source": { + "type": "git", + "url": "https://github.com/paragonie/constant_time_encoding.git", + "reference": "47a1cedd2e4d52688eb8c96469c05ebc8fd28fa2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/47a1cedd2e4d52688eb8c96469c05ebc8fd28fa2", + "reference": "47a1cedd2e4d52688eb8c96469c05ebc8fd28fa2", + "shasum": "" + }, + "require": { + "php": "^7|^8" + }, + "require-dev": { + "phpunit/phpunit": "^6|^7", + "vimeo/psalm": "^1|^2|^3" + }, + "type": "library", + "autoload": { + "psr-4": { + "ParagonIE\\ConstantTime\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com", + "homepage": "https://paragonie.com", + "role": "Maintainer" + }, + { + "name": "Steve 'Sc00bz' Thomas", + "email": "steve@tobtu.com", + "homepage": "https://www.tobtu.com", + "role": "Original Developer" + } + ], + "description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)", + "keywords": [ + "base16", + "base32", + "base32_decode", + "base32_encode", + "base64", + "base64_decode", + "base64_encode", + "bin2hex", + "encoding", + "hex", + "hex2bin", + "rfc4648" + ], + "time": "2019-11-06T19:20:29+00:00" + }, { "name": "pdepend/pdepend", "version": "2.7.1", @@ -8098,6 +8345,20 @@ "MIT" ], "description": "PHPStan - PHP Static Analysis Tool", + "funding": [ + { + "url": "https://github.com/ondrejmirtes", + "type": "github" + }, + { + "url": "https://www.patreon.com/phpstan", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", + "type": "tidelift" + } + ], "time": "2020-05-05T12:55:44+00:00" }, { @@ -8212,6 +8473,12 @@ "filesystem", "iterator" ], + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-04-18T05:02:12+00:00" }, { @@ -8360,6 +8627,12 @@ "keywords": [ "timer" ], + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-04-20T06:00:37+00:00" }, { @@ -8409,6 +8682,12 @@ "keywords": [ "tokenizer" ], + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-05-06T09:56:31+00:00" }, { @@ -8497,6 +8776,16 @@ "testing", "xunit" ], + "funding": [ + { + "url": "https://phpunit.de/donate.html", + "type": "custom" + }, + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-04-30T06:32:53+00:00" }, { @@ -8637,6 +8926,12 @@ ], "description": "Collection of value objects that represent the PHP code units", "homepage": "https://github.com/sebastianbergmann/code-unit", + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-04-30T05:58:10+00:00" }, { @@ -8855,6 +9150,12 @@ "environment", "hhvm" ], + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-04-14T13:36:52+00:00" }, { @@ -9354,6 +9655,77 @@ "homepage": "https://github.com/sebastianbergmann/version", "time": "2020-01-21T06:36:37+00:00" }, + { + "name": "spomky-labs/otphp", + "version": "v10.0.1", + "source": { + "type": "git", + "url": "https://github.com/Spomky-Labs/otphp.git", + "reference": "f44cce5a9db4b8da410215d992110482c931232f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Spomky-Labs/otphp/zipball/f44cce5a9db4b8da410215d992110482c931232f", + "reference": "f44cce5a9db4b8da410215d992110482c931232f", + "shasum": "" + }, + "require": { + "beberlei/assert": "^3.0", + "ext-mbstring": "*", + "paragonie/constant_time_encoding": "^2.0", + "php": "^7.2|^8.0", + "thecodingmachine/safe": "^0.1.14|^1.0" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.0", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-beberlei-assert": "^0.12", + "phpstan/phpstan-deprecation-rules": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpstan/phpstan-strict-rules": "^0.12", + "phpunit/phpunit": "^8.0", + "thecodingmachine/phpstan-safe-rule": "^1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "v10.0": "10.0.x-dev", + "v9.0": "9.0.x-dev", + "v8.3": "8.3.x-dev" + } + }, + "autoload": { + "psr-4": { + "OTPHP\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Florent Morselli", + "homepage": "https://github.com/Spomky" + }, + { + "name": "All contributors", + "homepage": "https://github.com/Spomky-Labs/otphp/contributors" + } + ], + "description": "A PHP library for generating one time passwords according to RFC 4226 (HOTP Algorithm) and the RFC 6238 (TOTP Algorithm) and compatible with Google Authenticator", + "homepage": "https://github.com/Spomky-Labs/otphp", + "keywords": [ + "FreeOTP", + "RFC 4226", + "RFC 6238", + "google authenticator", + "hotp", + "otp", + "totp" + ], + "time": "2020-01-28T09:24:19+00:00" + }, { "name": "squizlabs/php_codesniffer", "version": "3.5.5", @@ -9467,6 +9839,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-15T15:59:10+00:00" }, { @@ -9540,6 +9926,20 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-28T17:58:55+00:00" }, { @@ -9595,6 +9995,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-18T20:50:06+00:00" }, { @@ -9657,6 +10071,20 @@ "mime", "mime-type" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-17T03:29:44+00:00" }, { @@ -9711,6 +10139,20 @@ "configuration", "options" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-06T10:40:56+00:00" }, { @@ -9820,6 +10262,20 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -9879,8 +10335,155 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-28T17:58:55+00:00" }, + { + "name": "thecodingmachine/safe", + "version": "v1.1.1", + "source": { + "type": "git", + "url": "https://github.com/thecodingmachine/safe.git", + "reference": "04f9ffae372a9816d4472dfb7bcf6126b623a9df" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/04f9ffae372a9816d4472dfb7bcf6126b623a9df", + "reference": "04f9ffae372a9816d4472dfb7bcf6126b623a9df", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "require-dev": { + "phpstan/phpstan": "^0.12", + "squizlabs/php_codesniffer": "^3.2", + "thecodingmachine/phpstan-strict-rules": "^0.12" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.1-dev" + } + }, + "autoload": { + "psr-4": { + "Safe\\": [ + "lib/", + "generated/" + ] + }, + "files": [ + "generated/apache.php", + "generated/apc.php", + "generated/apcu.php", + "generated/array.php", + "generated/bzip2.php", + "generated/classobj.php", + "generated/com.php", + "generated/cubrid.php", + "generated/curl.php", + "generated/datetime.php", + "generated/dir.php", + "generated/eio.php", + "generated/errorfunc.php", + "generated/exec.php", + "generated/fileinfo.php", + "generated/filesystem.php", + "generated/filter.php", + "generated/fpm.php", + "generated/ftp.php", + "generated/funchand.php", + "generated/gmp.php", + "generated/gnupg.php", + "generated/hash.php", + "generated/ibase.php", + "generated/ibmDb2.php", + "generated/iconv.php", + "generated/image.php", + "generated/imap.php", + "generated/info.php", + "generated/ingres-ii.php", + "generated/inotify.php", + "generated/json.php", + "generated/ldap.php", + "generated/libevent.php", + "generated/libxml.php", + "generated/lzf.php", + "generated/mailparse.php", + "generated/mbstring.php", + "generated/misc.php", + "generated/msql.php", + "generated/mssql.php", + "generated/mysql.php", + "generated/mysqli.php", + "generated/mysqlndMs.php", + "generated/mysqlndQc.php", + "generated/network.php", + "generated/oci8.php", + "generated/opcache.php", + "generated/openssl.php", + "generated/outcontrol.php", + "generated/password.php", + "generated/pcntl.php", + "generated/pcre.php", + "generated/pdf.php", + "generated/pgsql.php", + "generated/posix.php", + "generated/ps.php", + "generated/pspell.php", + "generated/readline.php", + "generated/rpminfo.php", + "generated/rrd.php", + "generated/sem.php", + "generated/session.php", + "generated/shmop.php", + "generated/simplexml.php", + "generated/sockets.php", + "generated/sodium.php", + "generated/solr.php", + "generated/spl.php", + "generated/sqlsrv.php", + "generated/ssdeep.php", + "generated/ssh2.php", + "generated/stats.php", + "generated/stream.php", + "generated/strings.php", + "generated/swoole.php", + "generated/uodbc.php", + "generated/uopz.php", + "generated/url.php", + "generated/var.php", + "generated/xdiff.php", + "generated/xml.php", + "generated/xmlrpc.php", + "generated/yaml.php", + "generated/yaz.php", + "generated/zip.php", + "generated/zlib.php", + "lib/special_cases.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHP core functions that throw exceptions instead of returning FALSE on error", + "time": "2020-05-04T15:25:36+00:00" + }, { "name": "theseer/fdomdocument", "version": "1.6.6", @@ -10021,6 +10624,16 @@ "env", "environment" ], + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv", + "type": "tidelift" + } + ], "time": "2020-05-02T13:38:00+00:00" }, { @@ -10136,5 +10749,6 @@ "ext-zip": "*", "lib-libxml": "*" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "1.1.0" } From 9d470a23f9d429378ef819cefbe2dbbcaecfe559 Mon Sep 17 00:00:00 2001 From: Soumya Unnikrishnan Date: Wed, 13 May 2020 22:51:04 -0500 Subject: [PATCH 06/18] MQE-2125: [3.0.0-RC3] Delivery to Magento 2.4 fix schema validation error --- .../Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml index 9d2ab4669adab..c01f80b7bcb9b 100644 --- a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml +++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml @@ -7,7 +7,7 @@ --> - > + From cc5cc906d1b98fcfd06e9fb894f9c20159bb1b0e Mon Sep 17 00:00:00 2001 From: Soumya Unnikrishnan Date: Mon, 18 May 2020 11:40:41 -0500 Subject: [PATCH 07/18] MQE-2125: [3.0.0-RC3] Delivery to Magento 2.4 MFTF updated --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 039bd5e9a6177..63e6033228c24 100644 --- a/composer.lock +++ b/composer.lock @@ -7257,12 +7257,12 @@ "source": { "type": "git", "url": "https://github.com/magento/magento2-functional-testing-framework.git", - "reference": "545a266e9239a6eaa1640951f90c6a3727a84ceb" + "reference": "4d0fd883676d280a2d126ee7bd44ff9b1f43f813" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/545a266e9239a6eaa1640951f90c6a3727a84ceb", - "reference": "545a266e9239a6eaa1640951f90c6a3727a84ceb", + "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/4d0fd883676d280a2d126ee7bd44ff9b1f43f813", + "reference": "4d0fd883676d280a2d126ee7bd44ff9b1f43f813", "shasum": "" }, "require": { @@ -7337,7 +7337,7 @@ "magento", "testing" ], - "time": "2020-05-13T20:40:14+00:00" + "time": "2020-05-18T15:40:18+00:00" }, { "name": "mikey179/vfsstream", From ab76954b1ed54c1ef83bb0268bd204c6126ebf7e Mon Sep 17 00:00:00 2001 From: Soumya Unnikrishnan Date: Tue, 19 May 2020 13:12:12 -0500 Subject: [PATCH 08/18] MQE-2125: [3.0.0-RC3] Delivery to Magento 2.4 MFTF updated --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 63e6033228c24..6c229e715a96b 100644 --- a/composer.lock +++ b/composer.lock @@ -7257,12 +7257,12 @@ "source": { "type": "git", "url": "https://github.com/magento/magento2-functional-testing-framework.git", - "reference": "4d0fd883676d280a2d126ee7bd44ff9b1f43f813" + "reference": "df5a57e4cb58e42c390b44d144935245e15eee48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/4d0fd883676d280a2d126ee7bd44ff9b1f43f813", - "reference": "4d0fd883676d280a2d126ee7bd44ff9b1f43f813", + "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/df5a57e4cb58e42c390b44d144935245e15eee48", + "reference": "df5a57e4cb58e42c390b44d144935245e15eee48", "shasum": "" }, "require": { @@ -7337,7 +7337,7 @@ "magento", "testing" ], - "time": "2020-05-18T15:40:18+00:00" + "time": "2020-05-19T16:59:38+00:00" }, { "name": "mikey179/vfsstream", From 3ce16f6f3b0e2552db6f9ceaee2e5301d352f791 Mon Sep 17 00:00:00 2001 From: Ji Lu Date: Tue, 19 May 2020 14:45:22 -0500 Subject: [PATCH 09/18] MQE-2125: bump MFTF version in Magento 2.4 and deliver all related changes. --- composer.lock | 295 +------------------------------------------------- 1 file changed, 5 insertions(+), 290 deletions(-) diff --git a/composer.lock b/composer.lock index 6c229e715a96b..25d32d856bdf0 100644 --- a/composer.lock +++ b/composer.lock @@ -334,16 +334,6 @@ "dependency", "package" ], - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], "time": "2020-05-06T08:28:10+00:00" }, { @@ -2319,12 +2309,6 @@ "laminas", "mail" ], - "funding": [ - { - "url": "https://funding.communitybridge.org/projects/laminas-project", - "type": "community_bridge" - } - ], "time": "2020-04-21T16:42:19+00:00" }, { @@ -4335,16 +4319,6 @@ "parser", "validator" ], - "funding": [ - { - "url": "https://github.com/Seldaek", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint", - "type": "tidelift" - } - ], "time": "2020-04-30T19:05:18+00:00" }, { @@ -4465,20 +4439,6 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-30T11:41:10+00:00" }, { @@ -4532,20 +4492,6 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -4616,20 +4562,6 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:54:36+00:00" }, { @@ -4738,20 +4670,6 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-04-12T14:40:17+00:00" }, { @@ -4801,20 +4719,6 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -5156,20 +5060,6 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-04-15T15:56:18+00:00" }, { @@ -6025,12 +5915,6 @@ "functional testing", "unit testing" ], - "funding": [ - { - "url": "https://opencollective.com/codeception", - "type": "open_collective" - } - ], "time": "2020-03-23T17:07:20+00:00" }, { @@ -6879,12 +6763,6 @@ } ], "description": "A tool to automatically fix PHP code style", - "funding": [ - { - "url": "https://github.com/keradus", - "type": "github" - } - ], "time": "2020-04-15T18:51:10+00:00" }, { @@ -7257,12 +7135,12 @@ "source": { "type": "git", "url": "https://github.com/magento/magento2-functional-testing-framework.git", - "reference": "df5a57e4cb58e42c390b44d144935245e15eee48" + "reference": "e2780f019d9ac8c56776f636683116480772b90b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/df5a57e4cb58e42c390b44d144935245e15eee48", - "reference": "df5a57e4cb58e42c390b44d144935245e15eee48", + "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/e2780f019d9ac8c56776f636683116480772b90b", + "reference": "e2780f019d9ac8c56776f636683116480772b90b", "shasum": "" }, "require": { @@ -7337,7 +7215,7 @@ "magento", "testing" ], - "time": "2020-05-19T16:59:38+00:00" + "time": "2020-05-19T19:34:07+00:00" }, { "name": "mikey179/vfsstream", @@ -8345,20 +8223,6 @@ "MIT" ], "description": "PHPStan - PHP Static Analysis Tool", - "funding": [ - { - "url": "https://github.com/ondrejmirtes", - "type": "github" - }, - { - "url": "https://www.patreon.com/phpstan", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", - "type": "tidelift" - } - ], "time": "2020-05-05T12:55:44+00:00" }, { @@ -8473,12 +8337,6 @@ "filesystem", "iterator" ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-04-18T05:02:12+00:00" }, { @@ -8627,12 +8485,6 @@ "keywords": [ "timer" ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-04-20T06:00:37+00:00" }, { @@ -8682,12 +8534,6 @@ "keywords": [ "tokenizer" ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-05-06T09:56:31+00:00" }, { @@ -8776,16 +8622,6 @@ "testing", "xunit" ], - "funding": [ - { - "url": "https://phpunit.de/donate.html", - "type": "custom" - }, - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-04-30T06:32:53+00:00" }, { @@ -8926,12 +8762,6 @@ ], "description": "Collection of value objects that represent the PHP code units", "homepage": "https://github.com/sebastianbergmann/code-unit", - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-04-30T05:58:10+00:00" }, { @@ -9150,12 +8980,6 @@ "environment", "hhvm" ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-04-14T13:36:52+00:00" }, { @@ -9839,20 +9663,6 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-04-15T15:59:10+00:00" }, { @@ -9926,20 +9736,6 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-04-28T17:58:55+00:00" }, { @@ -9995,20 +9791,6 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-04-18T20:50:06+00:00" }, { @@ -10071,20 +9853,6 @@ "mime", "mime-type" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-04-17T03:29:44+00:00" }, { @@ -10139,20 +9907,6 @@ "configuration", "options" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-04-06T10:40:56+00:00" }, { @@ -10262,20 +10016,6 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -10335,20 +10075,6 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-04-28T17:58:55+00:00" }, { @@ -10624,16 +10350,6 @@ "env", "environment" ], - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv", - "type": "tidelift" - } - ], "time": "2020-05-02T13:38:00+00:00" }, { @@ -10749,6 +10465,5 @@ "ext-zip": "*", "lib-libxml": "*" }, - "platform-dev": [], - "plugin-api-version": "1.1.0" + "platform-dev": [] } From ba31c41776687e0cc5a6e721ca82262e0e50e841 Mon Sep 17 00:00:00 2001 From: Ji Lu Date: Tue, 19 May 2020 15:38:38 -0500 Subject: [PATCH 10/18] MQE-2125: bump MFTF version in Magento 2.4 and deliver all related changes. --- ...refrontInlineTranslationOnCheckoutTest.xml | 154 +++++++++++++++--- 1 file changed, 132 insertions(+), 22 deletions(-) diff --git a/app/code/Magento/Translation/Test/Mftf/Test/StorefrontInlineTranslationOnCheckoutTest.xml b/app/code/Magento/Translation/Test/Mftf/Test/StorefrontInlineTranslationOnCheckoutTest.xml index f26fc24adec76..9255923213839 100644 --- a/app/code/Magento/Translation/Test/Mftf/Test/StorefrontInlineTranslationOnCheckoutTest.xml +++ b/app/code/Magento/Translation/Test/Mftf/Test/StorefrontInlineTranslationOnCheckoutTest.xml @@ -127,52 +127,77 @@ - + + + + + + - + + + + + + - + + + + + + - + + + + + + - + + + + + + @@ -183,81 +208,121 @@ - + + + + + + - + + + + + + - + + + + + + - + + + + + + - + + + + + + - + + + + + + - + + + + + + - + + + + + + @@ -267,51 +332,76 @@ - + + + + + + - + + + + + + - + + + + + + - + + + + + + - + + + + + + @@ -325,41 +415,61 @@ - + + + + + + - + + + + + + - + + + + + + - + + + + + + From 594f1a8711362b15a3302419a11be41ee8e84e95 Mon Sep 17 00:00:00 2001 From: Ji Lu Date: Tue, 19 May 2020 15:39:52 -0500 Subject: [PATCH 11/18] MQE-2125: bump MFTF version in Magento 2.4 and deliver all related changes. --- .../AdminTranslateElementActionGroup.xml | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 app/code/Magento/Translation/Test/Mftf/ActionGroup/AdminTranslateElementActionGroup.xml diff --git a/app/code/Magento/Translation/Test/Mftf/ActionGroup/AdminTranslateElementActionGroup.xml b/app/code/Magento/Translation/Test/Mftf/ActionGroup/AdminTranslateElementActionGroup.xml deleted file mode 100644 index 6db6e10dcce0d..0000000000000 --- a/app/code/Magento/Translation/Test/Mftf/ActionGroup/AdminTranslateElementActionGroup.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - From bba6a438c71045eef0083bfa3374065b26d9485d Mon Sep 17 00:00:00 2001 From: Ji Lu Date: Tue, 19 May 2020 20:08:30 -0500 Subject: [PATCH 12/18] MQE-2123: fix errors reported by the annotation static check --- .../Test/AdminPersistentShoppingCartSettingsTest.xml | 1 + ...RedirectToAdminPanelOnLogoClickFromWizardPageTest.xml | 1 + .../Test/Mftf/Test/UpdateBundleProductViaImportTest.xml | 1 + .../AdminCheckMediaRolesForFirstAddedImageViaApiTest.xml | 1 + .../Test/AdminCheckNewCategoryLevelAddedViaApiTest.xml | 1 + .../Test/AdminCheckProductListPriceAttributesTest.xml | 1 + ...tSimpleProductWithSpecialAndTierDiscountPriceTest.xml | 1 + .../StorefrontConfigurableOptionsThumbImagesTest.xml | 1 + ...edByQueryParamsConfigurableOptionsThumbImagesTest.xml | 1 + ...yCatalogRuleForSimpleProductWithCustomOptionsTest.xml | 4 ++-- .../Mftf/Test/AdminRewriteProductWithTwoStoreTest.xml | 2 ++ ...ateFolderEscapeAndEnterHandlesForWYSIWYGBlockTest.xml | 1 + .../Test/Mftf/Test/AdminCmsPageUpdateAndDisableTest.xml | 2 ++ .../Cms/Test/Mftf/Test/AdminCmsPageUpdateTest.xml | 2 ++ ...eateDisabledCmsBlockEntityAndAssignToCategoryTest.xml | 1 + ...reateEnabledCmsBlockEntityAndAssignToCategoryTest.xml | 1 + .../Test/Mftf/Test/AdminValidateCookieLifetimeTest.xml | 1 + .../Test/AdminChangeAllCustomersGroupViaGridTest.xml | 2 ++ ...CheckDateOfBirthValidationForFranceDateFormatTest.xml | 2 ++ .../Test/AdminCustomersDeleteSystemCustomerGroupTest.xml | 3 ++- .../Test/StorefrontCustomerSubscribeToNewsletterTest.xml | 1 + .../Test/AdminReAuthorizeTokensIntegrationEntityTest.xml | 1 + .../Test/Mftf/Test/AdminUpdateIntegrationEntityTest.xml | 1 + ...nUpdateIntegrationEntityWithIncorrectPasswordTest.xml | 1 + .../Test/AdminMarketingNewsletterTemplateUpdateTest.xml | 1 + ...yRegistredLinkDisplayedForGuestSubscriptionNoTest.xml | 9 +++++++++ .../Mftf/Test/AdminReportsLowStockDisableProductTest.xml | 2 ++ .../Mftf/Test/AdminReportsOrderedGroupedBySkuTest.xml | 2 ++ ...dminMarketingPendingReviewsNavigateMenuActiveTest.xml | 1 + .../Test/AdminCheckNewCreditMemoTotalsForFranceTest.xml | 1 + .../Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml | 2 +- ...nCreateOrderWithSimpleProductCustomOptionFileTest.xml | 1 + .../StorefrontVerifySearchTermEntityRedirectTest.xml | 1 + .../StorefrontAccountPasswordFieldsNotAvailableTest.xml | 1 + .../Mftf/Test/StorefrontChangeCustomerPasswordTest.xml | 1 + ...ntChangeCustomerPasswordTestWithIncorrectDataTest.xml | 1 + .../Test/StorefrontSecureChangingCustomerEmailTest.xml | 1 + .../Mftf/Test/AdminMarketingCreateSitemapEntityTest.xml | 1 + .../AdminMarketingCreateSitemapFailFolderSaveTest.xml | 1 + .../Test/AdminMarketingCreateSitemapPathErrorTest.xml | 1 + .../Mftf/Test/AdminMarketingDeleteSitemapEntityTest.xml | 1 + .../AdminCheckTextSwatchAttributeAddedViaApiTest.xml | 1 + .../Mftf/Test/AdminSetUpWatermarkForSwatchImageTest.xml | 1 + ...torefrontConfigurableSwatchOptionsThumbImagesTest.xml | 1 + ...eryParamsConfigurableSwatchOptionsThumbImagesTest.xml | 1 + .../Test/Mftf/Test/AdminCreateUserRoleEntityTest.xml | 1 + .../Test/Mftf/Test/AdminDeleteAdminUserEntityTest.xml | 1 + .../Mftf/Test/AdminDeleteOwnAdminUserAccountTest.xml | 1 + .../Magento/User/Test/Mftf/Test/AdminUpdateUserTest.xml | 6 +++--- 49 files changed, 68 insertions(+), 7 deletions(-) diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminPersistentShoppingCartSettingsTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminPersistentShoppingCartSettingsTest.xml index cf1ed2d63034f..387e81cb71546 100644 --- a/app/code/Magento/Backend/Test/Mftf/Test/AdminPersistentShoppingCartSettingsTest.xml +++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminPersistentShoppingCartSettingsTest.xml @@ -15,6 +15,7 @@ <description value="Admin should be able to enable persistent shopping cart in Magento Admin backend and see additional options"/> <group value="backend"/> + <severity value="MAJOR"/> </annotations> <before> diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminRedirectToAdminPanelOnLogoClickFromWizardPageTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminRedirectToAdminPanelOnLogoClickFromWizardPageTest.xml index bf74674a2c9c8..b221ebeb4488a 100644 --- a/app/code/Magento/Backend/Test/Mftf/Test/AdminRedirectToAdminPanelOnLogoClickFromWizardPageTest.xml +++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminRedirectToAdminPanelOnLogoClickFromWizardPageTest.xml @@ -14,6 +14,7 @@ <stories value="Navigate to dashboard from Setup Wizard Page"/> <title value="Navigate to dashboard after click on logo on Setup Wizard Page"/> <description value="Check navigate to dashboard after click on logo on Setup Wizard Page"/> + <severity value="MAJOR"/> </annotations> <before> <actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/> diff --git a/app/code/Magento/BundleImportExport/Test/Mftf/Test/UpdateBundleProductViaImportTest.xml b/app/code/Magento/BundleImportExport/Test/Mftf/Test/UpdateBundleProductViaImportTest.xml index 23d24369cad4a..9bd9c784b39f2 100644 --- a/app/code/Magento/BundleImportExport/Test/Mftf/Test/UpdateBundleProductViaImportTest.xml +++ b/app/code/Magento/BundleImportExport/Test/Mftf/Test/UpdateBundleProductViaImportTest.xml @@ -10,6 +10,7 @@ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> <test name="UpdateBundleProductViaImportTest"> <annotations> + <stories value="Update Bundle product via import"/> <features value="Import/Export"/> <title value="Update Bundle product via import"/> <description diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckMediaRolesForFirstAddedImageViaApiTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckMediaRolesForFirstAddedImageViaApiTest.xml index b5ccd62401c9b..a6cc10ed56d1c 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckMediaRolesForFirstAddedImageViaApiTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckMediaRolesForFirstAddedImageViaApiTest.xml @@ -15,6 +15,7 @@ <description value="Login as admin, create simple product, add image to created product (via API).Go to Admin Product Edit page for created product to check that added image has selected image roles."/> <group value="catalog"/> + <severity value="MAJOR"/> </annotations> <before> <actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/> diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckNewCategoryLevelAddedViaApiTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckNewCategoryLevelAddedViaApiTest.xml index e707c15bccdf1..e252d53b0dd2c 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckNewCategoryLevelAddedViaApiTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckNewCategoryLevelAddedViaApiTest.xml @@ -16,6 +16,7 @@ Check category level for child category entity based on parent level. Check category tree: parent element has child element. "/> <group value="catalog"/> + <severity value="MAJOR"/> </annotations> <before> <actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/> diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckProductListPriceAttributesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckProductListPriceAttributesTest.xml index 27b8b06510ee1..b23ce827d5d69 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckProductListPriceAttributesTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckProductListPriceAttributesTest.xml @@ -15,6 +15,7 @@ <description value="Login as admin, create simple product, add cost, special price. Go to Admin Product List page filter grid by created product, add mentioned columns to grid, check values."/> <group value="catalog"/> + <severity value="MAJOR"/> </annotations> <before> <actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/> diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontSimpleProductWithSpecialAndTierDiscountPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontSimpleProductWithSpecialAndTierDiscountPriceTest.xml index c38ea2de558e1..90d432b70f794 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontSimpleProductWithSpecialAndTierDiscountPriceTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontSimpleProductWithSpecialAndTierDiscountPriceTest.xml @@ -10,6 +10,7 @@ <test name="StoreFrontSimpleProductWithSpecialAndTierDiscountPriceTest"> <annotations> <features value="Catalog"/> + <stories value="Apply discount tier price and custom price values for simple product"/> <title value="Apply discount tier price and custom price values for simple product"/> <description value="Apply discount tier price and custom price values for simple product"/> <severity value="MAJOR"/> diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontConfigurableOptionsThumbImagesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontConfigurableOptionsThumbImagesTest.xml index dec36d72a50d6..5d584bed989b3 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontConfigurableOptionsThumbImagesTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontConfigurableOptionsThumbImagesTest.xml @@ -16,6 +16,7 @@ associated simple products. Add few images for products, check the fotorama thumbnail images (visible and active) for each selected option for the configurable product"/> <group value="catalog"/> + <severity value="MAJOR"/> </annotations> <before> <!-- Login as Admin --> diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSelectedByQueryParamsConfigurableOptionsThumbImagesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSelectedByQueryParamsConfigurableOptionsThumbImagesTest.xml index 941ae6fb84c56..9821121d8c171 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSelectedByQueryParamsConfigurableOptionsThumbImagesTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSelectedByQueryParamsConfigurableOptionsThumbImagesTest.xml @@ -18,6 +18,7 @@ associated simple products. Add few images for products, check the fotorama thumbnail images (visible and active) for each option for the configurable product using product URL with params to selected needed option."/> + <severity value="MAJOR"/> <group value="catalog"/> </annotations> diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml index 28564d12ceb31..59976fbac1724 100644 --- a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml +++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml @@ -11,8 +11,8 @@ <annotations> <features value="CatalogRule"/> <stories value="Apply catalog price rule"/> - <title value="Admin should be able to apply the catalog price rule for simple product with custom options"/> - <description value="Admin should be able to apply the catalog price rule for simple product with custom options"/> + <title value="Admin should be able to apply the catalog price rule for simple product with 3 custom options"/> + <description value="Admin should be able to apply the catalog price rule for simple product with 3 custom options"/> <severity value="CRITICAL"/> <testCaseId value="MC-14769"/> <group value="CatalogRule"/> diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminRewriteProductWithTwoStoreTest.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminRewriteProductWithTwoStoreTest.xml index e8a1ee850cd74..9e4689bd8aa4f 100644 --- a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminRewriteProductWithTwoStoreTest.xml +++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminRewriteProductWithTwoStoreTest.xml @@ -8,8 +8,10 @@ <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> <test name="AdminRewriteProductWithTwoStoreTest"> <annotations> + <stories value="Rewriting URL of product"/> <title value="Rewriting URL of product"/> <description value="Rewriting URL of product. Verify the full URL address"/> + <severity value="MAJOR"/> <group value="CatalogUrlRewrite"/> </annotations> diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCheckCreateFolderEscapeAndEnterHandlesForWYSIWYGBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCheckCreateFolderEscapeAndEnterHandlesForWYSIWYGBlockTest.xml index aa29f33f90664..c1d5f39d2a005 100644 --- a/app/code/Magento/Cms/Test/Mftf/Test/AdminCheckCreateFolderEscapeAndEnterHandlesForWYSIWYGBlockTest.xml +++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCheckCreateFolderEscapeAndEnterHandlesForWYSIWYGBlockTest.xml @@ -16,6 +16,7 @@ to add image to new folder (using enter key) for WYSIWYG content of Block"/> <description value="Admin should be able to cancel and close 'create folder' modal window using ESC key and to add image to new folder (using enter key) for WYSIWYG content of Block"/> + <severity value="MAJOR"/> </annotations> <before> diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageUpdateAndDisableTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageUpdateAndDisableTest.xml index 24d61311e8951..5fa373020bbd9 100644 --- a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageUpdateAndDisableTest.xml +++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageUpdateAndDisableTest.xml @@ -11,9 +11,11 @@ <test name="AdminCmsPageUpdateAndDisableTest"> <annotations> <features value="Cms"/> + <stories value="Update CMS Page via the Admin, disable"/> <testCaseId value="MC-14673" /> <title value="Update CMS Page via the Admin, disable"/> <description value="Admin should be able to update a CMS Page"/> + <severity value="CRITICAL"/> <group value="backend"/> <group value="cMSContent"/> <group value="mtf_migrated"/> diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageUpdateTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageUpdateTest.xml index 6e05828726e7d..cf7642b357604 100644 --- a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageUpdateTest.xml +++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageUpdateTest.xml @@ -11,9 +11,11 @@ <test name="AdminCmsPageUpdateTest"> <annotations> <features value="Cms"/> + <stories value="Update CMS Page via the Admin"/> <title value="Update CMS Page via the Admin"/> <description value="Admin should be able to update a CMS Page"/> <testCaseId value="MC-14674"/> + <severity value="CRITICAL"/> <group value="backend"/> <group value="cMSContent"/> <group value="mtf_migrated"/> diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateDisabledCmsBlockEntityAndAssignToCategoryTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateDisabledCmsBlockEntityAndAssignToCategoryTest.xml index 2008278c53eeb..4ac851b8b2a1e 100644 --- a/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateDisabledCmsBlockEntityAndAssignToCategoryTest.xml +++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateDisabledCmsBlockEntityAndAssignToCategoryTest.xml @@ -14,6 +14,7 @@ <testCaseId value="MC-14657" /> <stories value="Create a CMS block via the Admin, disable, add to category, verify on frontend"/> <title value="Create disabled CMS block entity and assign to category"/> + <description value="Create disabled CMS block entity and assign to category"/> <severity value="MAJOR"/> <group value="cMSContent"/> <group value="mtf_migrated"/> diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateEnabledCmsBlockEntityAndAssignToCategoryTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateEnabledCmsBlockEntityAndAssignToCategoryTest.xml index a69b6156af849..6f9861cd18dcf 100644 --- a/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateEnabledCmsBlockEntityAndAssignToCategoryTest.xml +++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateEnabledCmsBlockEntityAndAssignToCategoryTest.xml @@ -13,6 +13,7 @@ <features value="Cms"/> <stories value="Create a CMS block via the Admin, add to category, verify on frontend"/> <title value="Create CMS block entity and assign to category"/> + <description value="Create CMS block entity and assign to category"/> <testCaseId value="MC-14658"/> <severity value="MAJOR"/> <group value="cMSContent"/> diff --git a/app/code/Magento/Cookie/Test/Mftf/Test/AdminValidateCookieLifetimeTest.xml b/app/code/Magento/Cookie/Test/Mftf/Test/AdminValidateCookieLifetimeTest.xml index b004eeb17e03f..b3925c6e94f39 100644 --- a/app/code/Magento/Cookie/Test/Mftf/Test/AdminValidateCookieLifetimeTest.xml +++ b/app/code/Magento/Cookie/Test/Mftf/Test/AdminValidateCookieLifetimeTest.xml @@ -14,6 +14,7 @@ <stories value="Validate cookie lifetime field in Magento admin"/> <title value="Admin should not able to enter text in cookie lifetime filed"/> <description value="Admin can only be able type numbers in cookie lifetime filed in Magento admin"/> + <severity value="MAJOR"/> <group value="Cookie"/> </annotations> <before> diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminChangeAllCustomersGroupViaGridTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminChangeAllCustomersGroupViaGridTest.xml index 59c50f905878b..dada747dd16c4 100644 --- a/app/code/Magento/Customer/Test/Mftf/Test/AdminChangeAllCustomersGroupViaGridTest.xml +++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminChangeAllCustomersGroupViaGridTest.xml @@ -10,9 +10,11 @@ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> <test name="AdminChangeAllCustomersGroupViaGridTest" extends="AdminChangeSingleCustomerGroupViaGridTest"> <annotations> + <stories value="Change all customers' group via grid"/> <title value="Change all customers' group via grid"/> <description value="Select All customers to change their group"/> <testCaseId value="MC-26040"/> + <severity value="MAJOR"/> </annotations> <remove keyForRemoval="filterCustomer"/> diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCheckDateOfBirthValidationForFranceDateFormatTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCheckDateOfBirthValidationForFranceDateFormatTest.xml index 78a1d122d59d4..6c1d24f8969ec 100644 --- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCheckDateOfBirthValidationForFranceDateFormatTest.xml +++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCheckDateOfBirthValidationForFranceDateFormatTest.xml @@ -12,6 +12,8 @@ <features value="Customer"/> <stories value="Checks 'Date of Birth' field validation for the France date format value"/> <title value="Checks 'Date of Birth' field validation for the France date format value"/> + <description value="Checks 'Date of Birth' field validation for the France date format value"/> + <severity value="MAJOR"/> <group value="customer"/> <group value="ui"/> </annotations> diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersDeleteSystemCustomerGroupTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersDeleteSystemCustomerGroupTest.xml index 124f086044f76..eb10a9bf469c7 100644 --- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersDeleteSystemCustomerGroupTest.xml +++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersDeleteSystemCustomerGroupTest.xml @@ -14,6 +14,7 @@ <description value="Admin should not be able to delete system customer groups"/> <stories value="Delete System Customer Group" /> <testCaseId value="MC-14588" /> + <severity value="MAJOR"/> <group value="customers"/> <group value="mtf_migrated"/> </annotations> @@ -46,4 +47,4 @@ </actionGroup> <actionGroup ref="AssertDeleteCustomerGroupButtonMissingActionGroup" stepKey="verifyThereIsNoDeleteButtonForGeneralGroup"/> </test> -</tests> \ No newline at end of file +</tests> diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCustomerSubscribeToNewsletterTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCustomerSubscribeToNewsletterTest.xml index 4658b162dcc55..62bab5669307b 100644 --- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCustomerSubscribeToNewsletterTest.xml +++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCustomerSubscribeToNewsletterTest.xml @@ -14,6 +14,7 @@ <stories value="Subscribe To Newsletter Subscription on StoreFront"/> <title value="StoreFront Customer Newsletter Subscription"/> <description value="Customer can be subscribed to Newsletter Subscription on StoreFront"/> + <severity value="MAJOR"/> </annotations> <before> <createData entity="Simple_US_Customer" stepKey="createCustomer"/> diff --git a/app/code/Magento/Integration/Test/Mftf/Test/AdminReAuthorizeTokensIntegrationEntityTest.xml b/app/code/Magento/Integration/Test/Mftf/Test/AdminReAuthorizeTokensIntegrationEntityTest.xml index 480cc4b8861d3..ab5e4e3370738 100644 --- a/app/code/Magento/Integration/Test/Mftf/Test/AdminReAuthorizeTokensIntegrationEntityTest.xml +++ b/app/code/Magento/Integration/Test/Mftf/Test/AdminReAuthorizeTokensIntegrationEntityTest.xml @@ -14,6 +14,7 @@ <stories value="System Integration"/> <title value="Reauthorise Integration's Tokens"/> <description value="ReAuthorising Tokens For Created Integration"/> + <severity value="MAJOR"/> <group value="integration"/> <group value="mtf_migrated"/> <testCaseId value="MC-14397"/> diff --git a/app/code/Magento/Integration/Test/Mftf/Test/AdminUpdateIntegrationEntityTest.xml b/app/code/Magento/Integration/Test/Mftf/Test/AdminUpdateIntegrationEntityTest.xml index 50aa83bc79eed..af90fb15a7aaf 100644 --- a/app/code/Magento/Integration/Test/Mftf/Test/AdminUpdateIntegrationEntityTest.xml +++ b/app/code/Magento/Integration/Test/Mftf/Test/AdminUpdateIntegrationEntityTest.xml @@ -14,6 +14,7 @@ <stories value="System Integration"/> <title value="Updating System Integration Entity"/> <description value="Admin Updates Created Integration"/> + <severity value="MAJOR"/> <group value="integration"/> <testCaseId value="MC-14398"/> <group value="mtf_migrated"/> diff --git a/app/code/Magento/Integration/Test/Mftf/Test/AdminUpdateIntegrationEntityWithIncorrectPasswordTest.xml b/app/code/Magento/Integration/Test/Mftf/Test/AdminUpdateIntegrationEntityWithIncorrectPasswordTest.xml index 4be4301146a04..c88571ca5ada6 100644 --- a/app/code/Magento/Integration/Test/Mftf/Test/AdminUpdateIntegrationEntityWithIncorrectPasswordTest.xml +++ b/app/code/Magento/Integration/Test/Mftf/Test/AdminUpdateIntegrationEntityWithIncorrectPasswordTest.xml @@ -14,6 +14,7 @@ <stories value="System Integration"/> <title value="Updating System Integration Entity with Incorrect Password"/> <description value="Admin Updates Created Integration with Incorrect Password"/> + <severity value="MAJOR"/> <group value="integration"/> <testCaseId value="MC-14399"/> <group value="mtf_migrated"/> diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterTemplateUpdateTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterTemplateUpdateTest.xml index 82b6e1833a753..1a0c90ff13c36 100644 --- a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterTemplateUpdateTest.xml +++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterTemplateUpdateTest.xml @@ -14,6 +14,7 @@ <stories value="Newsletter Updating"/> <title value="Newsletter Updating Test"/> <description value="Admin should be able update created Newsletter Template"/> + <severity value="MAJOR"/> <group value="reports"/> <group value="mtf_migrated"/> <group value="WYSIWYGDisabled"/> diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest.xml index 3288de47dd4b9..cffce8da1d710 100644 --- a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest.xml +++ b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest.xml @@ -9,6 +9,15 @@ <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> <test name="VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest"> + <annotations> + <features value="Newsletter"/> + <stories value="Configure guest newsletter subscription to 'No'"/> + <group value="Newsletter"/> + <title value="Configure guest newsletter subscription to 'No'"/> + <description value="Configure guest newsletter subscription to 'No'"/> + <severity value="MAJOR"/> + </annotations> + <before> <magentoCLI command="config:set newsletter/subscription/allow_guest_subscribe 0" stepKey="setConfigGuestSubscriptionDisable"/> diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsLowStockDisableProductTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsLowStockDisableProductTest.xml index c74e4651346d0..dd3083bdbc44a 100644 --- a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsLowStockDisableProductTest.xml +++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsLowStockDisableProductTest.xml @@ -10,9 +10,11 @@ <test name="AdminReportsLowStockDisableProductTest"> <annotations> <features value="Reports"/> + <stories value="Disabled product doesn't present on 'Low Stock' report"/> <group value="reports"/> <title value="The disabled product doesn't present on 'Low Stock' report."/> <description value="A product must don't presents on 'Low Stock' report if the product is disabled."/> + <severity value="MAJOR"/> </annotations> <before> <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedGroupedBySkuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedGroupedBySkuTest.xml index fc03bbe622987..a96e74c8ad166 100644 --- a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedGroupedBySkuTest.xml +++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedGroupedBySkuTest.xml @@ -9,8 +9,10 @@ <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> <test name="AdminReportsOrderedGroupedBySkuTest"> <annotations> + <stories value="Grouped by SKU on report"/> <title value="Verify grouped by SKU on report"/> <description value="Verify the list of configurable product grouped by SKU, on report page 'Reports > Products > Ordered'"/> + <severity value="MAJOR"/> <group value="reports"/> </annotations> <before> diff --git a/app/code/Magento/Review/Test/Mftf/Test/AdminMarketingPendingReviewsNavigateMenuActiveTest.xml b/app/code/Magento/Review/Test/Mftf/Test/AdminMarketingPendingReviewsNavigateMenuActiveTest.xml index 5ff1ed0a1062b..57e7d44dab10d 100644 --- a/app/code/Magento/Review/Test/Mftf/Test/AdminMarketingPendingReviewsNavigateMenuActiveTest.xml +++ b/app/code/Magento/Review/Test/Mftf/Test/AdminMarketingPendingReviewsNavigateMenuActiveTest.xml @@ -13,6 +13,7 @@ <stories value="Menu Navigation"/> <title value="Admin marketing pending reviews navigate menu"/> <description value="Admin able see navigate head menu Marketing is active, when open page Marketing > Pending Reviews"/> + <severity value="MAJOR"/> <group value="menu"/> </annotations> <before> diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCheckNewCreditMemoTotalsForFranceTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCheckNewCreditMemoTotalsForFranceTest.xml index ce6848c3e9d66..03691cdd537d5 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCheckNewCreditMemoTotalsForFranceTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCheckNewCreditMemoTotalsForFranceTest.xml @@ -13,6 +13,7 @@ <stories value="Credit memo entity for France locale"/> <title value="Credit memo entity for France locale"/> <description value="Create Credit Memo with cash on delivery payment and assert 0 shipping refund for France locale"/> + <severity value="MAJOR"/> <group value="sales"/> </annotations> <before> diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml index 564cde1151660..d9ae276de31a0 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml @@ -11,7 +11,7 @@ <test name="AdminCreateCreditMemoPartialRefundTest"> <annotations> <stories value="Credit memo entity"/> - <title value="Create Credit Memo for Offline Payment Methods"/> + <title value="Create Credit Memo for Offline Payment Methods (partial refund)"/> <description value="Assert items return to stock (partial refund)"/> <severity value="BLOCKER"/> <testCaseId value="MC-15861"/> diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithSimpleProductCustomOptionFileTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithSimpleProductCustomOptionFileTest.xml index 82e9606175764..82b9e8c207814 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithSimpleProductCustomOptionFileTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithSimpleProductCustomOptionFileTest.xml @@ -9,6 +9,7 @@ <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> <test name="AdminCreateOrderWithSimpleProductCustomOptionFileTest"> <annotations> + <stories value="Create Order with simple product with custom option"/> <title value="Create Order with simple product with custom option."/> <description value="Verify, admin able to change file for custom option during order creation."/> <features value="Sales"/> diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchTermEntityRedirectTest.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchTermEntityRedirectTest.xml index 6ff4b7de5559d..c5cbf1e0709c6 100644 --- a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchTermEntityRedirectTest.xml +++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchTermEntityRedirectTest.xml @@ -13,6 +13,7 @@ <stories value="Search Term Redirect"/> <title value="Create Search Term Entity With Redirect. Check How Redirect is Working on Storefront"/> <description value="Storefront search by created search term with redirect. Verifying if created redirect is working"/> + <severity value="CRITICAL"/> </annotations> <before> diff --git a/app/code/Magento/Security/Test/Mftf/Test/StorefrontAccountPasswordFieldsNotAvailableTest.xml b/app/code/Magento/Security/Test/Mftf/Test/StorefrontAccountPasswordFieldsNotAvailableTest.xml index fd7ef0261cd26..7f6e57322fa30 100644 --- a/app/code/Magento/Security/Test/Mftf/Test/StorefrontAccountPasswordFieldsNotAvailableTest.xml +++ b/app/code/Magento/Security/Test/Mftf/Test/StorefrontAccountPasswordFieldsNotAvailableTest.xml @@ -15,6 +15,7 @@ <title value="Password Fields not Available"/> <description value="User Cannot Change Password Until Checkbox Change Password Unchecked"/> <testCaseId value="MC-14369"/> + <severity value="CRITICAL"/> <group value="security"/> <group value="mtf_migrated"/> </annotations> diff --git a/app/code/Magento/Security/Test/Mftf/Test/StorefrontChangeCustomerPasswordTest.xml b/app/code/Magento/Security/Test/Mftf/Test/StorefrontChangeCustomerPasswordTest.xml index 242bad033ed47..45047e86860b1 100644 --- a/app/code/Magento/Security/Test/Mftf/Test/StorefrontChangeCustomerPasswordTest.xml +++ b/app/code/Magento/Security/Test/Mftf/Test/StorefrontChangeCustomerPasswordTest.xml @@ -15,6 +15,7 @@ <title value="Changing Customer Password Test"/> <description value="Changing Customer's password using correct value"/> <testCaseId value="MC-14370"/> + <severity value="CRITICAL"/> <group value="security"/> <group value="mtf_migrated"/> </annotations> diff --git a/app/code/Magento/Security/Test/Mftf/Test/StorefrontChangeCustomerPasswordTestWithIncorrectDataTest.xml b/app/code/Magento/Security/Test/Mftf/Test/StorefrontChangeCustomerPasswordTestWithIncorrectDataTest.xml index f08db36e7e20c..12757ffea8636 100644 --- a/app/code/Magento/Security/Test/Mftf/Test/StorefrontChangeCustomerPasswordTestWithIncorrectDataTest.xml +++ b/app/code/Magento/Security/Test/Mftf/Test/StorefrontChangeCustomerPasswordTestWithIncorrectDataTest.xml @@ -15,6 +15,7 @@ <title value="Changing Customer Password Test with Incorrect Data"/> <description value="Changing Customer's password using Incorrect Current Password"/> <testCaseId value="MC-14371"/> + <severity value="CRITICAL"/> <group value="security"/> <group value="mtf_migrated"/> </annotations> diff --git a/app/code/Magento/Security/Test/Mftf/Test/StorefrontSecureChangingCustomerEmailTest.xml b/app/code/Magento/Security/Test/Mftf/Test/StorefrontSecureChangingCustomerEmailTest.xml index 020e1965ddf71..6a89d90a2d8ca 100644 --- a/app/code/Magento/Security/Test/Mftf/Test/StorefrontSecureChangingCustomerEmailTest.xml +++ b/app/code/Magento/Security/Test/Mftf/Test/StorefrontSecureChangingCustomerEmailTest.xml @@ -15,6 +15,7 @@ <title value="Changing Customer Email Test"/> <description value="Changing Customer's email with correct and wrong passwords"/> <testCaseId value="MC-14385"/> + <severity value="CRITICAL"/> <group value="security"/> <group value="mtf_migrated"/> </annotations> diff --git a/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingCreateSitemapEntityTest.xml b/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingCreateSitemapEntityTest.xml index 94f0e0a0487d6..02931bea79b41 100644 --- a/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingCreateSitemapEntityTest.xml +++ b/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingCreateSitemapEntityTest.xml @@ -15,6 +15,7 @@ <title value="Sitemap Creation"/> <description value="Sitemap Entity Creation"/> <testCaseId value="MC-14312"/> + <severity value="MAJOR"/> <group value="sitemap"/> <group value="mtf_migrated"/> </annotations> diff --git a/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingCreateSitemapFailFolderSaveTest.xml b/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingCreateSitemapFailFolderSaveTest.xml index ae51db561e27c..4baa3c2e7d54b 100644 --- a/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingCreateSitemapFailFolderSaveTest.xml +++ b/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingCreateSitemapFailFolderSaveTest.xml @@ -15,6 +15,7 @@ <title value="Sitemap Creation Fail Folder Save"/> <description value="Sitemap Entity Creation Fail Folder Save"/> <testCaseId value="MC-14314"/> + <severity value="MAJOR"/> <group value="sitemap"/> <group value="mtf_migrated"/> </annotations> diff --git a/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingCreateSitemapPathErrorTest.xml b/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingCreateSitemapPathErrorTest.xml index 2300e05adce1d..c61e08e25593f 100644 --- a/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingCreateSitemapPathErrorTest.xml +++ b/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingCreateSitemapPathErrorTest.xml @@ -15,6 +15,7 @@ <title value="Sitemap Creation With Path Error"/> <description value="Sitemap Entity Creation With Path Error"/> <testCaseId value="MC-14313"/> + <severity value="MAJOR"/> <group value="sitemap"/> <group value="mtf_migrated"/> </annotations> diff --git a/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingDeleteSitemapEntityTest.xml b/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingDeleteSitemapEntityTest.xml index 44698b7a6bb56..e2b995b3140d7 100644 --- a/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingDeleteSitemapEntityTest.xml +++ b/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingDeleteSitemapEntityTest.xml @@ -15,6 +15,7 @@ <title value="Sitemap Deleting Test"/> <description value="Admin Should Delete Sitemap Entity"/> <testCaseId value="MC-14315"/> + <severity value="MAJOR"/> <group value="sitemap"/> <group value="mtf_migrated"/> </annotations> diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCheckTextSwatchAttributeAddedViaApiTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCheckTextSwatchAttributeAddedViaApiTest.xml index 0fcf0c0a35033..91975e449ff9a 100644 --- a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCheckTextSwatchAttributeAddedViaApiTest.xml +++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCheckTextSwatchAttributeAddedViaApiTest.xml @@ -14,6 +14,7 @@ <title value="Add Swatch Text Product Attribute via API"/> <description value="Login as admin, create swatch text product attribute.Go to New Product page, check the created attribute is available on the page."/> + <severity value="MAJOR"/> <group value="swatches"/> </annotations> <before> diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminSetUpWatermarkForSwatchImageTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminSetUpWatermarkForSwatchImageTest.xml index 3e133dacc66c1..d56572afd8847 100644 --- a/app/code/Magento/Swatches/Test/Mftf/Test/AdminSetUpWatermarkForSwatchImageTest.xml +++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminSetUpWatermarkForSwatchImageTest.xml @@ -17,6 +17,7 @@ <severity value="MAJOR"/> <testCaseId value="MC-17607"/> <useCaseId value="MC-15523"/> + <severity value="MAJOR"/> <group value="swatches"/> </annotations> <before> diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontConfigurableSwatchOptionsThumbImagesTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontConfigurableSwatchOptionsThumbImagesTest.xml index 8c90d88f51a10..02d08f52d9017 100644 --- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontConfigurableSwatchOptionsThumbImagesTest.xml +++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontConfigurableSwatchOptionsThumbImagesTest.xml @@ -17,6 +17,7 @@ <description value="Login as admin, create attribute with two options, configurable product with two associated simple products. Add few images for products, check the fotorama thumbnail images (visible and active) for each selected option for the configurable product"/> + <severity value="MAJOR"/> <group value="swatches"/> </annotations> <before> diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSelectedByQueryParamsConfigurableSwatchOptionsThumbImagesTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSelectedByQueryParamsConfigurableSwatchOptionsThumbImagesTest.xml index 8e4c6c0217b3a..0add6159d5e40 100644 --- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSelectedByQueryParamsConfigurableSwatchOptionsThumbImagesTest.xml +++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSelectedByQueryParamsConfigurableSwatchOptionsThumbImagesTest.xml @@ -19,6 +19,7 @@ associated simple products. Add few images for products, check the fotorama thumbnail images (visible and active) for each option for the configurable product using product URL with params to selected needed option."/> + <severity value="MAJOR"/> <group value="swatches"/> </annotations> <before> diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminCreateUserRoleEntityTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminCreateUserRoleEntityTest.xml index d373bc6676deb..30778f04c6a18 100644 --- a/app/code/Magento/User/Test/Mftf/Test/AdminCreateUserRoleEntityTest.xml +++ b/app/code/Magento/User/Test/Mftf/Test/AdminCreateUserRoleEntityTest.xml @@ -17,6 +17,7 @@ <testCaseId value="MC-14258"/> <group value="user"/> <group value="mtf_migrated"/> + <severity value="MAJOR"/> </annotations> <before> diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminDeleteAdminUserEntityTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminDeleteAdminUserEntityTest.xml index 60f6089e56a41..65d14cfbf71c7 100644 --- a/app/code/Magento/User/Test/Mftf/Test/AdminDeleteAdminUserEntityTest.xml +++ b/app/code/Magento/User/Test/Mftf/Test/AdminDeleteAdminUserEntityTest.xml @@ -17,6 +17,7 @@ <testCaseId value="MC-14270"/> <group value="user"/> <group value="mtf_migrated"/> + <severity value="MAJOR"/> </annotations> <before> diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminDeleteOwnAdminUserAccountTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminDeleteOwnAdminUserAccountTest.xml index 1019d58edcaf2..a0e6f7d43c516 100644 --- a/app/code/Magento/User/Test/Mftf/Test/AdminDeleteOwnAdminUserAccountTest.xml +++ b/app/code/Magento/User/Test/Mftf/Test/AdminDeleteOwnAdminUserAccountTest.xml @@ -15,6 +15,7 @@ <title value="Admin user is not able to delete the own account"/> <description value="Admin user is not able to delete the own account"/> <testCaseId value="MC-14271"/> + <severity value="MAJOR"/> <group value="user"/> <group value="mtf_migrated"/> </annotations> diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminUpdateUserTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminUpdateUserTest.xml index 10f81c9254b40..501e9520c6367 100644 --- a/app/code/Magento/User/Test/Mftf/Test/AdminUpdateUserTest.xml +++ b/app/code/Magento/User/Test/Mftf/Test/AdminUpdateUserTest.xml @@ -12,9 +12,9 @@ <annotations> <features value="User"/> <title value="Update admin user entity by changing user role"/> - <stories value="Update User" /> - <testCaseId value="MC-14264" /> - <severity value="MAJOR" /> + <stories value="Update User"/> + <testCaseId value="MC-14264"/> + <severity value="MAJOR"/> <description value="Change full access role for admin user to custom one with restricted permission (Sales)"/> <group value="user"/> <group value="mtf_migrated"/> From 076ce95903ed0a8e6a955d7baacc4853fb7501f7 Mon Sep 17 00:00:00 2001 From: Ji Lu <jilu1@adobe.com> Date: Tue, 19 May 2020 20:25:24 -0500 Subject: [PATCH 13/18] MQE-2125: bump MFTF version in Magento 2.4 and deliver all related changes. --- dev/tests/acceptance/staticRuleset.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev/tests/acceptance/staticRuleset.json b/dev/tests/acceptance/staticRuleset.json index 64f8d57d6c38c..74fe3469e353b 100644 --- a/dev/tests/acceptance/staticRuleset.json +++ b/dev/tests/acceptance/staticRuleset.json @@ -1,6 +1,7 @@ { "tests": [ "actionGroupArguments", - "deprecatedEntityUsage" + "deprecatedEntityUsage", + "annotations" ] } From dfd2962e4f1549cfdd331ca3513480d2b634063a Mon Sep 17 00:00:00 2001 From: Soumya Unnikrishnan <sunnikri@adobe.com> Date: Wed, 20 May 2020 12:44:32 -0500 Subject: [PATCH 14/18] MQE-2125: [3.0.0-RC3] Delivery to Magento 2.4 fixed flaky test --- .../Test/Mftf/Test/AdminExportBundleProductTest.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml index 97eac1ff723a0..677752be02eb5 100644 --- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml +++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml @@ -105,6 +105,8 @@ <!-- Export created below products --> <actionGroup ref="ExportAllProductsActionGroup" stepKey="exportCreatedProducts"/> + <magentoCron stepKey="runCronIndex" groups="index"/> + <waitForElementVisible selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="waitForFileName"/> <grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/> <!-- Download product --> From 326d7ed134cc25231c90800a44b989b407e3c56d Mon Sep 17 00:00:00 2001 From: Ji Lu <jilu1@adobe.com> Date: Thu, 21 May 2020 10:23:20 -0500 Subject: [PATCH 15/18] MQE-2113: fix errors reported by the annotation static check --- dev/tests/acceptance/staticRuleset.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev/tests/acceptance/staticRuleset.json b/dev/tests/acceptance/staticRuleset.json index 74fe3469e353b..64f8d57d6c38c 100644 --- a/dev/tests/acceptance/staticRuleset.json +++ b/dev/tests/acceptance/staticRuleset.json @@ -1,7 +1,6 @@ { "tests": [ "actionGroupArguments", - "deprecatedEntityUsage", - "annotations" + "deprecatedEntityUsage" ] } From e3cce8c9f088793acd2f4b9ae5de557ab2a110cc Mon Sep 17 00:00:00 2001 From: Ji Lu <jilu1@adobe.com> Date: Fri, 22 May 2020 13:13:09 -0500 Subject: [PATCH 16/18] MQE-2125: bump MFTF version in Magento 2.4 and deliver all related changes --- composer.lock | 409 +++++++++++++++++++++--- dev/tests/acceptance/staticRuleset.json | 3 +- 2 files changed, 371 insertions(+), 41 deletions(-) diff --git a/composer.lock b/composer.lock index 8ef43489c457f..194c6bbd4b36f 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": "4ba980e894e62018b967d7b5829ef429", + "content-hash": "eb2f59ddc79a0b49028fff632f170093", "packages": [ { "name": "colinmollenhour/cache-backend-file", @@ -4676,16 +4676,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.15.0", + "version": "v1.17.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14" + "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/4719fa9c18b0464d399f1a63bf624b42b6fa8d14", - "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9", + "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9", "shasum": "" }, "require": { @@ -4697,7 +4697,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.15-dev" + "dev-master": "1.17-dev" } }, "autoload": { @@ -4730,20 +4730,20 @@ "polyfill", "portable" ], - "time": "2020-02-27T09:26:54+00:00" + "time": "2020-05-12T16:14:59+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.15.0", + "version": "v1.17.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf" + "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf", - "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3bff59ea7047e925be6b7f2059d60af31bb46d6a", + "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a", "shasum": "" }, "require": { @@ -4757,7 +4757,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.15-dev" + "dev-master": "1.17-dev" } }, "autoload": { @@ -4792,20 +4792,20 @@ "portable", "shim" ], - "time": "2020-03-09T19:04:49+00:00" + "time": "2020-05-12T16:47:27+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.15.0", + "version": "v1.17.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac" + "reference": "fa79b11539418b02fc5e1897267673ba2c19419c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac", - "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c", + "reference": "fa79b11539418b02fc5e1897267673ba2c19419c", "shasum": "" }, "require": { @@ -4817,7 +4817,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.15-dev" + "dev-master": "1.17-dev" } }, "autoload": { @@ -4851,20 +4851,20 @@ "portable", "shim" ], - "time": "2020-03-09T19:04:49+00:00" + "time": "2020-05-12T16:47:27+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.15.0", + "version": "v1.17.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "37b0976c78b94856543260ce09b460a7bc852747" + "reference": "f048e612a3905f34931127360bdd2def19a5e582" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/37b0976c78b94856543260ce09b460a7bc852747", - "reference": "37b0976c78b94856543260ce09b460a7bc852747", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/f048e612a3905f34931127360bdd2def19a5e582", + "reference": "f048e612a3905f34931127360bdd2def19a5e582", "shasum": "" }, "require": { @@ -4873,7 +4873,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.15-dev" + "dev-master": "1.17-dev" } }, "autoload": { @@ -4906,7 +4906,7 @@ "portable", "shim" ], - "time": "2020-02-27T09:26:54+00:00" + "time": "2020-05-12T16:47:27+00:00" }, { "name": "symfony/polyfill-php73", @@ -5489,16 +5489,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.137.5", + "version": "3.138.6", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "b3309075ec2a2c695c33d8e21c07b3d5c10cdb9a" + "reference": "e4672392e63e91085cde5f1fbcbf5883a69b26a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/b3309075ec2a2c695c33d8e21c07b3d5c10cdb9a", - "reference": "b3309075ec2a2c695c33d8e21c07b3d5c10cdb9a", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/e4672392e63e91085cde5f1fbcbf5883a69b26a0", + "reference": "e4672392e63e91085cde5f1fbcbf5883a69b26a0", "shasum": "" }, "require": { @@ -5569,7 +5569,69 @@ "s3", "sdk" ], - "time": "2020-05-07T18:16:43+00:00" + "time": "2020-05-21T18:14:47+00:00" + }, + { + "name": "beberlei/assert", + "version": "v3.2.7", + "source": { + "type": "git", + "url": "https://github.com/beberlei/assert.git", + "reference": "d63a6943fc4fd1a2aedb65994e3548715105abcf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/beberlei/assert/zipball/d63a6943fc4fd1a2aedb65994e3548715105abcf", + "reference": "d63a6943fc4fd1a2aedb65994e3548715105abcf", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-json": "*", + "ext-mbstring": "*", + "ext-simplexml": "*", + "php": "^7" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "*", + "phpstan/phpstan-shim": "*", + "phpunit/phpunit": ">=6.0.0 <8" + }, + "suggest": { + "ext-intl": "Needed to allow Assertion::count(), Assertion::isCountable(), Assertion::minCount(), and Assertion::maxCount() to operate on ResourceBundles" + }, + "type": "library", + "autoload": { + "psr-4": { + "Assert\\": "lib/Assert" + }, + "files": [ + "lib/Assert/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de", + "role": "Lead Developer" + }, + { + "name": "Richard Quadling", + "email": "rquadling@gmail.com", + "role": "Collaborator" + } + ], + "description": "Thin assertion library for input validation in business models.", + "keywords": [ + "assert", + "assertion", + "validation" + ], + "time": "2019-12-19T17:51:41+00:00" }, { "name": "behat/gherkin", @@ -6832,16 +6894,16 @@ }, { "name": "league/flysystem", - "version": "1.0.67", + "version": "1.0.69", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e" + "reference": "7106f78428a344bc4f643c233a94e48795f10967" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/5b1f36c75c4bdde981294c2a0ebdb437ee6f275e", - "reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/7106f78428a344bc4f643c233a94e48795f10967", + "reference": "7106f78428a344bc4f643c233a94e48795f10967", "shasum": "" }, "require": { @@ -6912,7 +6974,7 @@ "sftp", "storage" ], - "time": "2020-04-16T13:21:26+00:00" + "time": "2020-05-18T15:13:39+00:00" }, { "name": "lusitanian/oauth", @@ -7022,16 +7084,16 @@ }, { "name": "magento/magento2-functional-testing-framework", - "version": "dev-3.0.0-RC2", + "version": "dev-3.0.0-RC3", "source": { "type": "git", "url": "https://github.com/magento/magento2-functional-testing-framework.git", - "reference": "b525101e1ea02b2691f389982b0cb91b76c71ff4" + "reference": "9505f04a011c1d68b905d8472fcf8c21aabb8c74" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/b525101e1ea02b2691f389982b0cb91b76c71ff4", - "reference": "b525101e1ea02b2691f389982b0cb91b76c71ff4", + "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/9505f04a011c1d68b905d8472fcf8c21aabb8c74", + "reference": "9505f04a011c1d68b905d8472fcf8c21aabb8c74", "shasum": "" }, "require": { @@ -7053,6 +7115,7 @@ "mustache/mustache": "~2.5", "php": "^7.3", "php-webdriver/webdriver": "^1.8.0", + "spomky-labs/otphp": "^10.0", "symfony/console": "^4.4", "symfony/finder": "^5.0", "symfony/mime": "^5.0", @@ -7105,7 +7168,7 @@ "magento", "testing" ], - "time": "2020-04-30T14:54:28+00:00" + "time": "2020-05-22T17:57:20+00:00" }, { "name": "mikey179/vfsstream", @@ -7304,6 +7367,68 @@ ], "time": "2020-01-17T21:11:47+00:00" }, + { + "name": "paragonie/constant_time_encoding", + "version": "v2.3.0", + "source": { + "type": "git", + "url": "https://github.com/paragonie/constant_time_encoding.git", + "reference": "47a1cedd2e4d52688eb8c96469c05ebc8fd28fa2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/47a1cedd2e4d52688eb8c96469c05ebc8fd28fa2", + "reference": "47a1cedd2e4d52688eb8c96469c05ebc8fd28fa2", + "shasum": "" + }, + "require": { + "php": "^7|^8" + }, + "require-dev": { + "phpunit/phpunit": "^6|^7", + "vimeo/psalm": "^1|^2|^3" + }, + "type": "library", + "autoload": { + "psr-4": { + "ParagonIE\\ConstantTime\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com", + "homepage": "https://paragonie.com", + "role": "Maintainer" + }, + { + "name": "Steve 'Sc00bz' Thomas", + "email": "steve@tobtu.com", + "homepage": "https://www.tobtu.com", + "role": "Original Developer" + } + ], + "description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)", + "keywords": [ + "base16", + "base32", + "base32_decode", + "base32_encode", + "base64", + "base64_decode", + "base64_encode", + "bin2hex", + "encoding", + "hex", + "hex2bin", + "rfc4648" + ], + "time": "2019-11-06T19:20:29+00:00" + }, { "name": "pdepend/pdepend", "version": "2.7.1", @@ -9307,6 +9432,77 @@ "homepage": "https://github.com/sebastianbergmann/version", "time": "2020-01-21T06:36:37+00:00" }, + { + "name": "spomky-labs/otphp", + "version": "v10.0.1", + "source": { + "type": "git", + "url": "https://github.com/Spomky-Labs/otphp.git", + "reference": "f44cce5a9db4b8da410215d992110482c931232f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Spomky-Labs/otphp/zipball/f44cce5a9db4b8da410215d992110482c931232f", + "reference": "f44cce5a9db4b8da410215d992110482c931232f", + "shasum": "" + }, + "require": { + "beberlei/assert": "^3.0", + "ext-mbstring": "*", + "paragonie/constant_time_encoding": "^2.0", + "php": "^7.2|^8.0", + "thecodingmachine/safe": "^0.1.14|^1.0" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.0", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-beberlei-assert": "^0.12", + "phpstan/phpstan-deprecation-rules": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpstan/phpstan-strict-rules": "^0.12", + "phpunit/phpunit": "^8.0", + "thecodingmachine/phpstan-safe-rule": "^1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "v10.0": "10.0.x-dev", + "v9.0": "9.0.x-dev", + "v8.3": "8.3.x-dev" + } + }, + "autoload": { + "psr-4": { + "OTPHP\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Florent Morselli", + "homepage": "https://github.com/Spomky" + }, + { + "name": "All contributors", + "homepage": "https://github.com/Spomky-Labs/otphp/contributors" + } + ], + "description": "A PHP library for generating one time passwords according to RFC 4226 (HOTP Algorithm) and the RFC 6238 (TOTP Algorithm) and compatible with Google Authenticator", + "homepage": "https://github.com/Spomky-Labs/otphp", + "keywords": [ + "FreeOTP", + "RFC 4226", + "RFC 6238", + "google authenticator", + "hotp", + "otp", + "totp" + ], + "time": "2020-01-28T09:24:19+00:00" + }, { "name": "squizlabs/php_codesniffer", "version": "3.5.5", @@ -9834,6 +10030,139 @@ "homepage": "https://symfony.com", "time": "2020-04-28T17:58:55+00:00" }, + { + "name": "thecodingmachine/safe", + "version": "v1.1.1", + "source": { + "type": "git", + "url": "https://github.com/thecodingmachine/safe.git", + "reference": "04f9ffae372a9816d4472dfb7bcf6126b623a9df" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/04f9ffae372a9816d4472dfb7bcf6126b623a9df", + "reference": "04f9ffae372a9816d4472dfb7bcf6126b623a9df", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "require-dev": { + "phpstan/phpstan": "^0.12", + "squizlabs/php_codesniffer": "^3.2", + "thecodingmachine/phpstan-strict-rules": "^0.12" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.1-dev" + } + }, + "autoload": { + "psr-4": { + "Safe\\": [ + "lib/", + "generated/" + ] + }, + "files": [ + "generated/apache.php", + "generated/apc.php", + "generated/apcu.php", + "generated/array.php", + "generated/bzip2.php", + "generated/classobj.php", + "generated/com.php", + "generated/cubrid.php", + "generated/curl.php", + "generated/datetime.php", + "generated/dir.php", + "generated/eio.php", + "generated/errorfunc.php", + "generated/exec.php", + "generated/fileinfo.php", + "generated/filesystem.php", + "generated/filter.php", + "generated/fpm.php", + "generated/ftp.php", + "generated/funchand.php", + "generated/gmp.php", + "generated/gnupg.php", + "generated/hash.php", + "generated/ibase.php", + "generated/ibmDb2.php", + "generated/iconv.php", + "generated/image.php", + "generated/imap.php", + "generated/info.php", + "generated/ingres-ii.php", + "generated/inotify.php", + "generated/json.php", + "generated/ldap.php", + "generated/libevent.php", + "generated/libxml.php", + "generated/lzf.php", + "generated/mailparse.php", + "generated/mbstring.php", + "generated/misc.php", + "generated/msql.php", + "generated/mssql.php", + "generated/mysql.php", + "generated/mysqli.php", + "generated/mysqlndMs.php", + "generated/mysqlndQc.php", + "generated/network.php", + "generated/oci8.php", + "generated/opcache.php", + "generated/openssl.php", + "generated/outcontrol.php", + "generated/password.php", + "generated/pcntl.php", + "generated/pcre.php", + "generated/pdf.php", + "generated/pgsql.php", + "generated/posix.php", + "generated/ps.php", + "generated/pspell.php", + "generated/readline.php", + "generated/rpminfo.php", + "generated/rrd.php", + "generated/sem.php", + "generated/session.php", + "generated/shmop.php", + "generated/simplexml.php", + "generated/sockets.php", + "generated/sodium.php", + "generated/solr.php", + "generated/spl.php", + "generated/sqlsrv.php", + "generated/ssdeep.php", + "generated/ssh2.php", + "generated/stats.php", + "generated/stream.php", + "generated/strings.php", + "generated/swoole.php", + "generated/uodbc.php", + "generated/uopz.php", + "generated/url.php", + "generated/var.php", + "generated/xdiff.php", + "generated/xml.php", + "generated/xmlrpc.php", + "generated/yaml.php", + "generated/yaz.php", + "generated/zip.php", + "generated/zlib.php", + "lib/special_cases.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHP core functions that throw exceptions instead of returning FALSE on error", + "time": "2020-05-04T15:25:36+00:00" + }, { "name": "theseer/fdomdocument", "version": "1.6.6", diff --git a/dev/tests/acceptance/staticRuleset.json b/dev/tests/acceptance/staticRuleset.json index 64f8d57d6c38c..74fe3469e353b 100644 --- a/dev/tests/acceptance/staticRuleset.json +++ b/dev/tests/acceptance/staticRuleset.json @@ -1,6 +1,7 @@ { "tests": [ "actionGroupArguments", - "deprecatedEntityUsage" + "deprecatedEntityUsage", + "annotations" ] } From 8b9f6d0db1dd4214c8cbac1e38ce94924d2f1907 Mon Sep 17 00:00:00 2001 From: Alex Kolesnyk <kolesnyk@adobe.com> Date: Fri, 22 May 2020 14:27:16 -0500 Subject: [PATCH 17/18] MQE-2125: bump MFTF version in Magento 2.4 and deliver all related changes --- composer.lock | 407 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 402 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 194c6bbd4b36f..0177ab03acc68 100644 --- a/composer.lock +++ b/composer.lock @@ -206,6 +206,16 @@ "ssl", "tls" ], + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], "time": "2020-04-08T08:27:21+00:00" }, { @@ -287,6 +297,16 @@ "dependency", "package" ], + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], "time": "2020-05-06T08:28:10+00:00" }, { @@ -452,6 +472,12 @@ "Xdebug", "performance" ], + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + } + ], "time": "2020-03-01T12:26:26+00:00" }, { @@ -2262,6 +2288,12 @@ "laminas", "mail" ], + "funding": [ + { + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" + } + ], "time": "2020-04-21T16:42:19+00:00" }, { @@ -3254,6 +3286,12 @@ "laminas", "zf" ], + "funding": [ + { + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" + } + ], "time": "2020-04-03T16:01:00+00:00" }, { @@ -3909,6 +3947,20 @@ "x.509", "x509" ], + "funding": [ + { + "url": "https://github.com/terrafrost", + "type": "github" + }, + { + "url": "https://www.patreon.com/phpseclib", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib", + "type": "tidelift" + } + ], "time": "2020-04-04T23:17:33+00:00" }, { @@ -4272,6 +4324,16 @@ "parser", "validator" ], + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint", + "type": "tidelift" + } + ], "time": "2020-04-30T19:05:18+00:00" }, { @@ -4392,6 +4454,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-30T11:41:10+00:00" }, { @@ -4445,6 +4521,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -4515,6 +4605,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:54:36+00:00" }, { @@ -4623,6 +4727,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-12T14:40:17+00:00" }, { @@ -4672,6 +4790,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -4730,6 +4862,20 @@ "polyfill", "portable" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:14:59+00:00" }, { @@ -4792,6 +4938,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:47:27+00:00" }, { @@ -4851,6 +5011,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:47:27+00:00" }, { @@ -4906,6 +5080,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-12T16:47:27+00:00" }, { @@ -4964,6 +5152,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-02-27T09:26:54+00:00" }, { @@ -5013,6 +5215,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-15T15:56:18+00:00" }, { @@ -5868,6 +6084,12 @@ "functional testing", "unit testing" ], + "funding": [ + { + "url": "https://opencollective.com/codeception", + "type": "open_collective" + } + ], "time": "2020-03-23T17:07:20+00:00" }, { @@ -6716,6 +6938,12 @@ } ], "description": "A tool to automatically fix PHP code style", + "funding": [ + { + "url": "https://github.com/keradus", + "type": "github" + } + ], "time": "2020-04-15T18:51:10+00:00" }, { @@ -6974,6 +7202,12 @@ "sftp", "storage" ], + "funding": [ + { + "url": "https://offset.earth/frankdejonge", + "type": "other" + } + ], "time": "2020-05-18T15:13:39+00:00" }, { @@ -7088,12 +7322,12 @@ "source": { "type": "git", "url": "https://github.com/magento/magento2-functional-testing-framework.git", - "reference": "9505f04a011c1d68b905d8472fcf8c21aabb8c74" + "reference": "aea30ae1df2fe6618478ba8813864c204561fde3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/9505f04a011c1d68b905d8472fcf8c21aabb8c74", - "reference": "9505f04a011c1d68b905d8472fcf8c21aabb8c74", + "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/aea30ae1df2fe6618478ba8813864c204561fde3", + "reference": "aea30ae1df2fe6618478ba8813864c204561fde3", "shasum": "" }, "require": { @@ -7168,7 +7402,7 @@ "magento", "testing" ], - "time": "2020-05-22T17:57:20+00:00" + "time": "2020-05-22T19:17:05+00:00" }, { "name": "mikey179/vfsstream", @@ -8176,6 +8410,20 @@ "MIT" ], "description": "PHPStan - PHP Static Analysis Tool", + "funding": [ + { + "url": "https://github.com/ondrejmirtes", + "type": "github" + }, + { + "url": "https://www.patreon.com/phpstan", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", + "type": "tidelift" + } + ], "time": "2020-05-05T12:55:44+00:00" }, { @@ -8290,6 +8538,12 @@ "filesystem", "iterator" ], + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-04-18T05:02:12+00:00" }, { @@ -8438,6 +8692,12 @@ "keywords": [ "timer" ], + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-04-20T06:00:37+00:00" }, { @@ -8487,6 +8747,12 @@ "keywords": [ "tokenizer" ], + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-05-06T09:56:31+00:00" }, { @@ -8575,6 +8841,16 @@ "testing", "xunit" ], + "funding": [ + { + "url": "https://phpunit.de/donate.html", + "type": "custom" + }, + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-04-30T06:32:53+00:00" }, { @@ -8715,6 +8991,12 @@ ], "description": "Collection of value objects that represent the PHP code units", "homepage": "https://github.com/sebastianbergmann/code-unit", + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-04-30T05:58:10+00:00" }, { @@ -8933,6 +9215,12 @@ "environment", "hhvm" ], + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-04-14T13:36:52+00:00" }, { @@ -9616,6 +9904,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-15T15:59:10+00:00" }, { @@ -9689,6 +9991,20 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-28T17:58:55+00:00" }, { @@ -9744,6 +10060,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-18T20:50:06+00:00" }, { @@ -9806,6 +10136,20 @@ "mime", "mime-type" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-17T03:29:44+00:00" }, { @@ -9860,6 +10204,20 @@ "configuration", "options" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-06T10:40:56+00:00" }, { @@ -9969,6 +10327,20 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -10028,6 +10400,20 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-28T17:58:55+00:00" }, { @@ -10303,6 +10689,16 @@ "env", "environment" ], + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv", + "type": "tidelift" + } + ], "time": "2020-05-02T13:38:00+00:00" }, { @@ -10418,5 +10814,6 @@ "ext-zip": "*", "lib-libxml": "*" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "1.1.0" } From 583367a82cfbc6bf9f7030c562bcab8a1a34730a Mon Sep 17 00:00:00 2001 From: Alex Kolesnyk <kolesnyk@adobe.com> Date: Fri, 22 May 2020 18:37:16 -0500 Subject: [PATCH 18/18] MQE-2125: bump MFTF version in Magento 2.4 and deliver all related changes --- .../Test/AdminExportSimpleProductWithCustomAttributeTest.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml index 8cea7985aa6d7..d345b0b0de116 100644 --- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml +++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml @@ -50,6 +50,10 @@ <magentoCron stepKey="runCronIndex" groups="index"/> + <wait stepKey="waitForReindexing" time="60" /> + <reloadPage stepKey="pageReload" /> + <waitForPageLoad stepKey="waitForPageLoaded" /> + <grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/> <!-- Download product -->