minor #50849 [WebProfilerBundle] Fix minify test after JS refactor (wouterj)

nicolas-grekas · nicolas-grekas · commit 03e4b87556ea · 2023-07-03T13:58:48.000+02:00
This PR was merged into the 6.4 branch. Discussion ---------- [WebProfilerBundle] Fix minify test after JS refactor | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - This test makes sure the JS files are valid after we "minify" them by removing newlines. After the refactor of #50790, it was not updated correctly causing a red CI. This fixes the test, and makes it more future proof. Commits ------- 3caa17a [WebProfilerBundle] Improve minify test after JS refactor
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Resources/MinifyTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Resources/MinifyTest.php
@@ -23,8 +23,12 @@ class MinifyTest extends TestCase
     public function testNoSingleLineComments()
     {
         $dir = \dirname(__DIR__, 2).'/Resources/views/Profiler';
-        $message = 'There cannot be any single line comment in this file. Consider using multiple line comment. ';
-        $this->assertTrue(2 === substr_count(file_get_contents($dir.'/base_js.html.twig'), '//'), $message);
-        $this->assertTrue(0 === substr_count(file_get_contents($dir.'/toolbar.css.twig'), '//'), $message);
+
+        foreach (glob($dir.'/*js.html.twig') as $jsFile) {
+            $fileContents = file_get_contents($dir.'/base_js.html.twig');
+            $fileContents = str_replace('\'//\'', '', $fileContents);
+
+            $this->assertEquals(0, substr_count($fileContents, '//'), 'There cannot be any single line comment in "'.$jsFile.'". Consider using multiple line comment. ');
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,12 @@ class MinifyTest extends TestCase`
`23`	`23`	`public function testNoSingleLineComments()`
`24`	`24`	`{`
`25`	`25`	`$dir = \dirname(__DIR__, 2).'/Resources/views/Profiler';`
`26`		`- $message = 'There cannot be any single line comment in this file. Consider using multiple line comment. ';`
`27`		`- $this->assertTrue(2 === substr_count(file_get_contents($dir.'/base_js.html.twig'), '//'), $message);`
`28`		`- $this->assertTrue(0 === substr_count(file_get_contents($dir.'/toolbar.css.twig'), '//'), $message);`
	`26`	`+`
	`27`	`+ foreach (glob($dir.'/*js.html.twig') as $jsFile) {`
	`28`	`+ $fileContents = file_get_contents($dir.'/base_js.html.twig');`
	`29`	`+ $fileContents = str_replace('\'//\'', '', $fileContents);`
	`30`	`+`
	`31`	`+ $this->assertEquals(0, substr_count($fileContents, '//'), 'There cannot be any single line comment in "'.$jsFile.'". Consider using multiple line comment. ');`
	`32`	`+ }`
`29`	`33`	`}`
`30`	`34`	`}`