mirror of
https://github.com/pestphp/pest.git
synced 2026-03-06 07:47:22 +01:00
Merge branch '2.x' into 3.x
This commit is contained in:
7
.github/workflows/tests.yml
vendored
7
.github/workflows/tests.yml
vendored
@ -15,12 +15,9 @@ jobs:
|
||||
fail-fast: true
|
||||
matrix:
|
||||
os: [ubuntu-latest, macos-latest, windows-latest]
|
||||
symfony: ['7.0.2']
|
||||
symfony: ['7.0']
|
||||
php: ['8.2', '8.3']
|
||||
dependency_version: [prefer-lowest, prefer-stable]
|
||||
exclude:
|
||||
- php: '8.1'
|
||||
symfony: '7.0.2'
|
||||
|
||||
name: PHP ${{ matrix.php }} - Symfony ^${{ matrix.symfony }} - ${{ matrix.os }} - ${{ matrix.dependency_version }}
|
||||
|
||||
@ -41,7 +38,7 @@ jobs:
|
||||
echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
|
||||
|
||||
- name: Install PHP dependencies
|
||||
run: composer update --${{ matrix.dependency_version }} --no-interaction --no-progress --ansi --with="symfony/console:^${{ matrix.symfony }}"
|
||||
run: composer update --${{ matrix.dependency_version }} --no-interaction --no-progress --ansi --with="symfony/console:~${{ matrix.symfony }}"
|
||||
|
||||
- name: Unit Tests
|
||||
run: composer test:unit
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
],
|
||||
"require": {
|
||||
"php": "^8.2.0",
|
||||
"nunomaduro/collision": "^8.0.1",
|
||||
"nunomaduro/collision": "^8.1.0",
|
||||
"nunomaduro/termwind": "^2.0.0",
|
||||
"pestphp/pest-plugin": "^3.0.0",
|
||||
"pestphp/pest-plugin-arch": "^3.0.0",
|
||||
@ -105,7 +105,8 @@
|
||||
"Pest\\Plugins\\Snapshot",
|
||||
"Pest\\Plugins\\Verbose",
|
||||
"Pest\\Plugins\\Version",
|
||||
"Pest\\Plugins\\Parallel"
|
||||
"Pest\\Plugins\\Parallel",
|
||||
"Pest\\Plugins\\JUnit"
|
||||
]
|
||||
},
|
||||
"phpstan": {
|
||||
|
||||
16
overrides/Logging/JUnit/JunitXmlLogger.php
Normal file
16
overrides/Logging/JUnit/JunitXmlLogger.php
Normal file
@ -0,0 +1,16 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace PHPUnit\Logging\JUnit;
|
||||
|
||||
use PHPUnit\Event\Facade;
|
||||
use PHPUnit\TextUI\Output\Printer;
|
||||
|
||||
final class JunitXmlLogger
|
||||
{
|
||||
public function __construct(Printer $printer, Facade $facade)
|
||||
{
|
||||
/** @see \Pest\Logging\JUnit\JUnitLogger */
|
||||
}
|
||||
}
|
||||
@ -25,6 +25,7 @@ final class BootOverrides implements Bootstrapper
|
||||
'TextUI/Output/Default/ProgressPrinter/TestSkippedSubscriber.php',
|
||||
'TextUI/TestSuiteFilterProcessor.php',
|
||||
'Event/Value/ThrowableBuilder.php',
|
||||
'Logging/JUnit/JunitXmlLogger.php',
|
||||
];
|
||||
|
||||
/**
|
||||
|
||||
@ -25,6 +25,7 @@ final class BootSubscribers implements Bootstrapper
|
||||
Subscribers\EnsureIgnorableTestCasesAreIgnored::class,
|
||||
Subscribers\EnsureKernelDumpIsFlushed::class,
|
||||
Subscribers\EnsureTeamCityEnabled::class,
|
||||
Subscribers\EnsureJunitEnabled::class,
|
||||
];
|
||||
|
||||
/**
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Pest\Logging\TeamCity;
|
||||
namespace Pest\Logging;
|
||||
|
||||
use NunoMaduro\Collision\Adapters\Phpunit\State;
|
||||
use Pest\Exceptions\ShouldNotHappen;
|
||||
@ -150,6 +150,14 @@ final class Converter
|
||||
return Str::after($name, self::PREFIX);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the trimmed test class name.
|
||||
*/
|
||||
public function getTrimmedTestClassName(TestMethod $test): string
|
||||
{
|
||||
return Str::after($test->className(), self::PREFIX);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the test suite location.
|
||||
*/
|
||||
384
src/Logging/JUnit/JUnitLogger.php
Normal file
384
src/Logging/JUnit/JUnitLogger.php
Normal file
@ -0,0 +1,384 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Pest\Logging\JUnit;
|
||||
|
||||
use DOMDocument;
|
||||
use DOMElement;
|
||||
use Pest\Logging\Converter;
|
||||
use Pest\Logging\JUnit\Subscriber\TestErroredSubscriber;
|
||||
use Pest\Logging\JUnit\Subscriber\TestFailedSubscriber;
|
||||
use Pest\Logging\JUnit\Subscriber\TestFinishedSubscriber;
|
||||
use Pest\Logging\JUnit\Subscriber\TestMarkedIncompleteSubscriber;
|
||||
use Pest\Logging\JUnit\Subscriber\TestPreparedSubscriber;
|
||||
use Pest\Logging\JUnit\Subscriber\TestRunnerExecutionFinishedSubscriber;
|
||||
use Pest\Logging\JUnit\Subscriber\TestSkippedSubscriber;
|
||||
use Pest\Logging\JUnit\Subscriber\TestSuiteFinishedSubscriber;
|
||||
use Pest\Logging\JUnit\Subscriber\TestSuiteStartedSubscriber;
|
||||
use PHPUnit\Event\EventFacadeIsSealedException;
|
||||
use PHPUnit\Event\Facade;
|
||||
use PHPUnit\Event\InvalidArgumentException;
|
||||
use PHPUnit\Event\Telemetry\HRTime;
|
||||
use PHPUnit\Event\Telemetry\Info;
|
||||
use PHPUnit\Event\Test\Errored;
|
||||
use PHPUnit\Event\Test\Failed;
|
||||
use PHPUnit\Event\Test\Finished;
|
||||
use PHPUnit\Event\Test\MarkedIncomplete;
|
||||
use PHPUnit\Event\Test\Prepared;
|
||||
use PHPUnit\Event\Test\Skipped;
|
||||
use PHPUnit\Event\TestData\NoDataSetFromDataProviderException;
|
||||
use PHPUnit\Event\TestSuite\Started;
|
||||
use PHPUnit\Event\UnknownSubscriberTypeException;
|
||||
use PHPUnit\TextUI\Output\Printer;
|
||||
use PHPUnit\Util\Xml;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*/
|
||||
final class JUnitLogger
|
||||
{
|
||||
private DOMDocument $document;
|
||||
|
||||
private DOMElement $root;
|
||||
|
||||
/**
|
||||
* @var DOMElement[]
|
||||
*/
|
||||
private array $testSuites = [];
|
||||
|
||||
/**
|
||||
* @psalm-var array<int,int>
|
||||
*/
|
||||
private array $testSuiteTests = [0];
|
||||
|
||||
/**
|
||||
* @psalm-var array<int,int>
|
||||
*/
|
||||
private array $testSuiteAssertions = [0];
|
||||
|
||||
/**
|
||||
* @psalm-var array<int,int>
|
||||
*/
|
||||
private array $testSuiteErrors = [0];
|
||||
|
||||
/**
|
||||
* @psalm-var array<int,int>
|
||||
*/
|
||||
private array $testSuiteFailures = [0];
|
||||
|
||||
/**
|
||||
* @psalm-var array<int,int>
|
||||
*/
|
||||
private array $testSuiteSkipped = [0];
|
||||
|
||||
/**
|
||||
* @psalm-var array<int,int|float>
|
||||
*/
|
||||
private array $testSuiteTimes = [0];
|
||||
|
||||
private int $testSuiteLevel = 0;
|
||||
|
||||
private ?DOMElement $currentTestCase = null;
|
||||
|
||||
private ?HRTime $time = null;
|
||||
|
||||
private bool $prepared = false;
|
||||
|
||||
/**
|
||||
* @throws EventFacadeIsSealedException
|
||||
* @throws UnknownSubscriberTypeException
|
||||
*/
|
||||
public function __construct(
|
||||
private readonly Printer $printer,
|
||||
private readonly Converter $converter,
|
||||
) {
|
||||
$this->registerSubscribers();
|
||||
$this->createDocument();
|
||||
}
|
||||
|
||||
public function flush(): void
|
||||
{
|
||||
$this->printer->print((string) $this->document->saveXML());
|
||||
|
||||
$this->printer->flush();
|
||||
}
|
||||
|
||||
public function testSuiteStarted(Started $event): void
|
||||
{
|
||||
$testSuite = $this->document->createElement('testsuite');
|
||||
$testSuite->setAttribute('name', $this->converter->getTestSuiteName($event->testSuite()));
|
||||
|
||||
if ($event->testSuite()->isForTestClass()) {
|
||||
$testSuite->setAttribute('file', $this->converter->getTestSuiteLocation($event->testSuite()) ?? '');
|
||||
}
|
||||
|
||||
if ($this->testSuiteLevel > 0) {
|
||||
$this->testSuites[$this->testSuiteLevel]->appendChild($testSuite);
|
||||
} else {
|
||||
$this->root->appendChild($testSuite);
|
||||
}
|
||||
|
||||
$this->testSuiteLevel++;
|
||||
$this->testSuites[$this->testSuiteLevel] = $testSuite;
|
||||
$this->testSuiteTests[$this->testSuiteLevel] = 0;
|
||||
$this->testSuiteAssertions[$this->testSuiteLevel] = 0;
|
||||
$this->testSuiteErrors[$this->testSuiteLevel] = 0;
|
||||
$this->testSuiteFailures[$this->testSuiteLevel] = 0;
|
||||
$this->testSuiteSkipped[$this->testSuiteLevel] = 0;
|
||||
$this->testSuiteTimes[$this->testSuiteLevel] = 0;
|
||||
}
|
||||
|
||||
public function testSuiteFinished(): void
|
||||
{
|
||||
$this->testSuites[$this->testSuiteLevel]->setAttribute(
|
||||
'tests',
|
||||
(string) $this->testSuiteTests[$this->testSuiteLevel],
|
||||
);
|
||||
|
||||
$this->testSuites[$this->testSuiteLevel]->setAttribute(
|
||||
'assertions',
|
||||
(string) $this->testSuiteAssertions[$this->testSuiteLevel],
|
||||
);
|
||||
|
||||
$this->testSuites[$this->testSuiteLevel]->setAttribute(
|
||||
'errors',
|
||||
(string) $this->testSuiteErrors[$this->testSuiteLevel],
|
||||
);
|
||||
|
||||
$this->testSuites[$this->testSuiteLevel]->setAttribute(
|
||||
'failures',
|
||||
(string) $this->testSuiteFailures[$this->testSuiteLevel],
|
||||
);
|
||||
|
||||
$this->testSuites[$this->testSuiteLevel]->setAttribute(
|
||||
'skipped',
|
||||
(string) $this->testSuiteSkipped[$this->testSuiteLevel],
|
||||
);
|
||||
|
||||
$this->testSuites[$this->testSuiteLevel]->setAttribute(
|
||||
'time',
|
||||
sprintf('%F', $this->testSuiteTimes[$this->testSuiteLevel]),
|
||||
);
|
||||
|
||||
if ($this->testSuiteLevel > 1) {
|
||||
$this->testSuiteTests[$this->testSuiteLevel - 1] += $this->testSuiteTests[$this->testSuiteLevel];
|
||||
$this->testSuiteAssertions[$this->testSuiteLevel - 1] += $this->testSuiteAssertions[$this->testSuiteLevel];
|
||||
$this->testSuiteErrors[$this->testSuiteLevel - 1] += $this->testSuiteErrors[$this->testSuiteLevel];
|
||||
$this->testSuiteFailures[$this->testSuiteLevel - 1] += $this->testSuiteFailures[$this->testSuiteLevel];
|
||||
$this->testSuiteSkipped[$this->testSuiteLevel - 1] += $this->testSuiteSkipped[$this->testSuiteLevel];
|
||||
$this->testSuiteTimes[$this->testSuiteLevel - 1] += $this->testSuiteTimes[$this->testSuiteLevel];
|
||||
}
|
||||
|
||||
$this->testSuiteLevel--;
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws InvalidArgumentException
|
||||
* @throws NoDataSetFromDataProviderException
|
||||
*/
|
||||
public function testPrepared(Prepared $event): void
|
||||
{
|
||||
$this->createTestCase($event);
|
||||
$this->prepared = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws InvalidArgumentException
|
||||
*/
|
||||
public function testFinished(Finished $event): void
|
||||
{
|
||||
$this->handleFinish($event->telemetryInfo(), $event->numberOfAssertionsPerformed());
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws InvalidArgumentException
|
||||
* @throws NoDataSetFromDataProviderException
|
||||
*/
|
||||
public function testMarkedIncomplete(MarkedIncomplete $event): void
|
||||
{
|
||||
$this->handleIncompleteOrSkipped($event);
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws InvalidArgumentException
|
||||
* @throws NoDataSetFromDataProviderException
|
||||
*/
|
||||
public function testSkipped(Skipped $event): void
|
||||
{
|
||||
$this->handleIncompleteOrSkipped($event);
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws InvalidArgumentException
|
||||
* @throws NoDataSetFromDataProviderException
|
||||
*/
|
||||
public function testErrored(Errored $event): void
|
||||
{
|
||||
$this->handleFault($event, 'error');
|
||||
|
||||
$this->testSuiteErrors[$this->testSuiteLevel]++;
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws InvalidArgumentException
|
||||
* @throws NoDataSetFromDataProviderException
|
||||
*/
|
||||
public function testFailed(Failed $event): void
|
||||
{
|
||||
$this->handleFault($event, 'failure');
|
||||
|
||||
$this->testSuiteFailures[$this->testSuiteLevel]++;
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws InvalidArgumentException
|
||||
*/
|
||||
private function handleFinish(Info $telemetryInfo, int $numberOfAssertionsPerformed): void
|
||||
{
|
||||
assert($this->currentTestCase instanceof \DOMElement);
|
||||
assert($this->time instanceof \PHPUnit\Event\Telemetry\HRTime);
|
||||
|
||||
$time = $telemetryInfo->time()->duration($this->time)->asFloat();
|
||||
|
||||
$this->testSuiteAssertions[$this->testSuiteLevel] += $numberOfAssertionsPerformed;
|
||||
|
||||
$this->currentTestCase->setAttribute(
|
||||
'assertions',
|
||||
(string) $numberOfAssertionsPerformed,
|
||||
);
|
||||
|
||||
$this->currentTestCase->setAttribute(
|
||||
'time',
|
||||
sprintf('%F', $time),
|
||||
);
|
||||
|
||||
$this->testSuites[$this->testSuiteLevel]->appendChild(
|
||||
$this->currentTestCase,
|
||||
);
|
||||
|
||||
$this->testSuiteTests[$this->testSuiteLevel]++;
|
||||
$this->testSuiteTimes[$this->testSuiteLevel] += $time;
|
||||
|
||||
$this->currentTestCase = null;
|
||||
$this->time = null;
|
||||
$this->prepared = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws EventFacadeIsSealedException
|
||||
* @throws UnknownSubscriberTypeException
|
||||
*/
|
||||
private function registerSubscribers(): void
|
||||
{
|
||||
$subscribers = [
|
||||
new TestSuiteStartedSubscriber($this),
|
||||
new TestSuiteFinishedSubscriber($this),
|
||||
new TestPreparedSubscriber($this),
|
||||
new TestFinishedSubscriber($this),
|
||||
new TestErroredSubscriber($this),
|
||||
new TestFailedSubscriber($this),
|
||||
new TestMarkedIncompleteSubscriber($this),
|
||||
new TestSkippedSubscriber($this),
|
||||
new TestRunnerExecutionFinishedSubscriber($this),
|
||||
];
|
||||
|
||||
Facade::instance()->registerSubscribers(...$subscribers);
|
||||
}
|
||||
|
||||
private function createDocument(): void
|
||||
{
|
||||
$this->document = new DOMDocument('1.0', 'UTF-8');
|
||||
$this->document->formatOutput = true;
|
||||
|
||||
$this->root = $this->document->createElement('testsuites');
|
||||
$this->document->appendChild($this->root);
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws InvalidArgumentException
|
||||
* @throws NoDataSetFromDataProviderException
|
||||
*/
|
||||
private function handleFault(Errored|Failed $event, string $type): void
|
||||
{
|
||||
if (! $this->prepared) {
|
||||
$this->createTestCase($event);
|
||||
}
|
||||
|
||||
assert($this->currentTestCase instanceof \DOMElement);
|
||||
|
||||
$throwable = $event->throwable();
|
||||
|
||||
$testName = $this->converter->getTestCaseMethodName($event->test());
|
||||
$message = $this->converter->getExceptionMessage($throwable);
|
||||
$details = $this->converter->getExceptionDetails($throwable);
|
||||
|
||||
$buffer = $testName;
|
||||
$buffer .= trim(
|
||||
$message.PHP_EOL.
|
||||
$details,
|
||||
);
|
||||
|
||||
$fault = $this->document->createElement(
|
||||
$type,
|
||||
Xml::prepareString($buffer),
|
||||
);
|
||||
|
||||
$fault->setAttribute('type', $throwable->className());
|
||||
|
||||
$this->currentTestCase->appendChild($fault);
|
||||
|
||||
if (! $this->prepared) {
|
||||
$this->handleFinish($event->telemetryInfo(), 0);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws InvalidArgumentException
|
||||
* @throws NoDataSetFromDataProviderException
|
||||
*/
|
||||
private function handleIncompleteOrSkipped(MarkedIncomplete|Skipped $event): void
|
||||
{
|
||||
if (! $this->prepared) {
|
||||
$this->createTestCase($event);
|
||||
}
|
||||
|
||||
assert($this->currentTestCase instanceof \DOMElement);
|
||||
|
||||
$skipped = $this->document->createElement('skipped');
|
||||
|
||||
$this->currentTestCase->appendChild($skipped);
|
||||
|
||||
$this->testSuiteSkipped[$this->testSuiteLevel]++;
|
||||
|
||||
if (! $this->prepared) {
|
||||
$this->handleFinish($event->telemetryInfo(), 0);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws InvalidArgumentException
|
||||
* @throws NoDataSetFromDataProviderException
|
||||
*
|
||||
* @psalm-assert !null $this->currentTestCase
|
||||
*/
|
||||
private function createTestCase(Errored|Failed|MarkedIncomplete|Prepared|Skipped $event): void
|
||||
{
|
||||
$testCase = $this->document->createElement('testcase');
|
||||
|
||||
$test = $event->test();
|
||||
$file = $this->converter->getTestCaseLocation($test);
|
||||
|
||||
$testCase->setAttribute('name', $this->converter->getTestCaseMethodName($test));
|
||||
$testCase->setAttribute('file', $file);
|
||||
|
||||
if ($test->isTestMethod()) {
|
||||
$className = $this->converter->getTrimmedTestClassName($test);
|
||||
$testCase->setAttribute('class', $className);
|
||||
$testCase->setAttribute('classname', str_replace('\\', '.', $className));
|
||||
}
|
||||
|
||||
$this->currentTestCase = $testCase;
|
||||
$this->time = $event->telemetryInfo()->time();
|
||||
}
|
||||
}
|
||||
28
src/Logging/JUnit/Subscriber/Subscriber.php
Normal file
28
src/Logging/JUnit/Subscriber/Subscriber.php
Normal file
@ -0,0 +1,28 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Pest\Logging\JUnit\Subscriber;
|
||||
|
||||
use Pest\Logging\JUnit\JUnitLogger;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*/
|
||||
abstract class Subscriber
|
||||
{
|
||||
/**
|
||||
* Creates a new Subscriber instance.
|
||||
*/
|
||||
public function __construct(private readonly JUnitLogger $logger)
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a new JunitLogger instance.
|
||||
*/
|
||||
final protected function logger(): JUnitLogger
|
||||
{
|
||||
return $this->logger;
|
||||
}
|
||||
}
|
||||
19
src/Logging/JUnit/Subscriber/TestErroredSubscriber.php
Normal file
19
src/Logging/JUnit/Subscriber/TestErroredSubscriber.php
Normal file
@ -0,0 +1,19 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Pest\Logging\JUnit\Subscriber;
|
||||
|
||||
use PHPUnit\Event\Test\Errored;
|
||||
use PHPUnit\Event\Test\ErroredSubscriber;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*/
|
||||
final class TestErroredSubscriber extends Subscriber implements ErroredSubscriber
|
||||
{
|
||||
public function notify(Errored $event): void
|
||||
{
|
||||
$this->logger()->testErrored($event);
|
||||
}
|
||||
}
|
||||
19
src/Logging/JUnit/Subscriber/TestFailedSubscriber.php
Normal file
19
src/Logging/JUnit/Subscriber/TestFailedSubscriber.php
Normal file
@ -0,0 +1,19 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Pest\Logging\JUnit\Subscriber;
|
||||
|
||||
use PHPUnit\Event\Test\Failed;
|
||||
use PHPUnit\Event\Test\FailedSubscriber;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*/
|
||||
final class TestFailedSubscriber extends Subscriber implements FailedSubscriber
|
||||
{
|
||||
public function notify(Failed $event): void
|
||||
{
|
||||
$this->logger()->testFailed($event);
|
||||
}
|
||||
}
|
||||
19
src/Logging/JUnit/Subscriber/TestFinishedSubscriber.php
Normal file
19
src/Logging/JUnit/Subscriber/TestFinishedSubscriber.php
Normal file
@ -0,0 +1,19 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Pest\Logging\JUnit\Subscriber;
|
||||
|
||||
use PHPUnit\Event\Test\Finished;
|
||||
use PHPUnit\Event\Test\FinishedSubscriber;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*/
|
||||
final class TestFinishedSubscriber extends Subscriber implements FinishedSubscriber
|
||||
{
|
||||
public function notify(Finished $event): void
|
||||
{
|
||||
$this->logger()->testFinished($event);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Pest\Logging\JUnit\Subscriber;
|
||||
|
||||
use PHPUnit\Event\Test\MarkedIncomplete;
|
||||
use PHPUnit\Event\Test\MarkedIncompleteSubscriber;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*/
|
||||
final class TestMarkedIncompleteSubscriber extends Subscriber implements MarkedIncompleteSubscriber
|
||||
{
|
||||
public function notify(MarkedIncomplete $event): void
|
||||
{
|
||||
$this->logger()->testMarkedIncomplete($event);
|
||||
}
|
||||
}
|
||||
19
src/Logging/JUnit/Subscriber/TestPreparedSubscriber.php
Normal file
19
src/Logging/JUnit/Subscriber/TestPreparedSubscriber.php
Normal file
@ -0,0 +1,19 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Pest\Logging\JUnit\Subscriber;
|
||||
|
||||
use PHPUnit\Event\Test\Prepared;
|
||||
use PHPUnit\Event\Test\PreparedSubscriber;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*/
|
||||
final class TestPreparedSubscriber extends Subscriber implements PreparedSubscriber
|
||||
{
|
||||
public function notify(Prepared $event): void
|
||||
{
|
||||
$this->logger()->testPrepared($event);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Pest\Logging\JUnit\Subscriber;
|
||||
|
||||
use PHPUnit\Event\TestRunner\ExecutionFinished;
|
||||
use PHPUnit\Event\TestRunner\ExecutionFinishedSubscriber;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*/
|
||||
final class TestRunnerExecutionFinishedSubscriber extends Subscriber implements ExecutionFinishedSubscriber
|
||||
{
|
||||
public function notify(ExecutionFinished $event): void
|
||||
{
|
||||
$this->logger()->flush();
|
||||
}
|
||||
}
|
||||
19
src/Logging/JUnit/Subscriber/TestSkippedSubscriber.php
Normal file
19
src/Logging/JUnit/Subscriber/TestSkippedSubscriber.php
Normal file
@ -0,0 +1,19 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Pest\Logging\JUnit\Subscriber;
|
||||
|
||||
use PHPUnit\Event\Test\Skipped;
|
||||
use PHPUnit\Event\Test\SkippedSubscriber;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*/
|
||||
final class TestSkippedSubscriber extends Subscriber implements SkippedSubscriber
|
||||
{
|
||||
public function notify(Skipped $event): void
|
||||
{
|
||||
$this->logger()->testSkipped($event);
|
||||
}
|
||||
}
|
||||
19
src/Logging/JUnit/Subscriber/TestSuiteFinishedSubscriber.php
Normal file
19
src/Logging/JUnit/Subscriber/TestSuiteFinishedSubscriber.php
Normal file
@ -0,0 +1,19 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Pest\Logging\JUnit\Subscriber;
|
||||
|
||||
use PHPUnit\Event\TestSuite\Finished;
|
||||
use PHPUnit\Event\TestSuite\FinishedSubscriber;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*/
|
||||
final class TestSuiteFinishedSubscriber extends Subscriber implements FinishedSubscriber
|
||||
{
|
||||
public function notify(Finished $event): void
|
||||
{
|
||||
$this->logger()->testSuiteFinished();
|
||||
}
|
||||
}
|
||||
19
src/Logging/JUnit/Subscriber/TestSuiteStartedSubscriber.php
Normal file
19
src/Logging/JUnit/Subscriber/TestSuiteStartedSubscriber.php
Normal file
@ -0,0 +1,19 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Pest\Logging\JUnit\Subscriber;
|
||||
|
||||
use PHPUnit\Event\TestSuite\Started;
|
||||
use PHPUnit\Event\TestSuite\StartedSubscriber;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*/
|
||||
final class TestSuiteStartedSubscriber extends Subscriber implements StartedSubscriber
|
||||
{
|
||||
public function notify(Started $event): void
|
||||
{
|
||||
$this->logger()->testSuiteStarted($event);
|
||||
}
|
||||
}
|
||||
@ -6,6 +6,7 @@ namespace Pest\Logging\TeamCity;
|
||||
|
||||
use NunoMaduro\Collision\Adapters\Phpunit\Style;
|
||||
use Pest\Exceptions\ShouldNotHappen;
|
||||
use Pest\Logging\Converter;
|
||||
use Pest\Logging\TeamCity\Subscriber\TestConsideredRiskySubscriber;
|
||||
use Pest\Logging\TeamCity\Subscriber\TestErroredSubscriber;
|
||||
use Pest\Logging\TeamCity\Subscriber\TestExecutionFinishedSubscriber;
|
||||
|
||||
@ -314,13 +314,13 @@ final class Expectation
|
||||
/**
|
||||
* Asserts that the value contains the provided properties $names.
|
||||
*
|
||||
* @param iterable<array-key, string> $names
|
||||
* @param iterable<string, mixed>|iterable<int, string> $names
|
||||
* @return self<TValue>
|
||||
*/
|
||||
public function toHaveProperties(iterable $names, string $message = ''): self
|
||||
{
|
||||
foreach ($names as $name => $value) {
|
||||
is_int($name) ? $this->toHaveProperty($value, message: $message) : $this->toHaveProperty($name, $value, $message);
|
||||
is_int($name) ? $this->toHaveProperty($value, message: $message) : $this->toHaveProperty($name, $value, $message); // @phpstan-ignore-line
|
||||
}
|
||||
|
||||
return $this;
|
||||
|
||||
@ -6,7 +6,7 @@ namespace Pest;
|
||||
|
||||
function version(): string
|
||||
{
|
||||
return '3.0.0-dev-0002';
|
||||
return '3.0.0-dev-0003';
|
||||
}
|
||||
|
||||
function testDirectory(string $file = ''): string
|
||||
|
||||
@ -31,10 +31,9 @@ final class Cache implements HandlesArguments
|
||||
public function handleArguments(array $arguments): array
|
||||
{
|
||||
if (! $this->hasArgument('--cache-directory', $arguments)) {
|
||||
$arguments = $this->pushArgument(
|
||||
sprintf('--cache-directory=%s', realpath(self::TEMPORARY_FOLDER)),
|
||||
$arguments
|
||||
);
|
||||
$arguments = $this->pushArgument('--cache-directory', $arguments);
|
||||
|
||||
$arguments = $this->pushArgument((string) realpath(self::TEMPORARY_FOLDER), $arguments);
|
||||
}
|
||||
|
||||
if (! $this->hasArgument('--parallel', $arguments)) {
|
||||
|
||||
@ -93,10 +93,9 @@ final class Help implements HandlesArguments
|
||||
*/
|
||||
private function getContent(): array
|
||||
{
|
||||
$helpReflection = new \ReflectionClass(PHPUnitHelp::class);
|
||||
$helpReflection = new PHPUnitHelp();
|
||||
|
||||
/** @var array<string, array<int, array{arg: string, desc: string}>> $content */
|
||||
$content = $helpReflection->getConstant('HELP_TEXT');
|
||||
$content = (fn (): array => $this->elements())->call($helpReflection);
|
||||
|
||||
$content['Configuration'] = [...[[
|
||||
'arg' => '--init',
|
||||
|
||||
44
src/Plugins/JUnit.php
Normal file
44
src/Plugins/JUnit.php
Normal file
@ -0,0 +1,44 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Pest\Plugins;
|
||||
|
||||
use Pest\Contracts\Plugins\HandlesArguments;
|
||||
use Pest\Plugins\Concerns\HandleArguments;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*/
|
||||
final class JUnit implements HandlesArguments
|
||||
{
|
||||
use HandleArguments;
|
||||
|
||||
/**
|
||||
* Handles the arguments, adding the cache directory and the cache result arguments.
|
||||
*/
|
||||
public function handleArguments(array $arguments): array
|
||||
{
|
||||
if (! $this->hasArgument('--log-junit', $arguments)) {
|
||||
return $arguments;
|
||||
}
|
||||
|
||||
$logUnitArgument = null;
|
||||
|
||||
$arguments = array_filter($arguments, function (string $argument) use (&$logUnitArgument): bool {
|
||||
if (str_starts_with($argument, '--log-junit')) {
|
||||
$logUnitArgument = $argument;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
});
|
||||
|
||||
assert(is_string($logUnitArgument));
|
||||
|
||||
$arguments[] = $logUnitArgument;
|
||||
|
||||
return array_values($arguments);
|
||||
}
|
||||
}
|
||||
48
src/Subscribers/EnsureJunitEnabled.php
Normal file
48
src/Subscribers/EnsureJunitEnabled.php
Normal file
@ -0,0 +1,48 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Pest\Subscribers;
|
||||
|
||||
use Pest\Logging\Converter;
|
||||
use Pest\Logging\JUnit\JUnitLogger;
|
||||
use Pest\Support\Container;
|
||||
use Pest\TestSuite;
|
||||
use PHPUnit\Event\TestRunner\Configured;
|
||||
use PHPUnit\Event\TestRunner\ConfiguredSubscriber;
|
||||
use PHPUnit\TextUI\Configuration\Configuration;
|
||||
use PHPUnit\TextUI\Output\DefaultPrinter;
|
||||
use Symfony\Component\Console\Input\InputInterface;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*/
|
||||
final class EnsureJunitEnabled implements ConfiguredSubscriber
|
||||
{
|
||||
/**
|
||||
* Creates a new Configured Subscriber instance.
|
||||
*/
|
||||
public function __construct(
|
||||
private readonly InputInterface $input,
|
||||
private readonly TestSuite $testSuite,
|
||||
) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Runs the subscriber.
|
||||
*/
|
||||
public function notify(Configured $event): void
|
||||
{
|
||||
if (! $this->input->hasParameterOption('--log-junit')) {
|
||||
return;
|
||||
}
|
||||
|
||||
$configuration = Container::getInstance()->get(Configuration::class);
|
||||
assert($configuration instanceof Configuration);
|
||||
|
||||
new JUnitLogger(
|
||||
DefaultPrinter::from($configuration->logfileJunit()),
|
||||
new Converter($this->testSuite->rootPath),
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -4,7 +4,7 @@ declare(strict_types=1);
|
||||
|
||||
namespace Pest\Subscribers;
|
||||
|
||||
use Pest\Logging\TeamCity\Converter;
|
||||
use Pest\Logging\Converter;
|
||||
use Pest\Logging\TeamCity\TeamCityLogger;
|
||||
use Pest\TestSuite;
|
||||
use PHPUnit\Event\TestRunner\Configured;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
|
||||
Pest Testing Framework 3.0.0-dev-0002.
|
||||
Pest Testing Framework 3.0.0-dev-0003.
|
||||
|
||||
USAGE: pest <file> [options]
|
||||
|
||||
@ -30,6 +30,7 @@
|
||||
--exclude-group [name] ........... Exclude tests from the specified group(s)
|
||||
--covers [name] ................. Only run tests that intend to cover [name]
|
||||
--uses [name] ..................... Only run tests that intend to use [name]
|
||||
--list-test-files ................................ List available test files
|
||||
--list-tests .......................................... List available tests
|
||||
--list-tests-xml [file] ................. List available tests in XML format
|
||||
--filter [pattern] ............................... Filter which tests to run
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
|
||||
Pest Testing Framework 3.0.0-dev-0002.
|
||||
Pest Testing Framework 3.0.0-dev-0003.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user