Merge branch 'master' into matrix-datasets

# Conflicts:
#	tests/.snapshots/success.txt
This commit is contained in:
Fabio Ivona
2021-06-10 09:01:09 +02:00
5 changed files with 40 additions and 47 deletions

View File

@ -6,7 +6,7 @@ namespace Pest;
function version(): string
{
return '1.3.0';
return '1.3.2';
}
function testDirectory(string $file = ''): string

View File

@ -19,6 +19,11 @@ use PHPUnit\Framework\TestCase;
*/
final class TestRepository
{
/**
* @var string
*/
private const SEPARATOR = '>>>';
/**
* @var array<string, TestCaseFactory>
*/
@ -50,7 +55,7 @@ final class TestRepository
[$classOrTraits, $groups, $hooks] = $uses;
$setClassName = function (TestCaseFactory $testCase, string $key) use ($path, $classOrTraits, $groups, $startsWith, $hooks): void {
[$filename] = explode('@', $key);
[$filename] = explode(self::SEPARATOR, $key);
if ((!is_dir($path) && $filename === $path) || (is_dir($path) && $startsWith($filename, $path))) {
foreach ($classOrTraits as $class) { /** @var string $class */
@ -131,10 +136,10 @@ final class TestRepository
throw ShouldNotHappen::fromMessage('Trying to create a test without description.');
}
if (array_key_exists(sprintf('%s@%s', $test->filename, $test->description), $this->state)) {
if (array_key_exists(sprintf('%s%s%s', $test->filename, self::SEPARATOR, $test->description), $this->state)) {
throw new TestAlreadyExist($test->filename, $test->description);
}
$this->state[sprintf('%s@%s', $test->filename, $test->description)] = $test;
$this->state[sprintf('%s%s%s', $test->filename, self::SEPARATOR, $test->description)] = $test;
}
}