Merge pull request #6463 from RuslanKostiv1/SFAPP-188-composer-test-blacklist

RuslanKostiv1 · web-flow · commit 285b3975c67a · 2020-12-18T16:01:42.000-06:00
SFAPP-188: ComposetTest fails on blacklisted modules
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
@@ -266,8 +266,10 @@ private function assertAutoloadRegistrar(\StdClass $json, $dir)
      */
     private function assertNoVersionSpecified(\StdClass $json)
     {
-        $errorMessage = 'Version must not be specified in the root and package composer JSON files in Git';
-        $this->assertObjectNotHasAttribute('version', $json, $errorMessage);
+        if (!in_array($json->name, self::$rootComposerModuleBlacklist)) {
+            $errorMessage = 'Version must not be specified in the root and package composer JSON files in Git';
+            $this->assertObjectNotHasAttribute('version', $json, $errorMessage);
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -266,8 +266,10 @@ private function assertAutoloadRegistrar(\StdClass $json, $dir)`
`266`	`266`	`*/`
`267`	`267`	`private function assertNoVersionSpecified(\StdClass $json)`
`268`	`268`	`{`
`269`		`- $errorMessage = 'Version must not be specified in the root and package composer JSON files in Git';`
`270`		`- $this->assertObjectNotHasAttribute('version', $json, $errorMessage);`
	`269`	`+ if (!in_array($json->name, self::$rootComposerModuleBlacklist)) {`
	`270`	`+ $errorMessage = 'Version must not be specified in the root and package composer JSON files in Git';`
	`271`	`+ $this->assertObjectNotHasAttribute('version', $json, $errorMessage);`
	`272`	`+ }`
`271`	`273`	`}`
`272`	`274`
`273`	`275`	`/**`