Skip to content

Commit 6478201

Browse files
committed
ACPT-987: Evaluate State check testing from PR
- Fix Static Tests failures
1 parent 510841e commit 6478201

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

dev/tests/integration/testsuite/Magento/GraphQl/_files/state-skip-list.php

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
Magento\ConfigurableProductGraphQl\Model\Variant\Collection::class => null,
3939
Magento\ConfigurableProductGraphQl\Model\Options\Collection::class => null,
4040
Magento\Framework\Url\QueryParamsResolver::class => null,
41-
Magento\Framework\Event\Config\Data::class => null, // TODO: Make sure this is reset when config is reset from poison pill
41+
Magento\Framework\Event\Config\Data::class => null, // TODO: reset when config is reset from poison pill
4242
Magento\Framework\App\AreaList::class => null,
4343
'customRemoteFilesystem' => null,
4444
Magento\Store\App\Config\Type\Scopes::class => null,
@@ -76,11 +76,11 @@
7676
Magento\Framework\Locale\Resolver::class => null, // TODO: do we need to fix this?
7777
Magento\Theme\Model\ResourceModel\Theme\Collection::class => null, // TODO
7878
Magento\Store\Model\GroupRepository::class => null, // TODO: see what this is
79-
Magento\Store\Model\StoreRepository::class => null, // TODO: Ask Aakash is this is the one that was fixed already with Poison Pill
80-
Magento\Framework\View\Design\Fallback\RulePool::class => null, // TODO: rules change. Looks like we need to reset?
79+
Magento\Store\Model\StoreRepository::class => null, // TODO: could be fixed already with Poison Pill
80+
Magento\Framework\View\Design\Fallback\RulePool::class => null, // TODO: Looks like we need to reset?
8181
Magento\Framework\View\Asset\Repository::class => null, // TODO: Looks okay, but need to confirm
8282
Magento\Framework\HTTP\Header::class => null, // TODO: I believe Aakash is currently working on this
83-
Magento\Framework\App\Route\Config::class => null, // TODO: Make sure this is reset when Poison Pill causes config to reset.
83+
Magento\Framework\App\Route\Config::class => null, // TODO: reset when Poison Pill causes config to reset.
8484
Magento\Customer\Model\ResourceModel\Attribute::class => null, // TODO
8585
Magento\Framework\DataObject\Copy\Config\Converter::class => null, // TODO
8686
Magento\Framework\DataObject\Copy\Config\SchemaLocator::class => null, // TODO
@@ -90,15 +90,17 @@
9090
Magento\AwsS3\Driver\CredentialsCache::class => null, // TODO
9191
Magento\Eav\Model\Config::class => null, // TODO: Does this work properly after config changes?
9292
'AssetPreProcessorPool' => null, // TODO: see what this is
93-
Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider::class => null, // FIXME: this is bug or needs to be reset?
93+
Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider::class => null, // FIXME: bug?
9494
Magento\GraphQl\Model\Query\Context::class => null, // FIXME: I think this one needs to be reset. Check!
9595
Magento\GraphQl\Model\Query\ContextFactory::class => null, // FIXME: I think this one needs to be reset. Check!
96-
'viewFileMinifiedFallbackResolver' => null, // FIXME: this MUST be removed from list after Magento\Framework\View\Asset\Minification is fixed
96+
'viewFileMinifiedFallbackResolver' => null, // FIXME: remove after fix for Framework\View\Asset\Minification
9797
Magento\Framework\View\Asset\Minification::class => null, // FIXME: $configCache must be reset
98-
Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection::class => null, // FIXME: We MUST NOT dependency inject collections. This needs to be fixed inMagento\CatalogGraphQl\Model\Config\SortAttributeReader
98+
// FIXME: We MUST NOT dependency inject collections.
99+
// This needs to be fixed in Magento\CatalogGraphQl\Model\Config\SortAttributeReader
100+
Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection::class => null,
99101
Magento\Framework\Url::class => null, // FIXME: This need reseter!!
100-
Magento\Quote\Model\Quote\Address\Total\Collector::class => null, // FIXME: has mutable state that needs to be reset.
101-
Magento\Framework\HTTP\PhpEnvironment\RemoteAddress::class => null, // FIXME: $remoteAddress caching from $request which has mutable state
102+
Magento\Quote\Model\Quote\Address\Total\Collector::class => null, // FIXME: mutable state that needs to be reset
103+
Magento\Framework\HTTP\PhpEnvironment\RemoteAddress::class => null, // FIXME: caching from $request
102104
],
103105
'' => [
104106
],

dev/tests/static/testsuite/Magento/Test/Legacy/LegacyFixtureTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ public function testNew(): void
2525
$docUrl = 'https://developer.adobe.com/commerce/testing/guide/integration/attributes/data-fixture/';
2626
$files = AddedFiles::getAddedFilesList(__DIR__ . '/..');
2727
$legacyFixtureFiles = [];
28+
//pattern to ignore skip and filter files
29+
$skip_pattern = '/app\/code\/.*\/Tests?\/GraphQl\/_files\/(.*[filter|skip]-list(_ee|_b2b|).php)/';
2830
foreach ($files as $file) {
2931
if (pathinfo($file, PATHINFO_EXTENSION) === 'php'
3032
&& (
@@ -35,6 +37,7 @@ public function testNew(): void
3537
strpos($file, 'dev/tests/') === false
3638
&& preg_match('/app\/code\/.*\/Test.*\/(_files|Fixtures)/', $file)
3739
&& !preg_match('/app\/code\/.*\/Tests?\/Performance\/(_files|Fixtures)/', $file)
40+
&& !preg_match($skip_pattern, $file)
3841
)
3942
)
4043
) {

0 commit comments

Comments
 (0)