Skip to content

Commit a01f910

Browse files
authored
Merge pull request #459 from magento-cia/cia-pre-release-develop-sync-03072024
Cia pre release develop sync 03072024
2 parents 8919995 + faa4097 commit a01f910

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

InventoryAdminUi/Test/Mftf/Test/AdminAddConfigurableProductWithDropDownAttributeWithNewSourceTest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@
5555

5656
<searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createPreReqCategory1.name$$]" stepKey="searchAndSelectCategory1"/>
5757
<waitForPageLoad stepKey="waitForPageLoad3"/>
58-
58+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
59+
<waitForElementClickable selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="waitForclickOnTheCreateConfigurationsButton1"/>
5960
<click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickOnTheCreateConfigurationsButton1"/>
6061
<waitForElementVisible selector="{{AdminConfigurableProductSelectAttributesSlideOut.grid}}" time="30" stepKey="waitForGridPresent1"/>
6162

InventoryIndexer/Test/Integration/Model/Queue/UpdateIndexSalabilityStatusTest.php

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
use Magento\TestFramework\Fixture\DataFixtureStorageManager;
3838
use Magento\TestFramework\Fixture\DbIsolation;
3939
use Magento\TestFramework\Helper\Bootstrap;
40+
use Magento\TestFramework\MessageQueue\ClearQueueProcessor;
4041
use PHPUnit\Framework\TestCase;
4142

4243
class UpdateIndexSalabilityStatusTest extends TestCase
@@ -56,6 +57,18 @@ class UpdateIndexSalabilityStatusTest extends TestCase
5657
*/
5758
private $getStockItemData;
5859

60+
/**
61+
* @var ClearQueueProcessor
62+
*/
63+
private static $clearQueueProcessor;
64+
65+
public static function setUpBeforeClass(): void
66+
{
67+
$objectManager = Bootstrap::getObjectManager();
68+
self::$clearQueueProcessor = $objectManager->get(ClearQueueProcessor::class);
69+
self::$clearQueueProcessor->execute('inventory.reservations.updateSalabilityStatus');
70+
}
71+
5972
protected function setUp(): void
6073
{
6174
$this->fixtures = DataFixtureStorageManager::getStorage();
@@ -97,7 +110,6 @@ protected function setUp(): void
97110
]
98111
public function testProductsStatusesAfterBuyingChildProduct(): void
99112
{
100-
$this->markTestSkipped("AC-10695");
101113
/** @var StockInterface $stock */
102114
$stock = $this->fixtures->get('stock2');
103115

@@ -145,7 +157,6 @@ public function testProductsStatusesAfterBuyingChildProduct(): void
145157
]
146158
public function testProductsStatusesAfterBuyingBundleProduct(): void
147159
{
148-
$this->markTestSkipped("AC-10695");
149160
/** @var StockInterface $stock */
150161
$stock = $this->fixtures->get('stock2');
151162

0 commit comments

Comments
 (0)