Skip to content

Commit b731570

Browse files
sivaram7sivaram7
authored
Stabilize functional tests (#111)
1 parent 796105f commit b731570

File tree

3 files changed

+146
-9
lines changed

3 files changed

+146
-9
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"composer/semver": "@stable",
1818
"monolog/monolog": "^1.25||^2.3||^2.7",
1919
"symfony/config": "^3.3||^4.4||^5.0||^6.0",
20-
"symfony/console": "^2.6||^4.0||^5.0||^6.0",
20+
"symfony/console": "^2.8 || ^4.0 || ^5.1 || ^5.4 || ^6.4",
2121
"symfony/dependency-injection": "^3.3||^4.3||^5.0||^6.0",
2222
"symfony/process": "^2.1 || ^4.1 || ^5.1 || ^5.4 || ^6.4",
2323
"symfony/proxy-manager-bridge": "^3.3||^4.3||^5.0||^6.0",

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

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,124 @@ class AbstractCest
1717
*/
1818
protected $edition = 'EE';
1919

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

180+
if ($magentoVersion === '2.4.4') {
181+
foreach ($this->dependencyListFor244 as $package => $version) {
182+
$I->assertTrue(
183+
$I->addDependencyToComposer($package, $version),
184+
"Can not override dependency {$package} with version {$version} for Adobe Commerce 2.4.4"
185+
);
186+
}
187+
}
188+
61189
if ($this->edition === 'CE' || $magentoVersion) {
62190
$version = $magentoVersion ?: $this->getVersionRangeForMagento($I);
63191
$I->removeDependencyFromComposer('magento/magento-cloud-metapackage');

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

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,23 @@ class Acceptance81Cest extends AcceptanceCest
1818
protected function patchesDataProvider(): array
1919
{
2020
return [
21-
['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4'],
22-
['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p1'],
23-
['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p2'],
24-
['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p3'],
25-
['templateVersion' => '2.4.4', 'magentoVersion' => '2.4.4-p4'],
26-
['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5'],
27-
['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5-p1'],
28-
['templateVersion' => '2.4.5', 'magentoVersion' => '2.4.5-p2'],
21+
['templateVersion' => '2.4.4-p1-p8', 'magentoVersion' => '2.4.4'],
22+
['templateVersion' => '2.4.4-p1-p8', 'magentoVersion' => '2.4.4-p1'],
23+
['templateVersion' => '2.4.4-p1-p8', 'magentoVersion' => '2.4.4-p2'],
24+
['templateVersion' => '2.4.4-p1-p8', 'magentoVersion' => '2.4.4-p3'],
25+
['templateVersion' => '2.4.4-p1-p8', 'magentoVersion' => '2.4.4-p4'],
26+
['templateVersion' => '2.4.4-p1-p8', 'magentoVersion' => '2.4.4-p5'],
27+
['templateVersion' => '2.4.4-p1-p8', 'magentoVersion' => '2.4.4-p6'],
28+
['templateVersion' => '2.4.4-p1-p8', 'magentoVersion' => '2.4.4-p7'],
29+
['templateVersion' => '2.4.4-p1-p8', 'magentoVersion' => '2.4.4-p8'],
30+
['templateVersion' => '2.4.5-p1-p7', 'magentoVersion' => '2.4.5'],
31+
['templateVersion' => '2.4.5-p1-p7', 'magentoVersion' => '2.4.5-p1'],
32+
['templateVersion' => '2.4.5-p1-p7', 'magentoVersion' => '2.4.5-p2'],
33+
['templateVersion' => '2.4.5-p1-p7', 'magentoVersion' => '2.4.5-p3'],
34+
['templateVersion' => '2.4.5-p1-p7', 'magentoVersion' => '2.4.5-p4'],
35+
['templateVersion' => '2.4.5-p1-p7', 'magentoVersion' => '2.4.5-p5'],
36+
['templateVersion' => '2.4.5-p1-p7', 'magentoVersion' => '2.4.5-p6'],
37+
['templateVersion' => '2.4.5-p1-p7', 'magentoVersion' => '2.4.5-p7'],
2938
];
3039
}
3140
}

0 commit comments

Comments
 (0)