From 17bd85ad5c5838e5d7112f82ad6579f59e191a8d Mon Sep 17 00:00:00 2001
From: manjusha729 <93243302+manjusha729@users.noreply.github.com>
Date: Wed, 17 Jan 2024 13:45:08 +0530
Subject: [PATCH 1/5] Update
 AdminAddConfigurableProductWithDropDownAttributeWithNewSourceTest.xml

---
 ...nfigurableProductWithDropDownAttributeWithNewSourceTest.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminAddConfigurableProductWithDropDownAttributeWithNewSourceTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminAddConfigurableProductWithDropDownAttributeWithNewSourceTest.xml
index ee1d36c12645..1c6094e1268e 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminAddConfigurableProductWithDropDownAttributeWithNewSourceTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminAddConfigurableProductWithDropDownAttributeWithNewSourceTest.xml
@@ -55,7 +55,8 @@
 
         <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createPreReqCategory1.name$$]"  stepKey="searchAndSelectCategory1"/>
         <waitForPageLoad stepKey="waitForPageLoad3"/>
-
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+        <waitForElementClickable selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="waitForclickOnTheCreateConfigurationsButton1"/>
         <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickOnTheCreateConfigurationsButton1"/>
         <waitForElementVisible selector="{{AdminConfigurableProductSelectAttributesSlideOut.grid}}" time="30" stepKey="waitForGridPresent1"/>
 

From 80114d2e1dc18b1f5f68189089855cc8e9592831 Mon Sep 17 00:00:00 2001
From: glo63652 <glo63652@adobe.com>
Date: Wed, 24 Jan 2024 11:57:49 +0530
Subject: [PATCH 2/5] AMQP Queue Messages persist between tests, causing
 failures due to improper isolation

---
 .../Queue/UpdateIndexSalabilityStatusTest.php    | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/InventoryIndexer/Test/Integration/Model/Queue/UpdateIndexSalabilityStatusTest.php b/InventoryIndexer/Test/Integration/Model/Queue/UpdateIndexSalabilityStatusTest.php
index 2af0843b48e5..ad028501df89 100644
--- a/InventoryIndexer/Test/Integration/Model/Queue/UpdateIndexSalabilityStatusTest.php
+++ b/InventoryIndexer/Test/Integration/Model/Queue/UpdateIndexSalabilityStatusTest.php
@@ -37,6 +37,7 @@
 use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\Fixture\DbIsolation;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\MessageQueue\ClearQueueProcessor;
 use PHPUnit\Framework\TestCase;
 
 class UpdateIndexSalabilityStatusTest extends TestCase
@@ -56,6 +57,19 @@ class UpdateIndexSalabilityStatusTest extends TestCase
      */
     private $getStockItemData;
 
+    /**
+     * @var ClearQueueProcessor
+     */
+    private static $clearQueueProcessor;
+
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+        $objectManager = Bootstrap::getObjectManager();
+        self::$clearQueueProcessor = $objectManager->get(ClearQueueProcessor::class);
+        self::$clearQueueProcessor->execute('inventory.reservations.updateSalabilityStatus');
+    }
+
     protected function setUp(): void
     {
         $this->fixtures = DataFixtureStorageManager::getStorage();
@@ -97,7 +111,6 @@ protected function setUp(): void
     ]
     public function testProductsStatusesAfterBuyingChildProduct(): void
     {
-        $this->markTestSkipped("AC-10695");
         /** @var StockInterface $stock */
         $stock = $this->fixtures->get('stock2');
 
@@ -145,7 +158,6 @@ public function testProductsStatusesAfterBuyingChildProduct(): void
     ]
     public function testProductsStatusesAfterBuyingBundleProduct(): void
     {
-        $this->markTestSkipped("AC-10695");
         /** @var StockInterface $stock */
         $stock = $this->fixtures->get('stock2');
 

From 6bf5ec0dba842484c4ec79b49059eb0520f783d7 Mon Sep 17 00:00:00 2001
From: glo63652 <glo63652@adobe.com>
Date: Wed, 24 Jan 2024 12:00:03 +0530
Subject: [PATCH 3/5] Revert "AMQP Queue Messages persist between tests,
 causing failures due to improper isolation"

This reverts commit 80114d2e1dc18b1f5f68189089855cc8e9592831.
---
 .../Queue/UpdateIndexSalabilityStatusTest.php    | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/InventoryIndexer/Test/Integration/Model/Queue/UpdateIndexSalabilityStatusTest.php b/InventoryIndexer/Test/Integration/Model/Queue/UpdateIndexSalabilityStatusTest.php
index ad028501df89..2af0843b48e5 100644
--- a/InventoryIndexer/Test/Integration/Model/Queue/UpdateIndexSalabilityStatusTest.php
+++ b/InventoryIndexer/Test/Integration/Model/Queue/UpdateIndexSalabilityStatusTest.php
@@ -37,7 +37,6 @@
 use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\Fixture\DbIsolation;
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\TestFramework\MessageQueue\ClearQueueProcessor;
 use PHPUnit\Framework\TestCase;
 
 class UpdateIndexSalabilityStatusTest extends TestCase
@@ -57,19 +56,6 @@ class UpdateIndexSalabilityStatusTest extends TestCase
      */
     private $getStockItemData;
 
-    /**
-     * @var ClearQueueProcessor
-     */
-    private static $clearQueueProcessor;
-
-    public static function setUpBeforeClass(): void
-    {
-        parent::setUpBeforeClass();
-        $objectManager = Bootstrap::getObjectManager();
-        self::$clearQueueProcessor = $objectManager->get(ClearQueueProcessor::class);
-        self::$clearQueueProcessor->execute('inventory.reservations.updateSalabilityStatus');
-    }
-
     protected function setUp(): void
     {
         $this->fixtures = DataFixtureStorageManager::getStorage();
@@ -111,6 +97,7 @@ protected function setUp(): void
     ]
     public function testProductsStatusesAfterBuyingChildProduct(): void
     {
+        $this->markTestSkipped("AC-10695");
         /** @var StockInterface $stock */
         $stock = $this->fixtures->get('stock2');
 
@@ -158,6 +145,7 @@ public function testProductsStatusesAfterBuyingChildProduct(): void
     ]
     public function testProductsStatusesAfterBuyingBundleProduct(): void
     {
+        $this->markTestSkipped("AC-10695");
         /** @var StockInterface $stock */
         $stock = $this->fixtures->get('stock2');
 

From b8eda374ef0ef51b54e19d48ab2b1bb631e1ea56 Mon Sep 17 00:00:00 2001
From: glo63652 <glo63652@adobe.com>
Date: Wed, 24 Jan 2024 12:22:27 +0530
Subject: [PATCH 4/5] AMQP Queue Messages persist between tests, causing
 failures due to improper isolation

---
 .../Queue/UpdateIndexSalabilityStatusTest.php    | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/InventoryIndexer/Test/Integration/Model/Queue/UpdateIndexSalabilityStatusTest.php b/InventoryIndexer/Test/Integration/Model/Queue/UpdateIndexSalabilityStatusTest.php
index 2af0843b48e5..9dd5ba33bb7f 100644
--- a/InventoryIndexer/Test/Integration/Model/Queue/UpdateIndexSalabilityStatusTest.php
+++ b/InventoryIndexer/Test/Integration/Model/Queue/UpdateIndexSalabilityStatusTest.php
@@ -37,6 +37,7 @@
 use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\Fixture\DbIsolation;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\MessageQueue\ClearQueueProcessor;
 use PHPUnit\Framework\TestCase;
 
 class UpdateIndexSalabilityStatusTest extends TestCase
@@ -56,6 +57,19 @@ class UpdateIndexSalabilityStatusTest extends TestCase
      */
     private $getStockItemData;
 
+    /**
+     * @var ClearQueueProcessor
+     */
+    private static $clearQueueProcessor;
+
+
+    public static function setUpBeforeClass(): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        self::$clearQueueProcessor = $objectManager->get(ClearQueueProcessor::class);
+        self::$clearQueueProcessor->execute('inventory.reservations.updateSalabilityStatus');
+    }
+
     protected function setUp(): void
     {
         $this->fixtures = DataFixtureStorageManager::getStorage();
@@ -97,7 +111,6 @@ protected function setUp(): void
     ]
     public function testProductsStatusesAfterBuyingChildProduct(): void
     {
-        $this->markTestSkipped("AC-10695");
         /** @var StockInterface $stock */
         $stock = $this->fixtures->get('stock2');
 
@@ -145,7 +158,6 @@ public function testProductsStatusesAfterBuyingChildProduct(): void
     ]
     public function testProductsStatusesAfterBuyingBundleProduct(): void
     {
-        $this->markTestSkipped("AC-10695");
         /** @var StockInterface $stock */
         $stock = $this->fixtures->get('stock2');
 

From d02ed1700bddb06a63f5796512e8e97f16bc2a52 Mon Sep 17 00:00:00 2001
From: glo63652 <glo63652@adobe.com>
Date: Wed, 24 Jan 2024 13:15:37 +0530
Subject: [PATCH 5/5] AC-10695::AMQP Queue Messages persist between tests,
 causing failures due to improper isolation

---
 .../Integration/Model/Queue/UpdateIndexSalabilityStatusTest.php  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/InventoryIndexer/Test/Integration/Model/Queue/UpdateIndexSalabilityStatusTest.php b/InventoryIndexer/Test/Integration/Model/Queue/UpdateIndexSalabilityStatusTest.php
index 9dd5ba33bb7f..ba22151349c1 100644
--- a/InventoryIndexer/Test/Integration/Model/Queue/UpdateIndexSalabilityStatusTest.php
+++ b/InventoryIndexer/Test/Integration/Model/Queue/UpdateIndexSalabilityStatusTest.php
@@ -62,7 +62,6 @@ class UpdateIndexSalabilityStatusTest extends TestCase
      */
     private static $clearQueueProcessor;
 
-
     public static function setUpBeforeClass(): void
     {
         $objectManager = Bootstrap::getObjectManager();