mirror of
https://github.com/pestphp/pest.git
synced 2026-03-11 02:07:23 +01:00
Merge branch '2.x' into feature/traversable-sequence
This commit is contained in:
@ -7,12 +7,13 @@ namespace Pest\Bootstrappers;
|
||||
use Pest\Contracts\Bootstrapper;
|
||||
use Pest\Support\DatasetInfo;
|
||||
use Pest\Support\Str;
|
||||
use function Pest\testDirectory;
|
||||
use Pest\TestSuite;
|
||||
use RecursiveDirectoryIterator;
|
||||
use RecursiveIteratorIterator;
|
||||
use SebastianBergmann\FileIterator\Facade as PhpUnitFileIterator;
|
||||
|
||||
use function Pest\testDirectory;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*/
|
||||
|
||||
@ -62,6 +62,11 @@ trait Testable
|
||||
*/
|
||||
private static ?Closure $__afterAll = null;
|
||||
|
||||
/**
|
||||
* The list of snapshot changes, if any.
|
||||
*/
|
||||
private array $__snapshotChanges = [];
|
||||
|
||||
/**
|
||||
* Resets the test case static properties.
|
||||
*/
|
||||
@ -331,6 +336,24 @@ trait Testable
|
||||
return ExceptionTrace::ensure(fn (): mixed => call_user_func_array(Closure::bind($closure, $this, $this::class), $arguments));
|
||||
}
|
||||
|
||||
/** @postCondition */
|
||||
protected function __MarkTestIncompleteIfSnapshotHaveChanged(): void
|
||||
{
|
||||
if (count($this->__snapshotChanges) === 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (count($this->__snapshotChanges) === 1) {
|
||||
$this->markTestIncomplete($this->__snapshotChanges[0]);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$messages = implode(PHP_EOL, array_map(static fn (string $message): string => '- $message', $this->__snapshotChanges));
|
||||
|
||||
$this->markTestIncomplete($messages);
|
||||
}
|
||||
|
||||
/**
|
||||
* The printable test case name.
|
||||
*/
|
||||
|
||||
@ -128,6 +128,40 @@ final class Expectation
|
||||
exit(1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Dump the expectation value when the result of the condition is truthy.
|
||||
*
|
||||
* @param (\Closure(TValue): bool)|bool $condition
|
||||
* @return self<TValue>
|
||||
*/
|
||||
public function ddWhen(Closure|bool $condition, mixed ...$arguments): Expectation
|
||||
{
|
||||
$condition = $condition instanceof Closure ? $condition($this->value) : $condition;
|
||||
|
||||
if (! $condition) {
|
||||
return $this;
|
||||
}
|
||||
|
||||
$this->dd(...$arguments);
|
||||
}
|
||||
|
||||
/**
|
||||
* Dump the expectation value when the result of the condition is falsy.
|
||||
*
|
||||
* @param (\Closure(TValue): bool)|bool $condition
|
||||
* @return self<TValue>
|
||||
*/
|
||||
public function ddUnless(Closure|bool $condition, mixed ...$arguments): Expectation
|
||||
{
|
||||
$condition = $condition instanceof Closure ? $condition($this->value) : $condition;
|
||||
|
||||
if ($condition) {
|
||||
return $this;
|
||||
}
|
||||
|
||||
$this->dd(...$arguments);
|
||||
}
|
||||
|
||||
/**
|
||||
* Send the expectation value to Ray along with all given arguments.
|
||||
*
|
||||
|
||||
@ -4,9 +4,10 @@ declare(strict_types=1);
|
||||
|
||||
namespace Pest\Expectations;
|
||||
|
||||
use function expect;
|
||||
use Pest\Expectation;
|
||||
|
||||
use function expect;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*
|
||||
|
||||
@ -20,7 +20,7 @@ abstract class Attribute
|
||||
* @param array<int, string> $attributes
|
||||
* @return array<int, string>
|
||||
*/
|
||||
public function __invoke(TestCaseMethodFactory $method, array $attributes): array // @phpstan-ignore-line
|
||||
public function __invoke(TestCaseMethodFactory $method, array $attributes): array
|
||||
{
|
||||
return $attributes;
|
||||
}
|
||||
|
||||
@ -193,7 +193,7 @@ final class TestCaseFactory
|
||||
}
|
||||
PHP;
|
||||
|
||||
eval($classCode); // @phpstan-ignore-line
|
||||
eval($classCode);
|
||||
} catch (ParseError $caught) {
|
||||
throw new RuntimeException(sprintf(
|
||||
"Unable to create test case for test file at %s. \n %s",
|
||||
|
||||
@ -40,7 +40,7 @@ final class KernelDump
|
||||
*/
|
||||
public function disable(): void
|
||||
{
|
||||
@ob_clean(); // @phpstan-ignore-line
|
||||
@ob_clean();
|
||||
|
||||
if ($this->buffer !== '') {
|
||||
$this->flush();
|
||||
|
||||
@ -502,6 +502,18 @@ final class Expectation
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Asserts that the value contains only digits.
|
||||
*
|
||||
* @return self<TValue>
|
||||
*/
|
||||
public function toBeDigits(string $message = ''): self
|
||||
{
|
||||
Assert::assertTrue(ctype_digit((string) $this->value), $message);
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Asserts that the value is of type object.
|
||||
*
|
||||
@ -805,6 +817,12 @@ final class Expectation
|
||||
*/
|
||||
public function toMatchSnapshot(string $message = ''): self
|
||||
{
|
||||
$snapshots = TestSuite::getInstance()->snapshots;
|
||||
$snapshots->startNewExpectation();
|
||||
|
||||
$testCase = TestSuite::getInstance()->test;
|
||||
assert($testCase instanceof TestCase);
|
||||
|
||||
$string = match (true) {
|
||||
is_string($this->value) => $this->value,
|
||||
is_object($this->value) && method_exists($this->value, '__toString') => $this->value->__toString(),
|
||||
@ -817,22 +835,18 @@ final class Expectation
|
||||
default => InvalidExpectationValue::expected('array|object|string'),
|
||||
};
|
||||
|
||||
$testCase = TestSuite::getInstance()->test;
|
||||
assert($testCase instanceof TestCase);
|
||||
$snapshots = TestSuite::getInstance()->snapshots;
|
||||
|
||||
if ($snapshots->has($testCase, $string)) {
|
||||
[$filename, $content] = $snapshots->get($testCase, $string);
|
||||
if ($snapshots->has()) {
|
||||
[$filename, $content] = $snapshots->get();
|
||||
|
||||
Assert::assertSame(
|
||||
$content,
|
||||
$string,
|
||||
strtr($content, ["\r\n" => "\n", "\r" => "\n"]),
|
||||
strtr($string, ["\r\n" => "\n", "\r" => "\n"]),
|
||||
$message === '' ? "Failed asserting that the string value matches its snapshot ($filename)." : $message
|
||||
);
|
||||
} else {
|
||||
$filename = $snapshots->save($testCase, $string);
|
||||
$filename = $snapshots->save($string);
|
||||
|
||||
$testCase::markTestIncomplete('Snapshot created at ['.$filename.'].');
|
||||
TestSuite::getInstance()->registerSnapshotChange("Snapshot created at [$filename]");
|
||||
}
|
||||
|
||||
return $this;
|
||||
@ -959,4 +973,52 @@ final class Expectation
|
||||
|
||||
return $this->exporter->shortenedExport($value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Asserts that the value is uppercase.
|
||||
*
|
||||
* @return self<TValue>
|
||||
*/
|
||||
public function toBeUppercase(string $message = ''): self
|
||||
{
|
||||
Assert::assertTrue(ctype_upper((string) $this->value), $message);
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Asserts that the value is lowercase.
|
||||
*
|
||||
* @return self<TValue>
|
||||
*/
|
||||
public function toBeLowercase(string $message = ''): self
|
||||
{
|
||||
Assert::assertTrue(ctype_lower((string) $this->value), $message);
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Asserts that the value is alphanumeric.
|
||||
*
|
||||
* @return self<TValue>
|
||||
*/
|
||||
public function toBeAlphaNumeric(string $message = ''): self
|
||||
{
|
||||
Assert::assertTrue(ctype_alnum((string) $this->value), $message);
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Asserts that the value is alpha.
|
||||
*
|
||||
* @return self<TValue>
|
||||
*/
|
||||
public function toBeAlpha(string $message = ''): self
|
||||
{
|
||||
Assert::assertTrue(ctype_alpha((string) $this->value), $message);
|
||||
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@ namespace Pest;
|
||||
|
||||
function version(): string
|
||||
{
|
||||
return '2.11.0';
|
||||
return '2.15.0';
|
||||
}
|
||||
|
||||
function testDirectory(string $file = ''): string
|
||||
|
||||
@ -6,10 +6,11 @@ namespace Pest\Plugins;
|
||||
|
||||
use Pest\Contracts\Plugins\HandlesArguments;
|
||||
use Pest\Support\View;
|
||||
use function Pest\version;
|
||||
use PHPUnit\TextUI\Help as PHPUnitHelp;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
use function Pest\version;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*/
|
||||
|
||||
@ -13,11 +13,12 @@ use Pest\Plugins\Parallel\Paratest\CleanConsoleOutput;
|
||||
use Pest\Support\Arr;
|
||||
use Pest\Support\Container;
|
||||
use Pest\TestSuite;
|
||||
use function Pest\version;
|
||||
use Stringable;
|
||||
use Symfony\Component\Console\Application;
|
||||
use Symfony\Component\Console\Input\ArgvInput;
|
||||
|
||||
use function Pest\version;
|
||||
|
||||
final class Parallel implements HandlesArguments
|
||||
{
|
||||
use HandleArguments;
|
||||
|
||||
@ -4,6 +4,16 @@ declare(strict_types=1);
|
||||
|
||||
namespace Pest\Plugins\Parallel\Paratest;
|
||||
|
||||
use ParaTest\Options;
|
||||
use Pest\Plugins\Parallel\Support\CompactPrinter;
|
||||
use Pest\Support\StateGenerator;
|
||||
use PHPUnit\TestRunner\TestResult\TestResult;
|
||||
use PHPUnit\TextUI\Output\Printer;
|
||||
use SebastianBergmann\Timer\Duration;
|
||||
use SplFileInfo;
|
||||
use Symfony\Component\Console\Formatter\OutputFormatter;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
use function assert;
|
||||
use function fclose;
|
||||
use function feof;
|
||||
@ -12,16 +22,7 @@ use function fread;
|
||||
use function fseek;
|
||||
use function ftell;
|
||||
use function fwrite;
|
||||
use ParaTest\Options;
|
||||
use Pest\Plugins\Parallel\Support\CompactPrinter;
|
||||
use Pest\Support\StateGenerator;
|
||||
use PHPUnit\TestRunner\TestResult\TestResult;
|
||||
use PHPUnit\TextUI\Output\Printer;
|
||||
use SebastianBergmann\Timer\Duration;
|
||||
use SplFileInfo;
|
||||
use function strlen;
|
||||
use Symfony\Component\Console\Formatter\OutputFormatter;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
|
||||
@ -4,15 +4,9 @@ declare(strict_types=1);
|
||||
|
||||
namespace Pest\Plugins\Parallel\Paratest;
|
||||
|
||||
use function array_merge;
|
||||
use function array_merge_recursive;
|
||||
use function array_shift;
|
||||
use function assert;
|
||||
use function count;
|
||||
use const DIRECTORY_SEPARATOR;
|
||||
use function dirname;
|
||||
use function file_get_contents;
|
||||
use function max;
|
||||
|
||||
use NunoMaduro\Collision\Adapters\Phpunit\Support\ResultReflection;
|
||||
use ParaTest\Coverage\CoverageMerger;
|
||||
use ParaTest\JUnit\LogMerger;
|
||||
use ParaTest\JUnit\Writer;
|
||||
@ -29,11 +23,20 @@ use PHPUnit\TestRunner\TestResult\Facade as TestResultFacade;
|
||||
use PHPUnit\TestRunner\TestResult\TestResult;
|
||||
use PHPUnit\TextUI\Configuration\CodeCoverageFilterRegistry;
|
||||
use PHPUnit\Util\ExcludeList;
|
||||
use function realpath;
|
||||
use SebastianBergmann\Timer\Timer;
|
||||
use SplFileInfo;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
use Symfony\Component\Process\PhpExecutableFinder;
|
||||
|
||||
use function array_merge;
|
||||
use function array_merge_recursive;
|
||||
use function array_shift;
|
||||
use function assert;
|
||||
use function count;
|
||||
use function dirname;
|
||||
use function file_get_contents;
|
||||
use function max;
|
||||
use function realpath;
|
||||
use function unlink;
|
||||
use function unserialize;
|
||||
use function usleep;
|
||||
@ -273,7 +276,7 @@ final class WrapperRunner implements RunnerInterface
|
||||
assert($testResult instanceof TestResult);
|
||||
|
||||
$testResultSum = new TestResult(
|
||||
$testResultSum->numberOfTests() + $testResult->numberOfTests(),
|
||||
(int) $testResultSum->hasTests() + (int) $testResult->hasTests(),
|
||||
$testResultSum->numberOfTestsRun() + $testResult->numberOfTestsRun(),
|
||||
$testResultSum->numberOfAssertions() + $testResult->numberOfAssertions(),
|
||||
array_merge_recursive($testResultSum->testErroredEvents(), $testResult->testErroredEvents()),
|
||||
@ -282,23 +285,23 @@ final class WrapperRunner implements RunnerInterface
|
||||
array_merge_recursive($testResultSum->testSuiteSkippedEvents(), $testResult->testSuiteSkippedEvents()),
|
||||
array_merge_recursive($testResultSum->testSkippedEvents(), $testResult->testSkippedEvents()),
|
||||
array_merge_recursive($testResultSum->testMarkedIncompleteEvents(), $testResult->testMarkedIncompleteEvents()),
|
||||
array_merge_recursive($testResultSum->testTriggeredDeprecationEvents(), $testResult->testTriggeredDeprecationEvents()),
|
||||
array_merge_recursive($testResultSum->testTriggeredPhpDeprecationEvents(), $testResult->testTriggeredPhpDeprecationEvents()),
|
||||
array_merge_recursive($testResultSum->testTriggeredPhpunitDeprecationEvents(), $testResult->testTriggeredPhpunitDeprecationEvents()),
|
||||
array_merge_recursive($testResultSum->testTriggeredErrorEvents(), $testResult->testTriggeredErrorEvents()),
|
||||
array_merge_recursive($testResultSum->testTriggeredNoticeEvents(), $testResult->testTriggeredNoticeEvents()),
|
||||
array_merge_recursive($testResultSum->testTriggeredPhpNoticeEvents(), $testResult->testTriggeredPhpNoticeEvents()),
|
||||
array_merge_recursive($testResultSum->testTriggeredWarningEvents(), $testResult->testTriggeredWarningEvents()),
|
||||
array_merge_recursive($testResultSum->testTriggeredPhpWarningEvents(), $testResult->testTriggeredPhpWarningEvents()),
|
||||
array_merge_recursive($testResultSum->testTriggeredPhpunitErrorEvents(), $testResult->testTriggeredPhpunitErrorEvents()),
|
||||
array_merge_recursive($testResultSum->testTriggeredPhpunitWarningEvents(), $testResult->testTriggeredPhpunitWarningEvents()),
|
||||
array_merge_recursive($testResultSum->testRunnerTriggeredDeprecationEvents(), $testResult->testRunnerTriggeredDeprecationEvents()),
|
||||
array_merge_recursive($testResultSum->testRunnerTriggeredWarningEvents(), $testResult->testRunnerTriggeredWarningEvents()),
|
||||
array_merge_recursive($testResultSum->errors(), $testResult->errors()),
|
||||
array_merge_recursive($testResultSum->deprecations(), $testResult->deprecations()),
|
||||
array_merge_recursive($testResultSum->notices(), $testResult->notices()),
|
||||
array_merge_recursive($testResultSum->warnings(), $testResult->warnings()),
|
||||
array_merge_recursive($testResultSum->phpDeprecations(), $testResult->phpDeprecations()),
|
||||
array_merge_recursive($testResultSum->phpNotices(), $testResult->phpNotices()),
|
||||
array_merge_recursive($testResultSum->phpWarnings(), $testResult->phpWarnings()),
|
||||
);
|
||||
}
|
||||
|
||||
$testResultSum = new TestResult(
|
||||
$testResultSum->numberOfTests(),
|
||||
ResultReflection::numberOfTests($testResultSum),
|
||||
$testResultSum->numberOfTestsRun(),
|
||||
$testResultSum->numberOfAssertions(),
|
||||
$testResultSum->testErroredEvents(),
|
||||
@ -307,14 +310,7 @@ final class WrapperRunner implements RunnerInterface
|
||||
$testResultSum->testSuiteSkippedEvents(),
|
||||
$testResultSum->testSkippedEvents(),
|
||||
$testResultSum->testMarkedIncompleteEvents(),
|
||||
$testResultSum->testTriggeredDeprecationEvents(),
|
||||
$testResultSum->testTriggeredPhpDeprecationEvents(),
|
||||
$testResultSum->testTriggeredPhpunitDeprecationEvents(),
|
||||
$testResultSum->testTriggeredErrorEvents(),
|
||||
$testResultSum->testTriggeredNoticeEvents(),
|
||||
$testResultSum->testTriggeredPhpNoticeEvents(),
|
||||
$testResultSum->testTriggeredWarningEvents(),
|
||||
$testResultSum->testTriggeredPhpWarningEvents(),
|
||||
$testResultSum->testTriggeredPhpunitErrorEvents(),
|
||||
$testResultSum->testTriggeredPhpunitWarningEvents(),
|
||||
$testResultSum->testRunnerTriggeredDeprecationEvents(),
|
||||
@ -322,6 +318,13 @@ final class WrapperRunner implements RunnerInterface
|
||||
$testResultSum->testRunnerTriggeredWarningEvents(),
|
||||
fn (WarningTriggered $event): bool => ! str_contains($event->message(), 'No tests found')
|
||||
)),
|
||||
$testResultSum->errors(),
|
||||
$testResultSum->deprecations(),
|
||||
$testResultSum->notices(),
|
||||
$testResultSum->warnings(),
|
||||
$testResultSum->phpDeprecations(),
|
||||
$testResultSum->phpNotices(),
|
||||
$testResultSum->phpWarnings(),
|
||||
);
|
||||
|
||||
$this->printer->printResults(
|
||||
|
||||
@ -16,8 +16,9 @@ use PHPUnit\TestRunner\TestResult\TestResult as PHPUnitTestResult;
|
||||
use SebastianBergmann\Timer\Duration;
|
||||
use Symfony\Component\Console\Output\ConsoleOutput;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
use function Termwind\render;
|
||||
use Termwind\Terminal;
|
||||
|
||||
use function Termwind\render;
|
||||
use function Termwind\terminal;
|
||||
|
||||
/**
|
||||
@ -134,6 +135,10 @@ final class CompactPrinter
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
);
|
||||
|
||||
$telemetry = new Info(
|
||||
|
||||
@ -6,6 +6,7 @@ namespace Pest\Plugins;
|
||||
|
||||
use Pest\Contracts\Plugins\HandlesArguments;
|
||||
use Pest\Support\View;
|
||||
|
||||
use function Pest\version;
|
||||
|
||||
/**
|
||||
|
||||
@ -10,9 +10,10 @@ use Pest\Exceptions\DatasetAlreadyExists;
|
||||
use Pest\Exceptions\DatasetDoesNotExist;
|
||||
use Pest\Exceptions\ShouldNotHappen;
|
||||
use Pest\Support\Exporter;
|
||||
use function sprintf;
|
||||
use Traversable;
|
||||
|
||||
use function sprintf;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*/
|
||||
|
||||
@ -5,14 +5,16 @@ declare(strict_types=1);
|
||||
namespace Pest\Repositories;
|
||||
|
||||
use Pest\Exceptions\ShouldNotHappen;
|
||||
use Pest\Support\Str;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Pest\TestSuite;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*/
|
||||
final class SnapshotRepository
|
||||
{
|
||||
/** @var array<string, int> */
|
||||
private static array $expectationsCounter = [];
|
||||
|
||||
/**
|
||||
* Creates a snapshot repository instance.
|
||||
*/
|
||||
@ -25,11 +27,9 @@ final class SnapshotRepository
|
||||
/**
|
||||
* Checks if the snapshot exists.
|
||||
*/
|
||||
public function has(TestCase $testCase, string $description): bool
|
||||
public function has(): bool
|
||||
{
|
||||
[$filename, $description] = $this->getFilenameAndDescription($testCase);
|
||||
|
||||
return file_exists($this->getSnapshotFilename($filename, $description));
|
||||
return file_exists($this->getSnapshotFilename());
|
||||
}
|
||||
|
||||
/**
|
||||
@ -39,11 +39,9 @@ final class SnapshotRepository
|
||||
*
|
||||
* @throws ShouldNotHappen
|
||||
*/
|
||||
public function get(TestCase $testCase, string $description): array
|
||||
public function get(): array
|
||||
{
|
||||
[$filename, $description] = $this->getFilenameAndDescription($testCase);
|
||||
|
||||
$contents = file_get_contents($snapshotFilename = $this->getSnapshotFilename($filename, $description));
|
||||
$contents = file_get_contents($snapshotFilename = $this->getSnapshotFilename());
|
||||
|
||||
if ($contents === false) {
|
||||
throw ShouldNotHappen::fromMessage('Snapshot file could not be read.');
|
||||
@ -57,11 +55,9 @@ final class SnapshotRepository
|
||||
/**
|
||||
* Saves the given snapshot for the given test case.
|
||||
*/
|
||||
public function save(TestCase $testCase, string $snapshot): string
|
||||
public function save(string $snapshot): string
|
||||
{
|
||||
[$filename, $description] = $this->getFilenameAndDescription($testCase);
|
||||
|
||||
$snapshotFilename = $this->getSnapshotFilename($filename, $description);
|
||||
$snapshotFilename = $this->getSnapshotFilename();
|
||||
|
||||
if (! file_exists(dirname($snapshotFilename))) {
|
||||
mkdir(dirname($snapshotFilename), 0755, true);
|
||||
@ -103,33 +99,43 @@ final class SnapshotRepository
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the snapshot's "filename" and "description".
|
||||
*
|
||||
* @return array{0: string, 1: string}
|
||||
*/
|
||||
private function getFilenameAndDescription(TestCase $testCase): array
|
||||
{
|
||||
$filename = (fn () => self::$__filename)->call($testCase, $testCase::class); // @phpstan-ignore-line
|
||||
|
||||
$description = str_replace('__pest_evaluable_', '', $testCase->name());
|
||||
$datasetAsString = str_replace('__pest_evaluable_', '', Str::evaluable($testCase->dataSetAsStringWithData()));
|
||||
|
||||
$description = str_replace(' ', '_', $description.$datasetAsString);
|
||||
|
||||
return [$filename, $description];
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the snapshot's "filename".
|
||||
*/
|
||||
private function getSnapshotFilename(string $filename, string $description): string
|
||||
private function getSnapshotFilename(): string
|
||||
{
|
||||
$relativePath = str_replace($this->testsPath, '', $filename);
|
||||
$relativePath = str_replace($this->testsPath, '', TestSuite::getInstance()->getFilename());
|
||||
|
||||
// remove extension from filename
|
||||
$relativePath = substr($relativePath, 0, (int) strrpos($relativePath, '.'));
|
||||
|
||||
$description = TestSuite::getInstance()->getDescription();
|
||||
|
||||
if ($this->getCurrentSnapshotCounter() > 1) {
|
||||
$description .= '__'.$this->getCurrentSnapshotCounter();
|
||||
}
|
||||
|
||||
return sprintf('%s/%s.snap', $this->testsPath.'/'.$this->snapshotsPath.$relativePath, $description);
|
||||
}
|
||||
|
||||
private function getCurrentSnapshotKey(): string
|
||||
{
|
||||
return TestSuite::getInstance()->getFilename().'###'.TestSuite::getInstance()->getDescription();
|
||||
}
|
||||
|
||||
private function getCurrentSnapshotCounter(): int
|
||||
{
|
||||
return self::$expectationsCounter[$this->getCurrentSnapshotKey()] ?? 0;
|
||||
}
|
||||
|
||||
public function startNewExpectation(): void
|
||||
{
|
||||
$key = $this->getCurrentSnapshotKey();
|
||||
|
||||
if (! isset(self::$expectationsCounter[$key])) {
|
||||
self::$expectationsCounter[$key] = 0;
|
||||
}
|
||||
|
||||
self::$expectationsCounter[$key]++;
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,6 +4,7 @@ declare(strict_types=1);
|
||||
|
||||
namespace Pest;
|
||||
|
||||
use NunoMaduro\Collision\Adapters\Phpunit\Support\ResultReflection;
|
||||
use PHPUnit\TestRunner\TestResult\TestResult;
|
||||
use PHPUnit\TextUI\Configuration\Configuration;
|
||||
|
||||
@ -44,7 +45,7 @@ final class Result
|
||||
return self::SUCCESS_EXIT;
|
||||
}
|
||||
|
||||
if ($configuration->failOnEmptyTestSuite() && $result->numberOfTests() === 0) {
|
||||
if ($configuration->failOnEmptyTestSuite() && ResultReflection::numberOfTests($result) === 0) {
|
||||
return self::FAILURE_EXIT;
|
||||
}
|
||||
|
||||
@ -53,9 +54,9 @@ final class Result
|
||||
$returnCode = self::FAILURE_EXIT;
|
||||
}
|
||||
|
||||
$warnings = $result->numberOfTestsWithTestTriggeredPhpunitWarningEvents()
|
||||
+ $result->numberOfTestsWithTestTriggeredWarningEvents()
|
||||
+ $result->numberOfTestsWithTestTriggeredPhpWarningEvents();
|
||||
$warnings = $result->numberOfTestsWithTestTriggeredPhpunitWarningEvents() +
|
||||
+count($result->warnings())
|
||||
+ count($result->phpWarnings());
|
||||
|
||||
if ($configuration->failOnWarning() && $warnings > 0) {
|
||||
$returnCode = self::FAILURE_EXIT;
|
||||
|
||||
@ -10,6 +10,7 @@ use SebastianBergmann\CodeCoverage\Node\Directory;
|
||||
use SebastianBergmann\CodeCoverage\Node\File;
|
||||
use SebastianBergmann\Environment\Runtime;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
use function Termwind\render;
|
||||
use function Termwind\renderUsing;
|
||||
use function Termwind\terminal;
|
||||
|
||||
@ -74,64 +74,76 @@ final class StateGenerator
|
||||
));
|
||||
}
|
||||
|
||||
foreach ($testResult->testTriggeredDeprecationEvents() as $testResultEvent) {
|
||||
$testResultEvent = $testResultEvent[0];
|
||||
foreach ($testResult->deprecations() as $testResultEvent) {
|
||||
foreach ($testResultEvent->triggeringTests() as $triggeringTest) {
|
||||
['test' => $test] = $triggeringTest;
|
||||
|
||||
$state->add(TestResult::fromPestParallelTestCase(
|
||||
$testResultEvent->test(),
|
||||
TestResult::DEPRECATED,
|
||||
ThrowableBuilder::from(new TestOutcome($testResultEvent->message()))
|
||||
));
|
||||
$state->add(TestResult::fromPestParallelTestCase(
|
||||
$test,
|
||||
TestResult::DEPRECATED,
|
||||
ThrowableBuilder::from(new TestOutcome($testResultEvent->description()))
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($testResult->testTriggeredPhpDeprecationEvents() as $testResultEvent) {
|
||||
$testResultEvent = $testResultEvent[0];
|
||||
foreach ($testResult->phpDeprecations() as $testResultEvent) {
|
||||
foreach ($testResultEvent->triggeringTests() as $triggeringTest) {
|
||||
['test' => $test] = $triggeringTest;
|
||||
|
||||
$state->add(TestResult::fromPestParallelTestCase(
|
||||
$testResultEvent->test(),
|
||||
TestResult::DEPRECATED,
|
||||
ThrowableBuilder::from(new TestOutcome($testResultEvent->message()))
|
||||
));
|
||||
$state->add(TestResult::fromPestParallelTestCase(
|
||||
$test,
|
||||
TestResult::DEPRECATED,
|
||||
ThrowableBuilder::from(new TestOutcome($testResultEvent->description()))
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($testResult->testTriggeredNoticeEvents() as $testResultEvent) {
|
||||
$testResultEvent = $testResultEvent[0];
|
||||
foreach ($testResult->notices() as $testResultEvent) {
|
||||
foreach ($testResultEvent->triggeringTests() as $triggeringTest) {
|
||||
['test' => $test] = $triggeringTest;
|
||||
|
||||
$state->add(TestResult::fromPestParallelTestCase(
|
||||
$testResultEvent->test(),
|
||||
TestResult::NOTICE,
|
||||
ThrowableBuilder::from(new TestOutcome($testResultEvent->message()))
|
||||
));
|
||||
$state->add(TestResult::fromPestParallelTestCase(
|
||||
$test,
|
||||
TestResult::NOTICE,
|
||||
ThrowableBuilder::from(new TestOutcome($testResultEvent->description()))
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($testResult->testTriggeredPhpNoticeEvents() as $testResultEvent) {
|
||||
$testResultEvent = $testResultEvent[0];
|
||||
foreach ($testResult->phpNotices() as $testResultEvent) {
|
||||
foreach ($testResultEvent->triggeringTests() as $triggeringTest) {
|
||||
['test' => $test] = $triggeringTest;
|
||||
|
||||
$state->add(TestResult::fromPestParallelTestCase(
|
||||
$testResultEvent->test(),
|
||||
TestResult::NOTICE,
|
||||
ThrowableBuilder::from(new TestOutcome($testResultEvent->message()))
|
||||
));
|
||||
$state->add(TestResult::fromPestParallelTestCase(
|
||||
$test,
|
||||
TestResult::NOTICE,
|
||||
ThrowableBuilder::from(new TestOutcome($testResultEvent->description()))
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($testResult->testTriggeredWarningEvents() as $testResultEvent) {
|
||||
$testResultEvent = $testResultEvent[0];
|
||||
foreach ($testResult->warnings() as $testResultEvent) {
|
||||
foreach ($testResultEvent->triggeringTests() as $triggeringTest) {
|
||||
['test' => $test] = $triggeringTest;
|
||||
|
||||
$state->add(TestResult::fromPestParallelTestCase(
|
||||
$testResultEvent->test(),
|
||||
TestResult::WARN,
|
||||
ThrowableBuilder::from(new TestOutcome($testResultEvent->message()))
|
||||
));
|
||||
$state->add(TestResult::fromPestParallelTestCase(
|
||||
$test,
|
||||
TestResult::WARN,
|
||||
ThrowableBuilder::from(new TestOutcome($testResultEvent->description()))
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($testResult->testTriggeredPhpWarningEvents() as $testResultEvent) {
|
||||
$testResultEvent = $testResultEvent[0];
|
||||
foreach ($testResult->phpWarnings() as $testResultEvent) {
|
||||
foreach ($testResultEvent->triggeringTests() as $triggeringTest) {
|
||||
['test' => $test] = $triggeringTest;
|
||||
|
||||
$state->add(TestResult::fromPestParallelTestCase(
|
||||
$testResultEvent->test(),
|
||||
TestResult::WARN,
|
||||
ThrowableBuilder::from(new TestOutcome($testResultEvent->message()))
|
||||
));
|
||||
$state->add(TestResult::fromPestParallelTestCase(
|
||||
$test,
|
||||
TestResult::WARN,
|
||||
ThrowableBuilder::from(new TestOutcome($testResultEvent->description()))
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
// for each test that passed, we need to add it to the state
|
||||
@ -140,7 +152,7 @@ final class StateGenerator
|
||||
new TestMethod(
|
||||
"$i", // @phpstan-ignore-line
|
||||
'', // @phpstan-ignore-line
|
||||
'',
|
||||
'', // @phpstan-ignore-line
|
||||
1,
|
||||
TestDoxBuilder::fromClassNameAndMethodName('', ''), // @phpstan-ignore-line
|
||||
MetadataCollection::fromArray([]),
|
||||
|
||||
@ -5,9 +5,10 @@ declare(strict_types=1);
|
||||
namespace Pest\Support;
|
||||
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
use Termwind\Termwind;
|
||||
|
||||
use function Termwind\render;
|
||||
use function Termwind\renderUsing;
|
||||
use Termwind\Termwind;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
|
||||
@ -11,6 +11,7 @@ use Pest\Repositories\BeforeAllRepository;
|
||||
use Pest\Repositories\BeforeEachRepository;
|
||||
use Pest\Repositories\SnapshotRepository;
|
||||
use Pest\Repositories\TestRepository;
|
||||
use Pest\Support\Str;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
/**
|
||||
@ -105,4 +106,28 @@ final class TestSuite
|
||||
|
||||
return self::$instance;
|
||||
}
|
||||
|
||||
public function getFilename(): string
|
||||
{
|
||||
assert($this->test instanceof TestCase);
|
||||
|
||||
return (fn () => self::$__filename)->call($this->test, $this->test::class); // @phpstan-ignore-line
|
||||
}
|
||||
|
||||
public function getDescription(): string
|
||||
{
|
||||
assert($this->test instanceof TestCase);
|
||||
|
||||
$description = str_replace('__pest_evaluable_', '', $this->test->name());
|
||||
$datasetAsString = str_replace('__pest_evaluable_', '', Str::evaluable($this->test->dataSetAsStringWithData()));
|
||||
|
||||
return str_replace(' ', '_', $description.$datasetAsString);
|
||||
}
|
||||
|
||||
public function registerSnapshotChange(string $message): void
|
||||
{
|
||||
assert($this->test instanceof TestCase);
|
||||
|
||||
(fn (): string => $this->__snapshotChanges[] = $message)->call($this->test, $this->test::class); // @phpstan-ignore-line
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user