SADM/pest
1
0
Fork 0
mirror of https://github.com/pestphp/pest.git synced 2026-03-07 00:07:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(describe): continues work around hooks

Browse Source
This commit is contained in:
Nuno Maduro
2023-05-26 19:29:46 +01:00
parent 465c65243d
commit 3e8616ec64
11 changed files with 132 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Functions.php
View File

@ -5,7 +5,6 @@ declare(strict_types=1);
use Pest\Exceptions\AfterAllWithinDescribe;
use Pest\Exceptions\BeforeAllWithinDescribe;
use Pest\Expectation;
use Pest\PendingCalls;
use Pest\PendingCalls\AfterEachCall;
use Pest\PendingCalls\BeforeEachCall;
use Pest\PendingCalls\DescribeCall;
@ -39,7 +38,7 @@ if (! function_exists('beforeAll')) {
*/
function beforeAll(Closure $closure): void
{
if (! is_null(PendingCalls::$describing)) {
if (! is_null(DescribeCall::describing())) {
$filename = Backtrace::file();
throw new BeforeAllWithinDescribe($filename);
@ -89,11 +88,7 @@ if (! function_exists('describe')) {
{
$filename = Backtrace::testFile();
PendingCalls::startDescribe(
$describeCall = new DescribeCall(TestSuite::getInstance(), $filename, $description, $tests),
);
return $describeCall;
return new DescribeCall(TestSuite::getInstance(), $filename, $description, $tests);
}
}
@ -189,7 +184,7 @@ if (! function_exists('afterAll')) {
*/
function afterAll(Closure $closure): void
{
if (! is_null(PendingCalls::$describing)) {
if (! is_null(DescribeCall::describing())) {
$filename = Backtrace::file();
throw new AfterAllWithinDescribe($filename);