From e0ea1c34fa1266a31e184ada23b47aa7f11c6b25 Mon Sep 17 00:00:00 2001 From: joweecaquicla Date: Mon, 14 Sep 2020 22:44:28 +0800 Subject: [PATCH 1/7] magento/adobe-stock-integration#1830: Stabilize AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest and AdminMediaGalleryCatalogUiUsedInCategoryFilterTest - modified AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest --- ...leryCatalogUiVerifyUsedInLinkProductGridTest.xml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.xml index db7942d4c53bf..97f22053ec17e 100644 --- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.xml +++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.xml @@ -29,6 +29,8 @@ + + @@ -42,6 +44,10 @@ + + + + @@ -51,6 +57,8 @@ + + @@ -64,15 +72,14 @@ - + - + - From f61da2f3b4ce18d17b799c088d7e9c963cd9a3ce Mon Sep 17 00:00:00 2001 From: joweecaquicla Date: Mon, 14 Sep 2020 22:59:42 +0800 Subject: [PATCH 2/7] magento/adobe-stock-integration#1830: Stabilize AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest and AdminMediaGalleryCatalogUiUsedInCategoryFilterTest - modified AdminMediaGalleryCatalogUiUsedInCategoryFilterTest --- .../AdminMediaGalleryCatalogUiUsedInCategoryFilterTest.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInCategoryFilterTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInCategoryFilterTest.xml index a495e2ff07e6a..4fc616cafb0b9 100644 --- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInCategoryFilterTest.xml +++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInCategoryFilterTest.xml @@ -27,7 +27,7 @@ - + @@ -37,6 +37,7 @@ + From 7ec2da9066d10eaf4438b857f4ebb2f3c6262752 Mon Sep 17 00:00:00 2001 From: joweecaquicla Date: Tue, 15 Sep 2020 20:15:48 +0800 Subject: [PATCH 3/7] magento/adobe-stock-integration#1830: Stabilize AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest and AdminMediaGalleryCatalogUiUsedInCategoryFilterTest - applied request changes --- ...inMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.xml index 97f22053ec17e..c6c6d3d7ceeb0 100644 --- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.xml +++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.xml @@ -29,7 +29,7 @@ - + @@ -57,7 +57,7 @@ - + From d1007f2ddbdcb04fce472abab48b719a21687efe Mon Sep 17 00:00:00 2001 From: joweecaquicla Date: Tue, 15 Sep 2020 22:28:57 +0800 Subject: [PATCH 4/7] magento/adobe-stock-integration#1830: Stabilize AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest and AdminMediaGalleryCatalogUiUsedInCategoryFilterTest - requested changes --- .../Test/AdminMediaGalleryDeleteImageWithWarningPopupTest.xml | 1 + .../Mftf/Test/AdminMediaGalleryStoreViewCategoryFilterTest.xml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageWithWarningPopupTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageWithWarningPopupTest.xml index 6ae8ed7047434..99ba03b13d586 100644 --- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageWithWarningPopupTest.xml +++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageWithWarningPopupTest.xml @@ -33,6 +33,7 @@ + diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryStoreViewCategoryFilterTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryStoreViewCategoryFilterTest.xml index eceda879e5597..6a85e81bd37cb 100644 --- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryStoreViewCategoryFilterTest.xml +++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryStoreViewCategoryFilterTest.xml @@ -33,6 +33,7 @@ + @@ -56,7 +57,7 @@ - + From f27f541186800727cbd7bfe3dd2dc091ff41888b Mon Sep 17 00:00:00 2001 From: joweecaquicla Date: Wed, 16 Sep 2020 12:00:19 +0800 Subject: [PATCH 5/7] magento/adobe-stock-integration#1830: Stabilize AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest and AdminMediaGalleryCatalogUiUsedInCategoryFilterTest - additional modifications for failing tests --- .../Test/AdminMediaGalleryCatalogUiUsedInCategoryFilterTest.xml | 1 + .../Test/AdminMediaGalleryDeleteImageWithWarningPopupTest.xml | 1 + .../Mftf/Test/AdminMediaGalleryStoreViewCategoryFilterTest.xml | 1 + 3 files changed, 3 insertions(+) diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInCategoryFilterTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInCategoryFilterTest.xml index 4fc616cafb0b9..349432cfe1f72 100644 --- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInCategoryFilterTest.xml +++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInCategoryFilterTest.xml @@ -37,6 +37,7 @@ + diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageWithWarningPopupTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageWithWarningPopupTest.xml index 99ba03b13d586..20bdbd41d3daa 100644 --- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageWithWarningPopupTest.xml +++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageWithWarningPopupTest.xml @@ -33,6 +33,7 @@ + diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryStoreViewCategoryFilterTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryStoreViewCategoryFilterTest.xml index 6a85e81bd37cb..9c72ee4ac38fe 100644 --- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryStoreViewCategoryFilterTest.xml +++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryStoreViewCategoryFilterTest.xml @@ -33,6 +33,7 @@ + From 53c6998d2304f7832669a622582cd99255b55177 Mon Sep 17 00:00:00 2001 From: joweecaquicla Date: Wed, 16 Sep 2020 13:40:07 +0800 Subject: [PATCH 6/7] magento/adobe-stock-integration#1830: Stabilize AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest and AdminMediaGalleryCatalogUiUsedInCategoryFilterTest - additional modifications for failing tests --- .../AdminMediaGalleryCatalogUiUsedInCategoryFilterTest.xml | 2 ++ .../Test/AdminMediaGalleryDeleteImageWithWarningPopupTest.xml | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInCategoryFilterTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInCategoryFilterTest.xml index 349432cfe1f72..df3ac35c0bfcd 100644 --- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInCategoryFilterTest.xml +++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInCategoryFilterTest.xml @@ -52,6 +52,8 @@ + + diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageWithWarningPopupTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageWithWarningPopupTest.xml index 20bdbd41d3daa..84dd84a22d3c3 100644 --- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageWithWarningPopupTest.xml +++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageWithWarningPopupTest.xml @@ -45,11 +45,13 @@ + + - + From f7c5f269e910e3c88c3de0e6966cf0d1e7c8a715 Mon Sep 17 00:00:00 2001 From: Sergii Ivashchenko Date: Mon, 21 Sep 2020 13:44:05 +0300 Subject: [PATCH 7/7] magento/magento2#30034: Replaced deprecated action group --- ...inMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.xml index c6c6d3d7ceeb0..d2e8574ef7033 100644 --- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.xml +++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.xml @@ -29,7 +29,7 @@ - + @@ -57,7 +57,7 @@ - +