From 04ee55131807c687159957368846405dee728a36 Mon Sep 17 00:00:00 2001 From: Alex Kolesnyk Date: Wed, 3 May 2023 14:59:12 -0500 Subject: [PATCH 1/6] Replace createData in favor of magentoCLI --- ...NotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml index a3b92fc848181..8af5f7a9dc38e 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml @@ -24,7 +24,7 @@ 100 - + @@ -34,7 +34,7 @@ - + From 656910cf78ab9b4d803c0b067bd42fe6a837a1dd Mon Sep 17 00:00:00 2001 From: Alex Kolesnyk Date: Wed, 10 May 2023 14:42:19 -0500 Subject: [PATCH 2/6] MFTF Stability control --- ...OneOfMoreSelectedOptionsAreRemovedFromAdminTest.xml | 10 +++++----- dev/tests/acceptance/.gitignore | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/EditOrderWithBundleProductBackendProductEvenAfterOneOfMoreSelectedOptionsAreRemovedFromAdminTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/EditOrderWithBundleProductBackendProductEvenAfterOneOfMoreSelectedOptionsAreRemovedFromAdminTest.xml index d5219bd5b7a61..1633491410233 100644 --- a/app/code/Magento/Bundle/Test/Mftf/Test/EditOrderWithBundleProductBackendProductEvenAfterOneOfMoreSelectedOptionsAreRemovedFromAdminTest.xml +++ b/app/code/Magento/Bundle/Test/Mftf/Test/EditOrderWithBundleProductBackendProductEvenAfterOneOfMoreSelectedOptionsAreRemovedFromAdminTest.xml @@ -86,8 +86,8 @@ - - + + @@ -115,12 +115,12 @@ - + - + - + diff --git a/dev/tests/acceptance/.gitignore b/dev/tests/acceptance/.gitignore index 88662b9b4ffbf..aba5de1274b04 100644 --- a/dev/tests/acceptance/.gitignore +++ b/dev/tests/acceptance/.gitignore @@ -8,4 +8,5 @@ tests/functional/Magento/_generated vendor/* mftf.log /.credentials.example +/.credentials /utils/ From 787c0a2c9c81466037dd6601c7195036109fc25d Mon Sep 17 00:00:00 2001 From: Alex Kolesnyk Date: Wed, 10 May 2023 16:30:43 -0500 Subject: [PATCH 3/6] MFTF Stability control --- .../Test/AdminCreateVirtualProductWithoutManageStockTest.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml index 7aeb1a1397952..d71247647caa2 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml @@ -24,6 +24,8 @@ + + From 2929ecda443fb5cac202ec4035ce03c4a976d9f3 Mon Sep 17 00:00:00 2001 From: Alex Kolesnyk Date: Wed, 10 May 2023 16:35:56 -0500 Subject: [PATCH 4/6] MFTF Stability control --- .../Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml index 75c204e7ef34b..11675170c0be5 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml @@ -31,13 +31,18 @@ - + + + - + + + + From 205aee4717ababa00f69810ad1c2dc9cbcdbadeb Mon Sep 17 00:00:00 2001 From: Alex Kolesnyk Date: Wed, 10 May 2023 22:27:48 -0500 Subject: [PATCH 5/6] MFTF Stability control --- .../Mftf/ActionGroup/EnablePayPalConfigurationActionGroup.xml | 1 + ...dminConfigPaymentsConflictResolutionForPayPalInFranceTest.xml | 1 + ...AdminConfigPaymentsConflictResolutionForPayPalInItalyTest.xml | 1 + ...AdminConfigPaymentsConflictResolutionForPayPalInJapanTest.xml | 1 + ...AdminConfigPaymentsConflictResolutionForPayPalInSpainTest.xml | 1 + ...figPaymentsConflictResolutionForPayPalInUnitedKingdomTest.xml | 1 + 6 files changed, 6 insertions(+) diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePayPalConfigurationActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePayPalConfigurationActionGroup.xml index b653858f770e9..70934051afd32 100644 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePayPalConfigurationActionGroup.xml +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePayPalConfigurationActionGroup.xml @@ -23,6 +23,7 @@ + diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInFranceTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInFranceTest.xml index 3b70bc84037ce..c66df74869e5a 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInFranceTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInFranceTest.xml @@ -15,6 +15,7 @@ + diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInItalyTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInItalyTest.xml index db35a29f4cbaa..561c98131c744 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInItalyTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInItalyTest.xml @@ -15,6 +15,7 @@ + diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInJapanTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInJapanTest.xml index 6030358c433dd..7c7a2e6100f1e 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInJapanTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInJapanTest.xml @@ -15,6 +15,7 @@ + diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInSpainTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInSpainTest.xml index faa8e0b1ede4c..05ae84d70d3a1 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInSpainTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInSpainTest.xml @@ -15,6 +15,7 @@ + diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdomTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdomTest.xml index 2af6a73cf1a14..4e17dc6fdc880 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdomTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdomTest.xml @@ -29,6 +29,7 @@ + From cec0a642729cbc47bd7e051d180e2f1c09917ea2 Mon Sep 17 00:00:00 2001 From: Alex Kolesnyk Date: Thu, 11 May 2023 00:29:21 -0500 Subject: [PATCH 6/6] MFTF Stability control --- .../Mftf/ActionGroup/EnablePayPalConfigurationActionGroup.xml | 1 + ...figPaymentsConflictResolutionForPayPalInUnitedKingdomTest.xml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePayPalConfigurationActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePayPalConfigurationActionGroup.xml index 70934051afd32..e20b38638cadb 100644 --- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePayPalConfigurationActionGroup.xml +++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/EnablePayPalConfigurationActionGroup.xml @@ -26,6 +26,7 @@ + diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdomTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdomTest.xml index 4e17dc6fdc880..2af6a73cf1a14 100644 --- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdomTest.xml +++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdomTest.xml @@ -29,7 +29,6 @@ -