Merge pull request #459 from magento-cia/cia-pre-release-develop-sync…

…-03072024 Cia pre release develop sync 03072024
magento · Mar 7, 2024 · a01f910 · a01f910
2 parents 8919995 + faa4097
commit a01f910
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/...inUi/Test/Mftf/Test/AdminAddConfigurableProductWithDropDownAttributeWithNewSourceTest.xml b/...inUi/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"/>
 

diff --git 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,18 @@ 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 +110,6 @@ protected function setUp(): void
     ]
     public function testProductsStatusesAfterBuyingChildProduct(): void
     {
-        $this->markTestSkipped("AC-10695");
         /** @var StockInterface $stock */
         $stock = $this->fixtures->get('stock2');
 
@@ -145,7 +157,6 @@ public function testProductsStatusesAfterBuyingChildProduct(): void
     ]
     public function testProductsStatusesAfterBuyingBundleProduct(): void
     {
-        $this->markTestSkipped("AC-10695");
         /** @var StockInterface $stock */
         $stock = $this->fixtures->get('stock2');