Fix integration tests for Magento_Backend and Magento_Bundle #134

simsComputing · 2025-04-13T17:48:04Z

Description (*)

I have fixed all integration tests on Magento_Backend and Magento_Bundle. For the first one it was about rewriting the test to adapt it to the class's new dependencies.
For the second one it was about fixing Magento.

I added fixes for the Magento_CatalogInventory module. It was about fixing the integration with the new ParentItemProcessInterface

Fixed Issues (if relevant)

I cannot access github issues on the mage-os repo. So here is the taiga ticket :

Fix all broken integration tests

But the PR for now does not fix all integration tests. it will be a long way to go.

Manual testing scenarios (*)

First make sure you're in the dev/tests/integration folder. then :

../../../vendor/bin/phpunit testsuite/Magento/Backend
../../../vendor/bin/phpunit testsuite/Magento/Bundle
../../../vendor/bin/phpunit testsuite/Magento/CatalogInventory

You should have 0 broken test

Contribution checklist (*)

Pull request has a meaningful description of its purpose
All commits are accompanied by meaningful commit messages
All new or changed code is covered with unit/integration tests (if applicable)
README.md files for modified modules are updated and included in the pull request if any README.md predefined sections require an update
All automated tests passed successfully (all builds are green)

dev/tests/integration/testsuite/Magento/Bundle/_files/issaleable_product.php

rhoerr · 2025-05-20T01:41:04Z

Hi! Just wondering, should we have this be a draft PR for now, while you work on more fixes? Or do you want to split your work into multiple PRs, and have us process this one now as-is?

It might be good to do multiple PRs, so that each individual PR is smaller for review. That way we could get things merged faster and more often for you, too.

humeauantadis · 2025-05-24T11:23:48Z

Hi @rhoerr , yes of course you're right. Plus i should rewrite the description of the PR since it now contains a few more things.
I can stop here on that PR. Should we split the taiga task also ?

rhoerr · 2025-06-01T01:43:58Z

I can stop here on that PR. Should we split the taiga task also ?

We can keep the same Taiga task for tracking. 🙂 You can add subtasks to it if you would like.

rhoerr

Reviewed work to date, some mostly small feedback

rhoerr · 2025-06-03T03:17:17Z

app/code/Magento/ConfigurableProduct/Model/Inventory/ParentItemProcessor.php

-     * @var ChangeParentStockStatus
-     */
-    private $changeParentStockStatus;
-
-    /**
-     * @param Configurable $configurableType
-     * @param StockItemCriteriaInterfaceFactory $criteriaInterfaceFactory
-     * @param StockItemRepositoryInterface $stockItemRepository
-     * @param StockConfigurationInterface $stockConfiguration
-     * @param ChangeParentStockStatus|null $changeParentStockStatus
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter) Deprecated dependencies
+     * @param ChangeParentStockStatus $changeParentStockStatus
     */
    public function __construct(
-        Configurable $configurableType,
-        StockItemCriteriaInterfaceFactory $criteriaInterfaceFactory,
-        StockItemRepositoryInterface $stockItemRepository,
-        StockConfigurationInterface $stockConfiguration,
-        ?ChangeParentStockStatus $changeParentStockStatus = null
+        private readonly ChangeParentStockStatus $changeParentStockStatus
    ) {
-        $this->changeParentStockStatus = $changeParentStockStatus
-            ?? ObjectManager::getInstance()->get(ChangeParentStockStatus::class);


I think this part should be reverted for upstream/backwards compatibility. It looks functionally equivalent. Upstream will update the parameters eventually.

rhoerr · 2025-06-03T03:39:09Z

dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/Grid/CollectionTest.php

-        $this->assertSame('test street test city Armed Forces Middle East 01001', $item->getBillingFull());
+        $this->assertSame('test street' . PHP_EOL . ' test city Armed Forces Middle East 01001', $item->getBillingFull());


I think this case (and possibly others here) should be fixed to the test, rather than matching the test to the result. I'm pretty sure this was broken by a previous Mage-OS PR, #117 . It shouldn't output a newline for empty address lines. Probably need to add a trim or array filter somewhere in there.

Hello @rhoerr , ok noted. Actually in France this newline would be quite normal.
But i'll have a look at it another time and check with the PR you linked. Thanks

rhoerr · 2025-06-03T03:42:52Z

dev/tests/integration/testsuite/Magento/Downloadable/_files/quote_with_downloadable_product.php

+    ->setShippingAddress($shippingAddress)
+    ->addProduct(


Suggested change

->setShippingAddress($shippingAddress)

->addProduct(

->setShippingAddress($shippingAddress)

->addProduct(

rhoerr · 2025-06-03T03:45:16Z

lib/internal/Magento/Framework/App/ProductMetadata.php

@@ -25,7 +25,7 @@ class ProductMetadata implements ProductMetadataInterface, DistributionMetadataI
    /**
     * Magento product name
     */
-    public const PRODUCT_NAME  = 'Magento';
+    public const PRODUCT_NAME  = 'Mage-OS';


This is intentionally left as Magento for compatibility reasons. Product Name = Magento; Distribution Name = Mage-OS. This way any code that checks if it's Magento(-compatible) gets a yes.

If any tests fail as a result of this being Magento rather than Mage-OS, we'll need to fix those instead.

simsComputing · 2025-06-24T11:06:55Z

@rhoerr , i just made the changes required. Can you please check ? Thank you

humeauantadis and others added 3 commits April 12, 2025 18:17

Fix Magento/Beckend/Block/Page/Footer integration test

231898a

Fix Magento/Bundle/Model/Product/IsSaleableTest

91a818c

Fix all other bundle test

0a8014c

simsComputing requested a review from a team as a code owner April 13, 2025 17:48

fballiano reviewed Apr 13, 2025

View reviewed changes

dev/tests/integration/testsuite/Magento/Bundle/_files/issaleable_product.php Show resolved Hide resolved

fballiano reviewed Apr 13, 2025

View reviewed changes

dev/tests/integration/testsuite/Magento/Bundle/_files/issaleable_product.php Outdated Show resolved Hide resolved

fballiano reviewed Apr 13, 2025

View reviewed changes

dev/tests/integration/testsuite/Magento/Bundle/_files/issaleable_product.php Outdated Show resolved Hide resolved

simsComputing added 9 commits April 21, 2025 14:53

Integrate code review changes

be8a208

Fix CatalogInventory test

310d82c

Fix stockitem criteria

e600827

Fix test on price indexing because of confiurable out of stock

0c375c2

Fix ButtonLock dependency

ad8ac22

Fix tests for Magento_Customer

fca904d

Fix CustomerImportExport module test

1997797

Fix Mage-OS Product Name

5782bb8

Fix Magento_Downloadable integration tests

18489c3

rhoerr reviewed Jun 3, 2025

View reviewed changes

simsComputing added 3 commits June 15, 2025 21:06

Backward compatibility

ec24c0c

Fix customer adresses with empty line

5701e29

Code review

168c5d4

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix integration tests for Magento_Backend and Magento_Bundle #134

Fix integration tests for Magento_Backend and Magento_Bundle #134

Uh oh!

simsComputing commented Apr 13, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rhoerr commented May 20, 2025

Uh oh!

humeauantadis commented May 24, 2025

Uh oh!

rhoerr commented Jun 1, 2025

Uh oh!

rhoerr left a comment

Uh oh!

rhoerr Jun 3, 2025

Uh oh!

rhoerr Jun 3, 2025

Uh oh!

humeauantadis Jun 15, 2025

Uh oh!

rhoerr Jun 3, 2025

Uh oh!

rhoerr Jun 3, 2025

Uh oh!

simsComputing commented Jun 24, 2025

Uh oh!

Uh oh!

		$this->assertSame('test street test city Armed Forces Middle East 01001', $item->getBillingFull());
		$this->assertSame('test street' . PHP_EOL . ' test city Armed Forces Middle East 01001', $item->getBillingFull());

Fix integration tests for Magento_Backend and Magento_Bundle #134

Are you sure you want to change the base?

Fix integration tests for Magento_Backend and Magento_Bundle #134

Uh oh!

Conversation

simsComputing commented Apr 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description (*)

Fixed Issues (if relevant)

Manual testing scenarios (*)

Contribution checklist (*)

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rhoerr commented May 20, 2025

Uh oh!

humeauantadis commented May 24, 2025

Uh oh!

rhoerr commented Jun 1, 2025

Uh oh!

rhoerr left a comment

Choose a reason for hiding this comment

Uh oh!

rhoerr Jun 3, 2025

Choose a reason for hiding this comment

Uh oh!

rhoerr Jun 3, 2025

Choose a reason for hiding this comment

Uh oh!

humeauantadis Jun 15, 2025

Choose a reason for hiding this comment

Uh oh!

rhoerr Jun 3, 2025

Choose a reason for hiding this comment

Uh oh!

rhoerr Jun 3, 2025

Choose a reason for hiding this comment

Uh oh!

simsComputing commented Jun 24, 2025

Uh oh!

Uh oh!

simsComputing commented Apr 13, 2025 •

edited

Loading