Skip to content

Commit b0fab9c

Browse files
committed
AC-9497: Improved message and naming for clarity
1 parent 521be73 commit b0fab9c

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

dev/tests/static/testsuite/Magento/Test/GraphQl/LiveCodeTest.php

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ class LiveCodeTest extends TestCase
3737
'Magento\Framework\View\Element\UiComponentInterface',
3838
'Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface',
3939
];
40-
//'Magento\Framework\DataObject\IdentityInterface',
4140

4241
/**
4342
* Setup basics for all tests
@@ -78,10 +77,12 @@ public function testCodeStyle(): void
7877
public function testModulesRequireGraphQLChange(): void
7978
{
8079
$modulesRequireGraphQLChange = self::getModulesRequiringGraphQLChange();
80+
$graphQlModules = implode(", ", $modulesRequireGraphQLChange);
8181
$this->assertEmpty(
8282
$modulesRequireGraphQLChange,
83-
"Required GraphQL changes to module: (" .
84-
implode(", ", $modulesRequireGraphQLChange) .") are not included in the pull request"
83+
"The view layer changes have been detected in the " .
84+
str_replace("GraphQl", "", $graphQlModules) . " module. " .
85+
"The " . $graphQlModules ." module is expected to be updated to reflect these changes."
8586
);
8687
}
8788

@@ -99,7 +100,7 @@ private static function getModulesRequiringGraphQLChange(): array
99100
'/_files/whitelist/graphql.txt'
100101
);
101102

102-
$affectedModules = [];
103+
$updatedGraphQlModules = [];
103104
$requireGraphQLChanges = [];
104105
foreach ($whitelistFiles as $whitelistFile) {
105106
$moduleName = self::getModuleName($whitelistFile);
@@ -109,16 +110,16 @@ private static function getModulesRequiringGraphQLChange(): array
109110
}
110111

111112
$isGraphQlModule = str_ends_with($moduleName, 'GraphQl');
112-
if (!in_array($moduleName, $affectedModules) && $isGraphQlModule) {
113-
$affectedModules[] = $moduleName;
113+
if (!in_array($moduleName, $updatedGraphQlModules) && $isGraphQlModule) {
114+
$updatedGraphQlModules[] = $moduleName;
114115
continue;
115116
}
116117

117-
if (!in_array($moduleName, $requireGraphQLChanges) && self::isUiComponent($whitelistFile)) {
118+
if (!in_array($moduleName, $requireGraphQLChanges) && self::isViewLayerClass($whitelistFile)) {
118119
$requireGraphQLChanges[] = $moduleName . "GraphQl";
119120
}
120121
}
121-
return array_diff($requireGraphQLChanges, $affectedModules);
122+
return array_diff($requireGraphQLChanges, $updatedGraphQlModules);
122123
}
123124

124125
/**
@@ -141,7 +142,7 @@ private static function getModuleName(string $filePath): string
141142
* @param string $filePath
142143
* @return bool
143144
*/
144-
private static function isUiComponent(string $filePath): bool
145+
private static function isViewLayerClass(string $filePath): bool
145146
{
146147
$className = self::getClassNameWithNamespace($filePath);
147148
if (!$className) {

0 commit comments

Comments
 (0)