Merge remote-tracking branch 'local/AC-7385-Alt' into PR_25_NOV_2022

o-dubovyk · o-dubovyk · commit 2b5ee114a26d · 2022-12-12T01:15:22.000-06:00
diff --git a/InventoryImportExport/Test/Integration/Model/Import/ProductTest.php b/InventoryImportExport/Test/Integration/Model/Import/ProductTest.php
@@ -22,6 +22,7 @@
 use Magento\ImportExport\Model\Import;
 use Magento\ImportExport\Model\Import\Source\Csv;
 use Magento\ImportExport\Model\Import\Source\CsvFactory;
+use Magento\ImportExport\Model\ResourceModel\Import\Data;
 use Magento\InventoryApi\Api\Data\SourceItemInterface;
 use Magento\InventoryApi\Api\Data\SourceItemSearchResultsInterface;
 use Magento\InventoryApi\Api\SourceItemRepositoryInterface;
@@ -316,6 +317,11 @@ protected function tearDown(): void
                     // product already deleted
                 }
             }
+
+            /** @var Data $dataSourceModel */
+            $dataSourceModel = $objectManager->create(Data::class);
+            $dataSourceModel->cleanBunches();
+
             $registry->unregister('isSecureArea');
             $registry->register('isSecureArea', false);
         }

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`use Magento\ImportExport\Model\Import;`
`23`	`23`	`use Magento\ImportExport\Model\Import\Source\Csv;`
`24`	`24`	`use Magento\ImportExport\Model\Import\Source\CsvFactory;`
	`25`	`+use Magento\ImportExport\Model\ResourceModel\Import\Data;`
`25`	`26`	`use Magento\InventoryApi\Api\Data\SourceItemInterface;`
`26`	`27`	`use Magento\InventoryApi\Api\Data\SourceItemSearchResultsInterface;`
`27`	`28`	`use Magento\InventoryApi\Api\SourceItemRepositoryInterface;`
`@@ -316,6 +317,11 @@ protected function tearDown(): void`
`316`	`317`	`// product already deleted`
`317`	`318`	`}`
`318`	`319`	`}`
	`320`	`+`
	`321`	`+ /** @var Data $dataSourceModel */`
	`322`	`+ $dataSourceModel = $objectManager->create(Data::class);`
	`323`	`+ $dataSourceModel->cleanBunches();`
	`324`	`+`
`319`	`325`	`$registry->unregister('isSecureArea');`
`320`	`326`	`$registry->register('isSecureArea', false);`
`321`	`327`	`}`