Skip to content

Commit

Permalink
Mcloud 12571 (#161)
Browse files Browse the repository at this point in the history 
MCLOUD-12571
  • Loading branch information
@anadgit
anadgit authored Jul 27, 2024
1 parent 84479c0 commit e1cf60d
Show file tree
Hide file tree
Showing 3 changed files with 142 additions and 17 deletions.
127 changes: 127 additions & 0 deletions src/Test/Functional/Acceptance/AbstractCest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,123 @@ class AbstractCest
*/
protected $edition = 'B2B';

/**
* @var array
*/
private $dependencyListFor244 = [
"magento/module-re-captcha-admin-ui" => "1.1.2",
"magento/module-re-captcha-checkout" => "1.1.2",
"magento/module-re-captcha-contact" => "1.1.1",
"magento/module-re-captcha-customer" => "1.1.2",
"magento/module-re-captcha-frontend-ui" => "1.1.2",
"magento/module-re-captcha-migration" => "1.1.2",
"magento/module-re-captcha-newsletter" => "1.1.2",
"magento/module-re-captcha-paypal" => "1.1.2",
"magento/module-re-captcha-review" => "1.1.2",
"magento/module-re-captcha-send-friend" => "1.1.2",
"magento/module-re-captcha-store-pickup" => "1.0.1",
"magento/module-re-captcha-ui" => "1.1.2",
"magento/module-re-captcha-user" => "1.1.2",
"magento/module-re-captcha-validation" => "1.1.1",
"magento/module-re-captcha-validation-api" => "1.1.1",
"magento/module-re-captcha-version-2-checkbox" => "2.0.2",
"magento/module-re-captcha-version-2-invisible" => "2.0.2",
"magento/module-re-captcha-version-3-invisible" => "2.0.2",
"magento/module-re-captcha-webapi-api" => "1.0.1",
"magento/module-re-captcha-webapi-rest" => "1.0.1",
"magento/module-re-captcha-webapi-graph-ql" => "1.0.1",
"magento/module-re-captcha-webapi-ui" => "1.0.1",
"magento/module-securitytxt" => "1.1.1",
"magento/module-two-factor-auth" => "1.1.3",
"magento/module-re-captcha-checkout-sales-rule" => "1.1.0",
"magento/inventory-composer-installer" => "1.2.0",
"magento/module-inventory" => "1.2.2",
"magento/module-inventory-admin-ui" => "1.2.2",
"magento/module-inventory-advanced-checkout" => "1.2.1",
"magento/module-inventory-api" => "1.2.2",
"magento/module-inventory-bundle-product" => "1.2.1",
"magento/module-inventory-bundle-product-admin-ui" => "1.2.2",
"magento/module-inventory-bundle-product-indexer" => "1.1.1",
"magento/module-inventory-bundle-import-export" => "1.1.1",
"magento/module-inventory-cache" => "1.2.2",
"magento/module-inventory-catalog" => "1.2.2",
"magento/module-inventory-catalog-admin-ui" => "1.2.2",
"magento/module-inventory-catalog-api" => "1.3.2",
"magento/module-inventory-catalog-search" => "1.2.2",
"magento/module-inventory-configurable-product" => "1.2.2",
"magento/module-inventory-configurable-product-admin-ui" => "1.2.2",
"magento/module-inventory-configurable-product-indexer" => "1.2.2",
"magento/module-inventory-configuration" => "1.2.2",
"magento/module-inventory-configuration-api" => "1.2.1",
"magento/module-inventory-distance-based-source-selection" => "1.2.2",
"magento/module-inventory-distance-based-source-selection-admin-ui" => "1.2.1",
"magento/module-inventory-distance-based-source-selection-api" => "1.2.1",
"magento/module-inventory-elasticsearch" => "1.2.1",
"magento/module-inventory-export-stock" => "1.2.1",
"magento/module-inventory-export-stock-api" => "1.2.1",
"magento/module-inventory-graph-ql" => "1.2.1",
"magento/module-inventory-grouped-product" => "1.2.2",
"magento/module-inventory-grouped-product-admin-ui" => "1.2.2",
"magento/module-inventory-grouped-product-indexer" => "1.2.2",
"magento/module-inventory-import-export" => "1.2.2",
"magento/module-inventory-indexer" => "2.1.2",
"magento/module-inventory-in-store-pickup" => "1.1.1",
"magento/module-inventory-in-store-pickup-admin-ui" => "1.1.1",
"magento/module-inventory-in-store-pickup-api" => "1.1.1",
"magento/module-inventory-in-store-pickup-frontend" => "1.1.2",
"magento/module-inventory-in-store-pickup-graph-ql" => "1.1.1",
"magento/module-inventory-in-store-pickup-multishipping" => "1.1.1",
"magento/module-inventory-in-store-pickup-quote" => "1.1.1",
"magento/module-inventory-in-store-pickup-quote-graph-ql" => "1.1.1",
"magento/module-inventory-in-store-pickup-sales" => "1.1.1",
"magento/module-inventory-in-store-pickup-sales-admin-ui" => "1.1.2",
"magento/module-inventory-in-store-pickup-sales-api" => "1.1.1",
"magento/module-inventory-in-store-pickup-shipping" => "1.1.1",
"magento/module-inventory-in-store-pickup-shipping-admin-ui" => "1.1.1",
"magento/module-inventory-in-store-pickup-shipping-api" => "1.1.1",
"magento/module-inventory-in-store-pickup-webapi-extension" => "1.1.1",
"magento/module-inventory-low-quantity-notification" => "1.2.1",
"magento/module-inventory-low-quantity-notification-admin-ui" => "1.2.2",
"magento/module-inventory-low-quantity-notification-api" => "1.2.1",
"magento/module-inventory-multi-dimensional-indexer-api" => "1.2.1",
"magento/module-inventory-product-alert" => "1.2.2",
"magento/module-inventory-quote-graph-ql" => "1.0.1",
"magento/module-inventory-requisition-list" => "1.2.2",
"magento/module-inventory-reservation-cli" => "1.2.2",
"magento/module-inventory-reservations" => "1.2.1",
"magento/module-inventory-reservations-api" => "1.2.1",
"magento/module-inventory-sales" => "1.2.2",
"magento/module-inventory-sales-admin-ui" => "1.2.2",
"magento/module-inventory-sales-api" => "1.2.1",
"magento/module-inventory-sales-frontend-ui" => "1.2.2",
"magento/module-inventory-setup-fixture-generator" => "1.2.1",
"magento/module-inventory-shipping" => "1.2.2",
"magento/module-inventory-shipping-admin-ui" => "1.2.2",
"magento/module-inventory-source-deduction-api" => "1.2.2",
"magento/module-inventory-source-selection" => "1.2.1",
"magento/module-inventory-source-selection-api" => "1.4.1",
"magento/module-inventory-visual-merchandiser" => "1.1.2",
"magento/module-inventory-swatches-frontend-ui" => "1.0.1",
"magento/module-inventory-catalog-frontend-ui" => "1.0.2",
"magento/module-inventory-configurable-product-frontend-ui" => "1.0.2",
"magento/module-inventory-wishlist" => "1.0.1",
"magento/module-inventory-catalog-search-bundle-product" => "1.0.1",
"magento/module-inventory-catalog-search-configurable-product" => "1.0.1",
"magento/module-page-builder" => "2.2.2",
"magento/module-page-builder-analytics" => "1.6.2",
"magento/module-cms-page-builder-analytics" => "1.6.2",
"magento/module-page-builder-admin-analytics" => "1.1.2",
"magento/module-catalog-page-builder-analytics" => "1.6.2",
"magento/module-aws-s3-page-builder" => "1.0.2",
"magento/module-banner-page-builder" => "2.2.2",
"magento/module-banner-page-builder-analytics" => "1.7.1",
"magento/module-catalog-staging-page-builder" => "1.7.1",
"magento/module-staging-page-builder" => "2.2.2",
"magento/module-cms-page-builder-analytics-staging" => "1.7.1",
"magento/module-catalog-page-builder-analytics-staging" => "1.7.1",
"magento/module-page-builder-admin-gws-admin-ui" => "1.7.1"
];

/**
* @param \CliTester $I
* @param \Codeception\Example $data
Expand Down Expand Up @@ -74,6 +191,7 @@ public function _before(\CliTester $I): void
* @param \CliTester $I
* @param string $templateVersion
* @param string $magentoVersion
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function prepareTemplate(\CliTester $I, string $templateVersion, string $magentoVersion = null): void
{
Expand Down Expand Up @@ -103,6 +221,15 @@ protected function prepareTemplate(\CliTester $I, string $templateVersion, strin
);
}

if ($magentoVersion === '2.4.4') {
foreach ($this->dependencyListFor244 as $package => $version) {
$I->assertTrue(
$I->addDependencyToComposer($package, $version),
"Can not override dependency {$package} with version {$version} for Adobe Commerce 2.4.4"
);
}
}

if ($this->edition === 'CE' || $magentoVersion) {
$version = $magentoVersion ?: $this->getVersionRangeForMagento($I);
$I->removeDependencyFromComposer('magento/magento-cloud-metapackage');
Expand Down
26 changes: 13 additions & 13 deletions src/Test/Functional/Acceptance/B2Bx244x245Cest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@ class B2Bx244X245Cest extends AbstractCest
protected function patchesDataProvider(): array
{
return [
['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4'],
['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p1'],
['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p2'],
['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p3'],
['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p4'],
['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p5'],
['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p6'],
['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5'],
['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5-p1'],
['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5-p2'],
['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5-p3'],
['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5-p4'],
['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5-p5'],
['templateVersion' => '2.4.4-p1-p8', 'magentoVersion' => '2.4.4'],
['templateVersion' => '2.4.4-p1-p8', 'magentoVersion' => '2.4.4-p1'],
['templateVersion' => '2.4.4-p1-p8', 'magentoVersion' => '2.4.4-p2'],
['templateVersion' => '2.4.4-p1-p8', 'magentoVersion' => '2.4.4-p3'],
['templateVersion' => '2.4.4-p1-p8', 'magentoVersion' => '2.4.4-p4'],
['templateVersion' => '2.4.4-p1-p8', 'magentoVersion' => '2.4.4-p5'],
['templateVersion' => '2.4.4-p1-p8', 'magentoVersion' => '2.4.4-p6'],
['templateVersion' => '2.4.5-p1-p7', 'magentoVersion' => '2.4.5'],
['templateVersion' => '2.4.5-p1-p7', 'magentoVersion' => '2.4.5-p1'],
['templateVersion' => '2.4.5-p1-p7', 'magentoVersion' => '2.4.5-p2'],
['templateVersion' => '2.4.5-p1-p7', 'magentoVersion' => '2.4.5-p3'],
['templateVersion' => '2.4.5-p1-p7', 'magentoVersion' => '2.4.5-p4'],
['templateVersion' => '2.4.5-p1-p7', 'magentoVersion' => '2.4.5-p5'],
];
}
}
6 changes: 2 additions & 4 deletions support-patches.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6592,10 +6592,8 @@
"magento/inventory-metapackage": {
">=1.2.0 <1.2.4": {
"file": "os/ACSD-46541_1.2.3-p1.patch"
}
},
"magento/module-inventory-sales-admin-ui": {
"1.2.4": {
},
">=1.2.4 <1.2.6": {
"file": "os/ACSD-53287_2.4.4-p3_v2.patch"
}
}
Expand Down

0 comments on commit e1cf60d

Please sign in to comment.