Merge pull request #316 from Yoast/JRF/yoastcs-fix-some-tests-not-run…

…ning YoastCS: fix some tests not running
Yoast · Nov 3, 2023 · 7f0ba01 · 7f0ba01
2 parents f84b4aa + 85eb928
commit 7f0ba01
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/Yoast/Tests/Files/TestDoublesUnitTest.php b/Yoast/Tests/Files/TestDoublesUnitTest.php
@@ -41,7 +41,7 @@ public function setCliValues( $testFile, $config ) {
 	 */
 	protected function getTestFiles( $testFileBase ) {
 		$sep        = \DIRECTORY_SEPARATOR;
-		$test_files = \glob( \dirname( $testFileBase ) . $sep . 'TestDoublesUnitTests{' . $sep . ',' . $sep . '*' . $sep . '}*.inc', \GLOB_BRACE );
+		$test_files = \glob( \dirname( $testFileBase ) . $sep . 'TestDoublesUnitTests' . $sep . 'tests{' . $sep . ',' . $sep . '*' . $sep . '}*.inc', \GLOB_BRACE );
 
 		if ( ! empty( $test_files ) ) {
 			return $test_files;
@@ -117,7 +117,7 @@ public function getErrorList( $testFile = '' ) {
 			// In tests/mocks.
 			case 'correct-custom-dir-not-mock.inc':
 				return [
-					3 => 1,
+					4 => 1,
 				];
 
 			case 'not-double-or-mock.inc': // In tests.

diff --git a/Yoast/Tests/NamingConventions/NamespaceNameUnitTest.php b/Yoast/Tests/NamingConventions/NamespaceNameUnitTest.php
@@ -42,7 +42,15 @@ public function setCliValues( $testFile, $config ) {
 	 */
 	protected function getTestFiles( $testFileBase ) {
 		$sep        = \DIRECTORY_SEPARATOR;
-		$test_files = \glob( \dirname( $testFileBase ) . $sep . 'NamespaceNameUnitTests{' . $sep . ',' . $sep . '*' . $sep . '}*.inc', \GLOB_BRACE );
+		$test_files = \glob(
+			\dirname( $testFileBase ) . $sep . 'NamespaceNameUnitTests{'
+				. $sep . ','                                  // Files in the "NamespaceNameUnitTests" directory.
+				. $sep . '*' . $sep . ','                     // Files in first-level subdirectories.
+				. $sep . '*' . $sep . '*' . $sep . ','        // Files in second-level subdirectories.
+				. $sep . '*' . $sep . '*' . $sep . '*' . $sep // Files in third-level subdirectories.
+			. '}*.inc',
+			\GLOB_BRACE
+		);
 
 		if ( ! empty( $test_files ) ) {
 			return $test_files;