Merge pull request #6302 from Codeception/fix-wildcard-group-match

Fixed wildcard matching of group files
Codeception · Dec 22, 2021 · c873087 · c873087
2 parents 8ebbb00 + 36f3259
commit c873087
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/src/Codeception/Lib/GroupManager.php b/src/Codeception/Lib/GroupManager.php
@@ -56,14 +56,15 @@ protected function loadGroupsByPattern()
                 ->sortByName()
                 ->in($path);
 
-            $i = 1;
-
-
             foreach ($files as $file) {
                 /** @var SplFileInfo $file * */
-                $this->configuredGroups[str_replace('*', $i, $group)] = dirname($pattern).DIRECTORY_SEPARATOR.$file->getRelativePathname();
-                $i++;
+                $prefix = str_replace('*', '', $group);
+                $pathPrefix = str_replace('*', '', basename($pattern));
+                $groupName = $prefix . str_replace($pathPrefix, '', $file->getRelativePathname());
+
+                $this->configuredGroups[$groupName] = dirname($pattern) . DIRECTORY_SEPARATOR . $file->getRelativePathname();
             }
+
             unset($this->configuredGroups[$group]);
         }
     }

diff --git a/tests/data/group_manager_test/group_chunk_1_1 b/tests/data/group_manager_test/group_chunk_1_1
@@ -0,0 +1 @@
+tests/data/group_manager_test/UserTest.php
diff --git a/tests/data/group_manager_test/group_chunk_1_2 b/tests/data/group_manager_test/group_chunk_1_2
@@ -0,0 +1 @@
+tests/data/group_manager_test/PostTest.php
diff --git a/tests/unit/Codeception/Lib/GroupManagerTest.php b/tests/unit/Codeception/Lib/GroupManagerTest.php
@@ -76,11 +76,23 @@ public function testGroupsByPattern()
         $this->assertContains('group_2', $this->manager->groupsForTest($test2));
     }
 
+
+    public function testGroupsByPatternWithMultipleDigits()
+    {
+        $this->manager = new GroupManager(['group_chunk_*' => 'tests/data/group_manager_test/group_chunk_*']);
+        $test1 = $this->makeTestCase('tests/data/group_manager_test/UserTest.php');
+        $test2 = $this->makeTestCase('tests/data/group_manager_test/PostTest.php');
+
+        $this->assertContains('group_chunk_1_1', $this->manager->groupsForTest($test1));
+        $this->assertContains('group_chunk_1_2', $this->manager->groupsForTest($test2));
+    }
+
     public function testGroupsByDifferentPattern()
     {
         $this->manager = new GroupManager(['g_*' => 'tests/data/group_manager_test/group_*']);
         $test1 = $this->makeTestCase('tests/data/group_manager_test/UserTest.php');
         $test2 = $this->makeTestCase('tests/data/group_manager_test/PostTest.php');
+
         $this->assertContains('g_1', $this->manager->groupsForTest($test1));
         $this->assertContains('g_2', $this->manager->groupsForTest($test2));
     }