@@ -37,7 +37,6 @@ class LiveCodeTest extends TestCase
37
37
'Magento\Framework\View\Element\UiComponentInterface ' ,
38
38
'Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface ' ,
39
39
];
40
- //'Magento\Framework\DataObject\IdentityInterface',
41
40
42
41
/**
43
42
* Setup basics for all tests
@@ -78,10 +77,12 @@ public function testCodeStyle(): void
78
77
public function testModulesRequireGraphQLChange (): void
79
78
{
80
79
$ modulesRequireGraphQLChange = self ::getModulesRequiringGraphQLChange ();
80
+ $ graphQlModules = implode (", " , $ modulesRequireGraphQLChange );
81
81
$ this ->assertEmpty (
82
82
$ 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. "
85
86
);
86
87
}
87
88
@@ -99,7 +100,7 @@ private static function getModulesRequiringGraphQLChange(): array
99
100
'/_files/whitelist/graphql.txt '
100
101
);
101
102
102
- $ affectedModules = [];
103
+ $ updatedGraphQlModules = [];
103
104
$ requireGraphQLChanges = [];
104
105
foreach ($ whitelistFiles as $ whitelistFile ) {
105
106
$ moduleName = self ::getModuleName ($ whitelistFile );
@@ -109,16 +110,16 @@ private static function getModulesRequiringGraphQLChange(): array
109
110
}
110
111
111
112
$ 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 ;
114
115
continue ;
115
116
}
116
117
117
- if (!in_array ($ moduleName , $ requireGraphQLChanges ) && self ::isUiComponent ($ whitelistFile )) {
118
+ if (!in_array ($ moduleName , $ requireGraphQLChanges ) && self ::isViewLayerClass ($ whitelistFile )) {
118
119
$ requireGraphQLChanges [] = $ moduleName . "GraphQl " ;
119
120
}
120
121
}
121
- return array_diff ($ requireGraphQLChanges , $ affectedModules );
122
+ return array_diff ($ requireGraphQLChanges , $ updatedGraphQlModules );
122
123
}
123
124
124
125
/**
@@ -141,7 +142,7 @@ private static function getModuleName(string $filePath): string
141
142
* @param string $filePath
142
143
* @return bool
143
144
*/
144
- private static function isUiComponent (string $ filePath ): bool
145
+ private static function isViewLayerClass (string $ filePath ): bool
145
146
{
146
147
$ className = self ::getClassNameWithNamespace ($ filePath );
147
148
if (!$ className ) {
0 commit comments