Skip to content

Commit e1cf60d

Browse files
anadgitanadgit
authored
Mcloud 12571 (#161)
MCLOUD-12571
1 parent 84479c0 commit e1cf60d

File tree

3 files changed

+142
-17
lines changed

3 files changed

+142
-17
lines changed

‎src/Test/Functional/Acceptance/AbstractCest.php‎

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,123 @@ class AbstractCest
2525
*/
2626
protected $edition = 'B2B';
2727

28+
/**
29+
* @var array
30+
*/
31+
private $dependencyListFor244 = [
32+
"magento/module-re-captcha-admin-ui" => "1.1.2",
33+
"magento/module-re-captcha-checkout" => "1.1.2",
34+
"magento/module-re-captcha-contact" => "1.1.1",
35+
"magento/module-re-captcha-customer" => "1.1.2",
36+
"magento/module-re-captcha-frontend-ui" => "1.1.2",
37+
"magento/module-re-captcha-migration" => "1.1.2",
38+
"magento/module-re-captcha-newsletter" => "1.1.2",
39+
"magento/module-re-captcha-paypal" => "1.1.2",
40+
"magento/module-re-captcha-review" => "1.1.2",
41+
"magento/module-re-captcha-send-friend" => "1.1.2",
42+
"magento/module-re-captcha-store-pickup" => "1.0.1",
43+
"magento/module-re-captcha-ui" => "1.1.2",
44+
"magento/module-re-captcha-user" => "1.1.2",
45+
"magento/module-re-captcha-validation" => "1.1.1",
46+
"magento/module-re-captcha-validation-api" => "1.1.1",
47+
"magento/module-re-captcha-version-2-checkbox" => "2.0.2",
48+
"magento/module-re-captcha-version-2-invisible" => "2.0.2",
49+
"magento/module-re-captcha-version-3-invisible" => "2.0.2",
50+
"magento/module-re-captcha-webapi-api" => "1.0.1",
51+
"magento/module-re-captcha-webapi-rest" => "1.0.1",
52+
"magento/module-re-captcha-webapi-graph-ql" => "1.0.1",
53+
"magento/module-re-captcha-webapi-ui" => "1.0.1",
54+
"magento/module-securitytxt" => "1.1.1",
55+
"magento/module-two-factor-auth" => "1.1.3",
56+
"magento/module-re-captcha-checkout-sales-rule" => "1.1.0",
57+
"magento/inventory-composer-installer" => "1.2.0",
58+
"magento/module-inventory" => "1.2.2",
59+
"magento/module-inventory-admin-ui" => "1.2.2",
60+
"magento/module-inventory-advanced-checkout" => "1.2.1",
61+
"magento/module-inventory-api" => "1.2.2",
62+
"magento/module-inventory-bundle-product" => "1.2.1",
63+
"magento/module-inventory-bundle-product-admin-ui" => "1.2.2",
64+
"magento/module-inventory-bundle-product-indexer" => "1.1.1",
65+
"magento/module-inventory-bundle-import-export" => "1.1.1",
66+
"magento/module-inventory-cache" => "1.2.2",
67+
"magento/module-inventory-catalog" => "1.2.2",
68+
"magento/module-inventory-catalog-admin-ui" => "1.2.2",
69+
"magento/module-inventory-catalog-api" => "1.3.2",
70+
"magento/module-inventory-catalog-search" => "1.2.2",
71+
"magento/module-inventory-configurable-product" => "1.2.2",
72+
"magento/module-inventory-configurable-product-admin-ui" => "1.2.2",
73+
"magento/module-inventory-configurable-product-indexer" => "1.2.2",
74+
"magento/module-inventory-configuration" => "1.2.2",
75+
"magento/module-inventory-configuration-api" => "1.2.1",
76+
"magento/module-inventory-distance-based-source-selection" => "1.2.2",
77+
"magento/module-inventory-distance-based-source-selection-admin-ui" => "1.2.1",
78+
"magento/module-inventory-distance-based-source-selection-api" => "1.2.1",
79+
"magento/module-inventory-elasticsearch" => "1.2.1",
80+
"magento/module-inventory-export-stock" => "1.2.1",
81+
"magento/module-inventory-export-stock-api" => "1.2.1",
82+
"magento/module-inventory-graph-ql" => "1.2.1",
83+
"magento/module-inventory-grouped-product" => "1.2.2",
84+
"magento/module-inventory-grouped-product-admin-ui" => "1.2.2",
85+
"magento/module-inventory-grouped-product-indexer" => "1.2.2",
86+
"magento/module-inventory-import-export" => "1.2.2",
87+
"magento/module-inventory-indexer" => "2.1.2",
88+
"magento/module-inventory-in-store-pickup" => "1.1.1",
89+
"magento/module-inventory-in-store-pickup-admin-ui" => "1.1.1",
90+
"magento/module-inventory-in-store-pickup-api" => "1.1.1",
91+
"magento/module-inventory-in-store-pickup-frontend" => "1.1.2",
92+
"magento/module-inventory-in-store-pickup-graph-ql" => "1.1.1",
93+
"magento/module-inventory-in-store-pickup-multishipping" => "1.1.1",
94+
"magento/module-inventory-in-store-pickup-quote" => "1.1.1",
95+
"magento/module-inventory-in-store-pickup-quote-graph-ql" => "1.1.1",
96+
"magento/module-inventory-in-store-pickup-sales" => "1.1.1",
97+
"magento/module-inventory-in-store-pickup-sales-admin-ui" => "1.1.2",
98+
"magento/module-inventory-in-store-pickup-sales-api" => "1.1.1",
99+
"magento/module-inventory-in-store-pickup-shipping" => "1.1.1",
100+
"magento/module-inventory-in-store-pickup-shipping-admin-ui" => "1.1.1",
101+
"magento/module-inventory-in-store-pickup-shipping-api" => "1.1.1",
102+
"magento/module-inventory-in-store-pickup-webapi-extension" => "1.1.1",
103+
"magento/module-inventory-low-quantity-notification" => "1.2.1",
104+
"magento/module-inventory-low-quantity-notification-admin-ui" => "1.2.2",
105+
"magento/module-inventory-low-quantity-notification-api" => "1.2.1",
106+
"magento/module-inventory-multi-dimensional-indexer-api" => "1.2.1",
107+
"magento/module-inventory-product-alert" => "1.2.2",
108+
"magento/module-inventory-quote-graph-ql" => "1.0.1",
109+
"magento/module-inventory-requisition-list" => "1.2.2",
110+
"magento/module-inventory-reservation-cli" => "1.2.2",
111+
"magento/module-inventory-reservations" => "1.2.1",
112+
"magento/module-inventory-reservations-api" => "1.2.1",
113+
"magento/module-inventory-sales" => "1.2.2",
114+
"magento/module-inventory-sales-admin-ui" => "1.2.2",
115+
"magento/module-inventory-sales-api" => "1.2.1",
116+
"magento/module-inventory-sales-frontend-ui" => "1.2.2",
117+
"magento/module-inventory-setup-fixture-generator" => "1.2.1",
118+
"magento/module-inventory-shipping" => "1.2.2",
119+
"magento/module-inventory-shipping-admin-ui" => "1.2.2",
120+
"magento/module-inventory-source-deduction-api" => "1.2.2",
121+
"magento/module-inventory-source-selection" => "1.2.1",
122+
"magento/module-inventory-source-selection-api" => "1.4.1",
123+
"magento/module-inventory-visual-merchandiser" => "1.1.2",
124+
"magento/module-inventory-swatches-frontend-ui" => "1.0.1",
125+
"magento/module-inventory-catalog-frontend-ui" => "1.0.2",
126+
"magento/module-inventory-configurable-product-frontend-ui" => "1.0.2",
127+
"magento/module-inventory-wishlist" => "1.0.1",
128+
"magento/module-inventory-catalog-search-bundle-product" => "1.0.1",
129+
"magento/module-inventory-catalog-search-configurable-product" => "1.0.1",
130+
"magento/module-page-builder" => "2.2.2",
131+
"magento/module-page-builder-analytics" => "1.6.2",
132+
"magento/module-cms-page-builder-analytics" => "1.6.2",
133+
"magento/module-page-builder-admin-analytics" => "1.1.2",
134+
"magento/module-catalog-page-builder-analytics" => "1.6.2",
135+
"magento/module-aws-s3-page-builder" => "1.0.2",
136+
"magento/module-banner-page-builder" => "2.2.2",
137+
"magento/module-banner-page-builder-analytics" => "1.7.1",
138+
"magento/module-catalog-staging-page-builder" => "1.7.1",
139+
"magento/module-staging-page-builder" => "2.2.2",
140+
"magento/module-cms-page-builder-analytics-staging" => "1.7.1",
141+
"magento/module-catalog-page-builder-analytics-staging" => "1.7.1",
142+
"magento/module-page-builder-admin-gws-admin-ui" => "1.7.1"
143+
];
144+
28145
/**
29146
* @param \CliTester $I
30147
* @param \Codeception\Example $data
@@ -74,6 +191,7 @@ public function _before(\CliTester $I): void
74191
* @param \CliTester $I
75192
* @param string $templateVersion
76193
* @param string $magentoVersion
194+
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
77195
*/
78196
protected function prepareTemplate(\CliTester $I, string $templateVersion, string $magentoVersion = null): void
79197
{
@@ -103,6 +221,15 @@ protected function prepareTemplate(\CliTester $I, string $templateVersion, strin
103221
);
104222
}
105223

224+
if ($magentoVersion === '2.4.4') {
225+
foreach ($this->dependencyListFor244 as $package => $version) {
226+
$I->assertTrue(
227+
$I->addDependencyToComposer($package, $version),
228+
"Can not override dependency {$package} with version {$version} for Adobe Commerce 2.4.4"
229+
);
230+
}
231+
}
232+
106233
if ($this->edition === 'CE' || $magentoVersion) {
107234
$version = $magentoVersion ?: $this->getVersionRangeForMagento($I);
108235
$I->removeDependencyFromComposer('magento/magento-cloud-metapackage');

‎src/Test/Functional/Acceptance/B2Bx244x245Cest.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ class B2Bx244X245Cest extends AbstractCest
2626
protected function patchesDataProvider(): array
2727
{
2828
return [
29-
['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4'],
30-
['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p1'],
31-
['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p2'],
32-
['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p3'],
33-
['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p4'],
34-
['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p5'],
35-
['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p6'],
36-
['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5'],
37-
['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5-p1'],
38-
['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5-p2'],
39-
['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5-p3'],
40-
['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5-p4'],
41-
['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5-p5'],
29+
['templateVersion' => '2.4.4-p1-p8', 'magentoVersion' => '2.4.4'],
30+
['templateVersion' => '2.4.4-p1-p8', 'magentoVersion' => '2.4.4-p1'],
31+
['templateVersion' => '2.4.4-p1-p8', 'magentoVersion' => '2.4.4-p2'],
32+
['templateVersion' => '2.4.4-p1-p8', 'magentoVersion' => '2.4.4-p3'],
33+
['templateVersion' => '2.4.4-p1-p8', 'magentoVersion' => '2.4.4-p4'],
34+
['templateVersion' => '2.4.4-p1-p8', 'magentoVersion' => '2.4.4-p5'],
35+
['templateVersion' => '2.4.4-p1-p8', 'magentoVersion' => '2.4.4-p6'],
36+
['templateVersion' => '2.4.5-p1-p7', 'magentoVersion' => '2.4.5'],
37+
['templateVersion' => '2.4.5-p1-p7', 'magentoVersion' => '2.4.5-p1'],
38+
['templateVersion' => '2.4.5-p1-p7', 'magentoVersion' => '2.4.5-p2'],
39+
['templateVersion' => '2.4.5-p1-p7', 'magentoVersion' => '2.4.5-p3'],
40+
['templateVersion' => '2.4.5-p1-p7', 'magentoVersion' => '2.4.5-p4'],
41+
['templateVersion' => '2.4.5-p1-p7', 'magentoVersion' => '2.4.5-p5'],
4242
];
4343
}
4444
}

‎support-patches.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6592,10 +6592,8 @@
65926592
"magento/inventory-metapackage": {
65936593
">=1.2.0 <1.2.4": {
65946594
"file": "os/ACSD-46541_1.2.3-p1.patch"
6595-
}
6596-
},
6597-
"magento/module-inventory-sales-admin-ui": {
6598-
"1.2.4": {
6595+
},
6596+
">=1.2.4 <1.2.6": {
65996597
"file": "os/ACSD-53287_2.4.4-p3_v2.patch"
66006598
}
66016599
}

0 commit comments

Comments
 (0)