diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 5cce40fc..68892bf2 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -2,9 +2,14 @@ name: Static Analysis on: push: + branches: [4.x] pull_request: schedule: - - cron: '0 0 * * *' + - cron: '0 9 * * *' + +concurrency: + group: static-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true jobs: static: @@ -12,6 +17,7 @@ jobs: name: Static Tests runs-on: ubuntu-latest + timeout-minutes: 15 strategy: fail-fast: true matrix: @@ -29,8 +35,22 @@ jobs: coverage: none extensions: sockets + - name: Get Composer cache directory + id: composer-cache + shell: bash + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + + - name: Cache Composer dependencies + uses: actions/cache@v5 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: static-php-8.3-${{ matrix.dependency-version }}-composer-${{ hashFiles('**/composer.json') }} + restore-keys: | + static-php-8.3-${{ matrix.dependency-version }}-composer- + static-php-8.3-composer- + - name: Install Dependencies - run: composer update --prefer-stable --no-interaction --no-progress --ansi + run: composer update --${{ matrix.dependency-version }} --no-interaction --no-progress --ansi - name: Profanity Check run: composer test:profanity @@ -41,8 +61,5 @@ jobs: - name: Type Coverage run: composer test:type:coverage - - name: Refacto - run: composer test:refacto - - name: Style run: composer test:lint diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 68d070da..41abc6a1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,20 +2,31 @@ name: Tests on: push: + branches: [4.x] pull_request: + schedule: + - cron: '0 9 * * *' + +concurrency: + group: tests-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true jobs: tests: if: github.event_name != 'schedule' || github.repository == 'pestphp/pest' runs-on: ${{ matrix.os }} + timeout-minutes: 15 strategy: fail-fast: true matrix: os: [ubuntu-latest, macos-latest] # windows-latest - symfony: ['7.3'] + symfony: ['7.4', '8.0'] php: ['8.3', '8.4', '8.5'] dependency_version: [prefer-stable] + exclude: + - php: '8.3' + symfony: '8.0' name: PHP ${{ matrix.php }} - Symfony ^${{ matrix.symfony }} - ${{ matrix.os }} - ${{ matrix.dependency_version }} @@ -31,6 +42,20 @@ jobs: coverage: none extensions: sockets + - name: Get Composer cache directory + id: composer-cache + shell: bash + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + + - name: Cache Composer dependencies + uses: actions/cache@v5 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ matrix.os }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-composer-${{ hashFiles('**/composer.json') }} + restore-keys: | + ${{ matrix.os }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-composer- + ${{ matrix.os }}-php-${{ matrix.php }}-composer- + - name: Setup Problem Matches run: | echo "::add-matcher::${{ runner.tool_cache }}/php.json" diff --git a/Makefile b/Makefile deleted file mode 100644 index ec4faa84..00000000 --- a/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# Well documented Makefiles -DEFAULT_GOAL := help -help: - @awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m\033[0m\n"} /^[a-zA-Z0-9_-]+:.*?##/ { printf " \033[36m%-40s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST) - -build: ## Build all docker images. Specify the command e.g. via make build ARGS="--build-arg PHP=8.2" - docker compose build $(ARGS) - -##@ [Application] -install: ## Install the composer dependencies - docker compose run --rm composer install - -test: ## Run the tests - docker compose run --rm composer test diff --git a/README.md b/README.md index ed0020c0..af33fd43 100644 --- a/README.md +++ b/README.md @@ -32,8 +32,8 @@ We cannot thank our sponsors enough for their incredible support in funding Pest ### Platinum Sponsors - **[CodeRabbit](https://coderabbit.ai/?ref=pestphp)** -- **[Devin](https://devin.ai/?ref=nunomaduro)** - **[Mailtrap](https://l.rw.rw/pestphp)** +- **[SerpApi](https://serpapi.com/?ref=nunomaduro)** - **[Tighten](https://tighten.com/?ref=nunomaduro)** - **[Redberry](https://redberry.international/laravel-development/?utm_source=pest&utm_medium=banner&utm_campaign=pest_sponsorship)** @@ -48,6 +48,6 @@ We cannot thank our sponsors enough for their incredible support in funding Pest - [Route4Me](https://route4me.com/pt?ref=pestphp) - [Nerdify](https://getnerdify.com/?ref=pestphp) - [Akaunting](https://akaunting.com/?ref=pestphp) -- [LambdaTest](https://lambdatest.com/?ref=pestphp) +- [TestMu AI](https://www.testmuai.com/?utm_medium=sponsor&utm_source=pest) Pest is an open-sourced software licensed under the **[MIT license](https://opensource.org/licenses/MIT)**. diff --git a/composer.json b/composer.json index 9d7fcdee..f5231d66 100644 --- a/composer.json +++ b/composer.json @@ -18,19 +18,19 @@ ], "require": { "php": "^8.3.0", - "brianium/paratest": "^7.16.1", - "nunomaduro/collision": "^8.8.3", - "nunomaduro/termwind": "^2.3.3", + "brianium/paratest": "^7.20.0", + "nunomaduro/collision": "^8.9.3", + "nunomaduro/termwind": "^2.4.0", "pestphp/pest-plugin": "^4.0.0", "pestphp/pest-plugin-arch": "^4.0.0", "pestphp/pest-plugin-mutate": "^4.0.1", "pestphp/pest-plugin-profanity": "^4.2.1", - "phpunit/phpunit": "^12.5.8", - "symfony/process": "^7.4.4|^8.0.0" + "phpunit/phpunit": "^12.5.16", + "symfony/process": "^7.4.8|^8.0.8" }, "conflict": { "filp/whoops": "<2.18.3", - "phpunit/phpunit": ">12.5.8", + "phpunit/phpunit": ">12.5.16", "sebastian/exporter": "<7.0.0", "webmozart/assert": "<1.11.0" }, @@ -55,10 +55,11 @@ ] }, "require-dev": { - "pestphp/pest-dev-tools": "^4.0.0", - "pestphp/pest-plugin-browser": "^4.2.1", - "pestphp/pest-plugin-type-coverage": "^4.0.3", - "psy/psysh": "^0.12.18" + "mrpunyapal/peststan": "^0.2.5", + "pestphp/pest-dev-tools": "^4.1.0", + "pestphp/pest-plugin-browser": "^4.3.1", + "pestphp/pest-plugin-type-coverage": "^4.0.4", + "psy/psysh": "^0.12.22" }, "minimum-stability": "dev", "prefer-stable": true, @@ -73,10 +74,14 @@ "bin/pest" ], "scripts": { - "refacto": "rector", - "lint": "pint --parallel", - "test:refacto": "rector --dry-run", - "test:lint": "pint --parallel --test", + "lint": [ + "rector", + "pint --parallel" + ], + "test:lint": [ + "rector --dry-run", + "pint --parallel --test" + ], "test:profanity": "php bin/pest --profanity --compact", "test:type:check": "phpstan analyse --ansi --memory-limit=-1 --debug", "test:type:coverage": "php -d memory_limit=-1 bin/pest --type-coverage --min=100", @@ -86,7 +91,6 @@ "test:integration": "php bin/pest --group=integration -v", "update:snapshots": "REBUILD_SNAPSHOTS=true php bin/pest --update-snapshots", "test": [ - "@test:refacto", "@test:lint", "@test:type:check", "@test:type:coverage", diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 70b75de2..00000000 --- a/docker-compose.yml +++ /dev/null @@ -1,14 +0,0 @@ -version: "3.8" - -services: - php: - build: - context: ./docker - volumes: - - .:/var/www/html - composer: - build: - context: ./docker - volumes: - - .:/var/www/html - entrypoint: ["composer"] diff --git a/overrides/Logging/JUnit/JunitXmlLogger.php b/overrides/Logging/JUnit/JunitXmlLogger.php index b7362b1f..1fc237a6 100644 --- a/overrides/Logging/JUnit/JunitXmlLogger.php +++ b/overrides/Logging/JUnit/JunitXmlLogger.php @@ -14,6 +14,9 @@ namespace PHPUnit\Logging\JUnit; use DOMDocument; use DOMElement; +use Pest\Logging\Converter; +use Pest\Support\Container; +use Pest\TestSuite; use PHPUnit\Event\Code\Test; use PHPUnit\Event\Code\TestMethod; use PHPUnit\Event\EventFacadeIsSealedException; @@ -50,7 +53,7 @@ final class JunitXmlLogger { private readonly Printer $printer; - private readonly \Pest\Logging\Converter $converter; // pest-added + private readonly Converter $converter; // pest-added private DOMDocument $document; @@ -108,7 +111,7 @@ final class JunitXmlLogger public function __construct(Printer $printer, Facade $facade) { $this->printer = $printer; - $this->converter = new \Pest\Logging\Converter(\Pest\Support\Container::getInstance()->get(\Pest\TestSuite::class)->rootPath); // pest-added + $this->converter = new Converter(Container::getInstance()->get(TestSuite::class)->rootPath); // pest-added $this->registerSubscribers($facade); $this->createDocument(); diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 99bbdec9..8374d3bd 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1,11 +1,5 @@ parameters: ignoreErrors: - - - message: '#^Parameter \#1 of callable callable\(Pest\\Expectation\\)\: Pest\\Arch\\Contracts\\ArchExpectation expects Pest\\Expectation\, Pest\\Expectation\ given\.$#' - identifier: argument.type - count: 1 - path: src/ArchPresets/AbstractPreset.php - - message: '#^Trait Pest\\Concerns\\Expectable is used zero times and is not analysed\.$#' identifier: trait.unused @@ -24,12 +18,6 @@ parameters: count: 1 path: src/Concerns/Testable.php - - - message: '#^Loose comparison using \!\= between \(Closure\|null\) and false will always evaluate to false\.$#' - identifier: notEqual.alwaysFalse - count: 1 - path: src/Expectation.php - - message: '#^Method Pest\\Expectation\:\:and\(\) should return Pest\\Expectation\ but returns \(Pest\\Expectation&TAndValue\)\|Pest\\Expectation\\.$#' identifier: return.type @@ -102,78 +90,12 @@ parameters: count: 1 path: src/PendingCalls/TestCall.php - - - message: '#^Parameter \#1 \$argv of class Symfony\\Component\\Console\\Input\\ArgvInput constructor expects list\\|null, array\ given\.$#' - identifier: argument.type - count: 1 - path: src/Plugins/Parallel.php - - - - message: '#^Parameter \#13 \$testRunnerTriggeredDeprecationEvents of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\, array given\.$#' - identifier: argument.type - count: 1 - path: src/Plugins/Parallel/Paratest/WrapperRunner.php - - - - message: '#^Parameter \#14 \$testRunnerTriggeredWarningEvents of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\, array given\.$#' - identifier: argument.type - count: 1 - path: src/Plugins/Parallel/Paratest/WrapperRunner.php - - - - message: '#^Parameter \#15 \$errors of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\, array given\.$#' - identifier: argument.type - count: 1 - path: src/Plugins/Parallel/Paratest/WrapperRunner.php - - - - message: '#^Parameter \#16 \$deprecations of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\, array given\.$#' - identifier: argument.type - count: 1 - path: src/Plugins/Parallel/Paratest/WrapperRunner.php - - - - message: '#^Parameter \#17 \$notices of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\, array given\.$#' - identifier: argument.type - count: 1 - path: src/Plugins/Parallel/Paratest/WrapperRunner.php - - - - message: '#^Parameter \#18 \$warnings of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\, array given\.$#' - identifier: argument.type - count: 1 - path: src/Plugins/Parallel/Paratest/WrapperRunner.php - - - - message: '#^Parameter \#19 \$phpDeprecations of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\, array given\.$#' - identifier: argument.type - count: 1 - path: src/Plugins/Parallel/Paratest/WrapperRunner.php - - - - message: '#^Parameter \#20 \$phpNotices of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\, array given\.$#' - identifier: argument.type - count: 1 - path: src/Plugins/Parallel/Paratest/WrapperRunner.php - - - - message: '#^Parameter \#21 \$phpWarnings of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\, array given\.$#' - identifier: argument.type - count: 1 - path: src/Plugins/Parallel/Paratest/WrapperRunner.php - - message: '#^Parameter \#4 \$testErroredEvents of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\, array given\.$#' identifier: argument.type count: 1 path: src/Plugins/Parallel/Paratest/WrapperRunner.php - - - message: '#^Parameter \#5 \$testFailedEvents of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\, array given\.$#' - identifier: argument.type - count: 1 - path: src/Plugins/Parallel/Paratest/WrapperRunner.php - - message: '#^Parameter \#7 \$testSuiteSkippedEvents of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\, array given\.$#' identifier: argument.type diff --git a/phpstan-pest-extension.neon b/phpstan-pest-extension.neon new file mode 100644 index 00000000..af649b7f --- /dev/null +++ b/phpstan-pest-extension.neon @@ -0,0 +1,5 @@ +services: + - + class: Pest\PHPStan\HigherOrderExpectationTypeExtension + tags: + - phpstan.broker.expressionTypeResolverExtension diff --git a/phpstan.neon b/phpstan.neon index 391daf0b..19f6ae4e 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,5 +1,7 @@ includes: - phpstan-baseline.neon + - phpstan-pest-extension.neon + - vendor/mrpunyapal/peststan/extension.neon parameters: level: 7 @@ -7,6 +9,3 @@ parameters: - src reportUnmatchedIgnoredErrors: false - - ignoreErrors: - - "#type mixed is not subtype of native#" diff --git a/src/ArchPresets/AbstractPreset.php b/src/ArchPresets/AbstractPreset.php index 3b612812..0dc9ce30 100644 --- a/src/ArchPresets/AbstractPreset.php +++ b/src/ArchPresets/AbstractPreset.php @@ -53,7 +53,7 @@ abstract class AbstractPreset // @pest-arch-ignore-line /** * Runs the given callback for each namespace. * - * @param callable(Expectation): ArchExpectation ...$callbacks + * @param callable(Expectation): ArchExpectation ...$callbacks */ final public function eachUserNamespace(callable ...$callbacks): void { diff --git a/src/ArchPresets/Laravel.php b/src/ArchPresets/Laravel.php index 7d094c36..406611a3 100644 --- a/src/ArchPresets/Laravel.php +++ b/src/ArchPresets/Laravel.php @@ -69,6 +69,7 @@ final class Laravel extends AbstractPreset ->toHaveSuffix('Request'); $this->expectations[] = expect('App\Http\Requests') + ->classes() ->toExtend('Illuminate\Foundation\Http\FormRequest'); $this->expectations[] = expect('App\Http\Requests') @@ -118,6 +119,7 @@ final class Laravel extends AbstractPreset ->toHaveMethod('handle'); $this->expectations[] = expect('App\Notifications') + ->classes() ->toExtend('Illuminate\Notifications\Notification'); $this->expectations[] = expect('App') @@ -128,6 +130,7 @@ final class Laravel extends AbstractPreset ->toHaveSuffix('ServiceProvider'); $this->expectations[] = expect('App\Providers') + ->classes() ->toExtend('Illuminate\Support\ServiceProvider'); $this->expectations[] = expect('App\Providers') @@ -150,7 +153,7 @@ final class Laravel extends AbstractPreset ->toHaveSuffix('Controller'); $this->expectations[] = expect('App\Http') - ->toOnlyBeUsedIn('App\Http'); + ->toOnlyBeUsedIn(['App\Http', 'App\Providers']); $this->expectations[] = expect('App\Http\Controllers') ->not->toHavePublicMethodsBesides(['__construct', '__invoke', 'index', 'show', 'create', 'store', 'edit', 'update', 'destroy', 'middleware']); @@ -173,5 +176,9 @@ final class Laravel extends AbstractPreset ->toImplement('Illuminate\Contracts\Container\ContextualAttribute') ->toHaveAttribute('Attribute') ->toHaveMethod('resolve'); + + $this->expectations[] = expect('App\Rules') + ->classes() + ->toImplement('Illuminate\Contracts\Validation\ValidationRule'); } } diff --git a/src/Concerns/Pipeable.php b/src/Concerns/Pipeable.php index 63ab0b7d..4e44f8db 100644 --- a/src/Concerns/Pipeable.php +++ b/src/Concerns/Pipeable.php @@ -66,6 +66,6 @@ trait Pipeable */ private function pipes(string $name, object $context, string $scope): array { - return array_map(fn (Closure $pipe): \Closure => $pipe->bindTo($context, $scope), self::$pipes[$name] ?? []); + return array_map(fn (Closure $pipe): Closure => $pipe->bindTo($context, $scope), self::$pipes[$name] ?? []); } } diff --git a/src/Concerns/Testable.php b/src/Concerns/Testable.php index 767a7c69..e1c43ef5 100644 --- a/src/Concerns/Testable.php +++ b/src/Concerns/Testable.php @@ -129,7 +129,7 @@ trait Testable */ public function __addBeforeAll(?Closure $hook): void { - if (! $hook instanceof \Closure) { + if (! $hook instanceof Closure) { return; } @@ -143,7 +143,7 @@ trait Testable */ public function __addAfterAll(?Closure $hook): void { - if (! $hook instanceof \Closure) { + if (! $hook instanceof Closure) { return; } @@ -173,7 +173,7 @@ trait Testable */ private function __addHook(string $property, ?Closure $hook): void { - if (! $hook instanceof \Closure) { + if (! $hook instanceof Closure) { return; } @@ -350,7 +350,8 @@ trait Testable } $underlyingTest = Reflection::getFunctionVariable($this->__test, 'closure'); - $testParameterTypes = array_values(Reflection::getFunctionArguments($underlyingTest)); + $testParameterTypesByName = Reflection::getFunctionArguments($underlyingTest); + $testParameterTypes = array_values($testParameterTypesByName); if (count($arguments) !== 1) { foreach ($arguments as $argumentIndex => $argumentValue) { @@ -358,7 +359,11 @@ trait Testable continue; } - if (in_array($testParameterTypes[$argumentIndex], [Closure::class, 'callable', 'mixed'])) { + $parameterType = is_string($argumentIndex) + ? $testParameterTypesByName[$argumentIndex] + : $testParameterTypes[$argumentIndex]; + + if (in_array($parameterType, [Closure::class, 'callable', 'mixed'])) { continue; } @@ -384,7 +389,7 @@ trait Testable return [$boundDatasetResult]; } - return array_values($boundDatasetResult); + return $boundDatasetResult; } /** diff --git a/src/Expectation.php b/src/Expectation.php index 50729d7a..60c047bb 100644 --- a/src/Expectation.php +++ b/src/Expectation.php @@ -18,6 +18,7 @@ use Pest\Arch\Expectations\ToOnlyUse; use Pest\Arch\Expectations\ToUse; use Pest\Arch\Expectations\ToUseNothing; use Pest\Arch\PendingArchExpectation; +use Pest\Arch\Support\Composer; use Pest\Arch\Support\FileLineFinder; use Pest\Concerns\Extendable; use Pest\Concerns\Pipeable; @@ -136,7 +137,7 @@ final class Expectation /** * Dump the expectation value when the result of the condition is truthy. * - * @param (\Closure(TValue): bool)|bool $condition + * @param (Closure(TValue): bool)|bool $condition * @return self */ public function ddWhen(Closure|bool $condition, mixed ...$arguments): Expectation @@ -153,7 +154,7 @@ final class Expectation /** * Dump the expectation value when the result of the condition is falsy. * - * @param (\Closure(TValue): bool)|bool $condition + * @param (Closure(TValue): bool)|bool $condition * @return self */ public function ddUnless(Closure|bool $condition, mixed ...$arguments): Expectation @@ -669,6 +670,41 @@ final class Expectation throw InvalidExpectation::fromMethods(['toHavePrivateMethods']); } + /** + * Asserts that the given expectation target is cased correctly. + */ + public function toBeCasedCorrectly(): ArchExpectation + { + return Targeted::make( + $this, + function (ObjectDescription $object): bool { + if (! isset($object->reflectionClass)) { + return false; + } + + $realPath = realpath($object->path); + + if ($realPath === false) { + return false; + } + + foreach (Composer::userNamespacesWithDirectories() as $directory => $namespace) { + if (str_starts_with($realPath, $directory)) { + $relativePath = substr($realPath, strlen($directory) + 1); + $relativePath = explode('.', $relativePath)[0]; + $classFromPath = $namespace.'\\'.str_replace(DIRECTORY_SEPARATOR, '\\', $relativePath); + + return $classFromPath === $object->reflectionClass->getName(); + } + } + + return false; + }, + 'to be cased correctly', + FileLineFinder::where(fn (string $line): bool => str_contains($line, 'class')), + ); + } + /** * Asserts that the given expectation target is enum. */ @@ -783,7 +819,22 @@ final class Expectation return false; } - if (! in_array($trait, $object->reflectionClass->getTraitNames(), true)) { + $currentClass = $object->reflectionClass; + $usedTraits = []; + + do { + $classTraits = $currentClass->getTraits(); + foreach ($classTraits as $traitReflection) { + $usedTraits[$traitReflection->getName()] = $traitReflection->getName(); + + $nestedTraits = $traitReflection->getTraits(); + foreach ($nestedTraits as $nestedTrait) { + $usedTraits[$nestedTrait->getName()] = $nestedTrait->getName(); + } + } + } while ($currentClass = $currentClass->getParentClass()); + + if (! array_key_exists($trait, $usedTraits)) { return false; } } diff --git a/src/Factories/TestCaseFactory.php b/src/Factories/TestCaseFactory.php index 0d2a0978..6f120c27 100644 --- a/src/Factories/TestCaseFactory.php +++ b/src/Factories/TestCaseFactory.php @@ -17,6 +17,7 @@ use Pest\Factories\Concerns\HigherOrderable; use Pest\Support\Reflection; use Pest\Support\Str; use Pest\TestSuite; +use PHPUnit\Framework\Attributes\TestDox; use PHPUnit\Framework\TestCase; use RuntimeException; @@ -58,6 +59,11 @@ final class TestCaseFactory Concerns\Expectable::class, ]; + /** + * The namespace for the test case, overrides the path-based namespace when set. + */ + public ?string $namespace = null; + /** * Creates a new Factory instance. */ @@ -110,8 +116,8 @@ final class TestCaseFactory $relativePath = (string) preg_replace('|%[a-fA-F0-9][a-fA-F0-9]|', '', $relativePath); // Remove escaped quote sequences (maintain namespace) $relativePath = str_replace(array_map(fn (string $quote): string => sprintf('\\%s', $quote), ['\'', '"']), '', $relativePath); - // Limit to A-Z, a-z, 0-9, '_', '-'. - $relativePath = (string) preg_replace('/[^A-Za-z0-9\\\\]/', '', $relativePath); + // Limit to Unicode letters and numbers. + $relativePath = (string) preg_replace('/[^\p{L}\p{N}\\\\]/u', '', $relativePath); $classFQN = 'P\\'.$relativePath; @@ -126,7 +132,7 @@ final class TestCaseFactory $partsFQN = explode('\\', $classFQN); $className = array_pop($partsFQN); - $namespace = implode('\\', $partsFQN); + $namespace = $this->namespace ?? implode('\\', $partsFQN); $baseClass = sprintf('\%s', $this->class); if (trim($className) === '') { @@ -135,7 +141,7 @@ final class TestCaseFactory $this->attributes = [ new Attribute( - \PHPUnit\Framework\Attributes\TestDox::class, + TestDox::class, [$this->filename], ), ...$this->attributes, diff --git a/src/Factories/TestCaseMethodFactory.php b/src/Factories/TestCaseMethodFactory.php index c88db44d..9438f837 100644 --- a/src/Factories/TestCaseMethodFactory.php +++ b/src/Factories/TestCaseMethodFactory.php @@ -9,10 +9,14 @@ use Pest\Evaluators\Attributes; use Pest\Exceptions\ShouldNotHappen; use Pest\Factories\Concerns\HigherOrderable; use Pest\Repositories\DatasetsRepository; +use Pest\Support\Description; use Pest\Support\Str; use Pest\TestSuite; use PHPUnit\Framework\Assert; use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Depends; +use PHPUnit\Framework\Attributes\Test; +use PHPUnit\Framework\Attributes\TestDox; use PHPUnit\Framework\TestCase; /** @@ -32,7 +36,7 @@ final class TestCaseMethodFactory /** * The test's describing, if any. * - * @var array + * @var array */ public array $describing = []; @@ -192,11 +196,11 @@ final class TestCaseMethodFactory $this->attributes = [ new Attribute( - \PHPUnit\Framework\Attributes\Test::class, + Test::class, [], ), new Attribute( - \PHPUnit\Framework\Attributes\TestDox::class, + TestDox::class, [str_replace('*/', '{@*}', $this->description)], ), ...$this->attributes, @@ -206,7 +210,7 @@ final class TestCaseMethodFactory $depend = Str::evaluable($this->describing === [] ? $depend : Str::describe($this->describing, $depend)); $this->attributes[] = new Attribute( - \PHPUnit\Framework\Attributes\Depends::class, + Depends::class, [$depend], ); } diff --git a/src/Functions.php b/src/Functions.php index fef59157..4b5d992b 100644 --- a/src/Functions.php +++ b/src/Functions.php @@ -4,7 +4,6 @@ declare(strict_types=1); use Pest\Browser\Api\ArrayablePendingAwaitablePage; use Pest\Browser\Api\PendingAwaitablePage; -use Pest\Concerns\Expectable; use Pest\Configuration; use Pest\Exceptions\AfterAllWithinDescribe; use Pest\Exceptions\BeforeAllWithinDescribe; @@ -62,8 +61,6 @@ if (! function_exists('beforeEach')) { * Runs the given closure before each test in the current file. * * @param-closure-this TestCall $closure - * - * @return HigherOrderTapProxy|Expectable|TestCall|TestCase|mixed */ function beforeEach(?Closure $closure = null): BeforeEachCall { @@ -92,8 +89,6 @@ if (! function_exists('describe')) { * Adds the given closure as a group of tests. The first argument * is the group description; the second argument is a closure * that contains the group tests. - * - * @return HigherOrderTapProxy|Expectable|TestCall|TestCase|mixed */ function describe(string $description, Closure $tests): DescribeCall { @@ -136,11 +131,11 @@ if (! function_exists('test')) { * * @param-closure-this TestCall $closure * - * @return Expectable|TestCall|TestCase|mixed + * @return ($description is string ? TestCall : HigherOrderTapProxy|TestCall) */ function test(?string $description = null, ?Closure $closure = null): HigherOrderTapProxy|TestCall { - if ($description === null && TestSuite::getInstance()->test instanceof \PHPUnit\Framework\TestCase) { + if ($description === null && TestSuite::getInstance()->test instanceof TestCase) { return new HigherOrderTapProxy(TestSuite::getInstance()->test); } @@ -157,33 +152,22 @@ if (! function_exists('it')) { * a closure that contains the test expectations. * * @param-closure-this TestCall $closure - * - * @return Expectable|TestCall|TestCase|mixed */ function it(string $description, ?Closure $closure = null): TestCall { $description = sprintf('it %s', $description); - /** @var TestCall $test */ - $test = test($description, $closure); - - return $test; + return test($description, $closure); } } if (! function_exists('todo')) { /** * Creates a new test that is marked as "todo". - * - * @return Expectable|TestCall|TestCase|mixed */ function todo(string $description): TestCall { - $test = test($description); - - assert($test instanceof TestCall); - - return $test->todo(); + return test($description)->todo(); } } @@ -192,8 +176,6 @@ if (! function_exists('afterEach')) { * Runs the given closure after each test in the current file. * * @param-closure-this TestCall $closure - * - * @return Expectable|HigherOrderTapProxy|TestCall|mixed */ function afterEach(?Closure $closure = null): AfterEachCall { @@ -236,7 +218,7 @@ if (! function_exists('covers')) { /** @var MutationTestRunner $runner */ $runner = Container::getInstance()->get(MutationTestRunner::class); - /** @var \Pest\Mutate\Repositories\ConfigurationRepository $configurationRepository */ + /** @var ConfigurationRepository $configurationRepository */ $configurationRepository = Container::getInstance()->get(ConfigurationRepository::class); $everything = $configurationRepository->cliConfiguration->toArray()['everything'] ?? false; $classes = $configurationRepository->cliConfiguration->toArray()['classes'] ?? false; @@ -263,7 +245,7 @@ if (! function_exists('mutates')) { /** @var MutationTestRunner $runner */ $runner = Container::getInstance()->get(MutationTestRunner::class); - /** @var \Pest\Mutate\Repositories\ConfigurationRepository $configurationRepository */ + /** @var ConfigurationRepository $configurationRepository */ $configurationRepository = Container::getInstance()->get(ConfigurationRepository::class); $everything = $configurationRepository->cliConfiguration->toArray()['everything'] ?? false; $classes = $configurationRepository->cliConfiguration->toArray()['classes'] ?? false; @@ -320,7 +302,7 @@ if (! function_exists('visit')) { */ function visit(array|string $url, array $options = []): ArrayablePendingAwaitablePage|PendingAwaitablePage { - if (! class_exists(\Pest\Browser\Configuration::class)) { + if (! class_exists(Pest\Browser\Configuration::class)) { PluginBrowser::install(); exit(0); diff --git a/src/Logging/Converter.php b/src/Logging/Converter.php index 50a42d1a..e0b69bb0 100644 --- a/src/Logging/Converter.php +++ b/src/Logging/Converter.php @@ -151,7 +151,7 @@ final readonly class Converter { if ($testSuite instanceof TestSuiteForTestMethodWithDataProvider) { $firstTest = $this->getFirstTest($testSuite); - if ($firstTest instanceof \PHPUnit\Event\Code\TestMethod) { + if ($firstTest instanceof TestMethod) { return $this->getTestMethodNameWithoutDatasetSuffix($firstTest); } } @@ -179,7 +179,7 @@ final readonly class Converter public function getTestSuiteLocation(TestSuite $testSuite): ?string { $firstTest = $this->getFirstTest($testSuite); - if (! $firstTest instanceof \PHPUnit\Event\Code\TestMethod) { + if (! $firstTest instanceof TestMethod) { return null; } $path = $firstTest->testDox()->prettifiedClassName(); diff --git a/src/Logging/TeamCity/TeamCityLogger.php b/src/Logging/TeamCity/TeamCityLogger.php index 19a7be69..cbbf0347 100644 --- a/src/Logging/TeamCity/TeamCityLogger.php +++ b/src/Logging/TeamCity/TeamCityLogger.php @@ -200,7 +200,7 @@ final class TeamCityLogger public function testFinished(Finished $event): void { - if (! $this->time instanceof \PHPUnit\Event\Telemetry\HRTime) { + if (! $this->time instanceof HRTime) { throw ShouldNotHappen::fromMessage('Start time has not been set.'); } diff --git a/src/Mixins/Expectation.php b/src/Mixins/Expectation.php index 09974787..f235c748 100644 --- a/src/Mixins/Expectation.php +++ b/src/Mixins/Expectation.php @@ -9,6 +9,7 @@ use Closure; use Countable; use DateTimeInterface; use Error; +use Illuminate\Testing\TestResponse; use InvalidArgumentException; use JsonSerializable; use Pest\Exceptions\InvalidExpectationValue; @@ -842,7 +843,7 @@ final class Expectation is_object($this->value) && method_exists($this->value, 'toSnapshot') => $this->value->toSnapshot(), is_object($this->value) && method_exists($this->value, '__toString') => $this->value->__toString(), is_object($this->value) && method_exists($this->value, 'toString') => $this->value->toString(), - $this->value instanceof \Illuminate\Testing\TestResponse => $this->value->getContent(), // @phpstan-ignore-line + $this->value instanceof TestResponse => $this->value->getContent(), // @phpstan-ignore-line is_array($this->value) => json_encode($this->value, JSON_THROW_ON_ERROR | JSON_PRETTY_PRINT), $this->value instanceof Traversable => json_encode(iterator_to_array($this->value), JSON_THROW_ON_ERROR | JSON_PRETTY_PRINT), $this->value instanceof JsonSerializable => json_encode($this->value->jsonSerialize(), JSON_THROW_ON_ERROR | JSON_PRETTY_PRINT), @@ -983,7 +984,7 @@ final class Expectation */ private function export(mixed $value): string { - if (! $this->exporter instanceof \Pest\Support\Exporter) { + if (! $this->exporter instanceof Exporter) { $this->exporter = Exporter::default(); } diff --git a/src/PHPStan/HigherOrderExpectationTypeExtension.php b/src/PHPStan/HigherOrderExpectationTypeExtension.php new file mode 100644 index 00000000..7b7cdfec --- /dev/null +++ b/src/PHPStan/HigherOrderExpectationTypeExtension.php @@ -0,0 +1,57 @@ +name instanceof Identifier) { + return null; + } + + $varType = $scope->getType($expr->var); + + if (! (new ObjectType(HigherOrderExpectation::class))->isSuperTypeOf($varType)->yes()) { + return null; + } + + if (! $this->reflectionProvider->hasClass(HigherOrderExpectation::class)) { + return null; + } + + $propertyName = $expr->name->name; + $classReflection = $this->reflectionProvider->getClass(HigherOrderExpectation::class); + + if (! $classReflection->hasNativeProperty($propertyName)) { + return null; + } + + return $varType->getProperty($propertyName, $scope)->getReadableType(); + } +} diff --git a/src/PendingCalls/Concerns/Describable.php b/src/PendingCalls/Concerns/Describable.php index 0208ea4b..cac2fb0b 100644 --- a/src/PendingCalls/Concerns/Describable.php +++ b/src/PendingCalls/Concerns/Describable.php @@ -4,6 +4,8 @@ declare(strict_types=1); namespace Pest\PendingCalls\Concerns; +use Pest\Support\Description; + /** * @internal */ @@ -12,14 +14,14 @@ trait Describable /** * Note: this is property is not used; however, it gets added automatically by rector php. * - * @var array + * @var array */ public array $__describing; /** * The describing of the test case. * - * @var array + * @var array */ public array $describing = []; } diff --git a/src/PendingCalls/DescribeCall.php b/src/PendingCalls/DescribeCall.php index 08ebc15e..712aedcb 100644 --- a/src/PendingCalls/DescribeCall.php +++ b/src/PendingCalls/DescribeCall.php @@ -73,7 +73,7 @@ final class DescribeCall { $filename = Backtrace::file(); - if (! $this->currentBeforeEachCall instanceof \Pest\PendingCalls\BeforeEachCall) { + if (! $this->currentBeforeEachCall instanceof BeforeEachCall) { $this->currentBeforeEachCall = new BeforeEachCall(TestSuite::getInstance(), $filename); $this->currentBeforeEachCall->describing[] = $this->description; diff --git a/src/PendingCalls/TestCall.php b/src/PendingCalls/TestCall.php index a65c8bb5..79264596 100644 --- a/src/PendingCalls/TestCall.php +++ b/src/PendingCalls/TestCall.php @@ -22,6 +22,10 @@ use Pest\Support\NullClosure; use Pest\Support\Str; use Pest\TestSuite; use PHPUnit\Framework\AssertionFailedError; +use PHPUnit\Framework\Attributes\CoversClass; +use PHPUnit\Framework\Attributes\CoversFunction; +use PHPUnit\Framework\Attributes\CoversTrait; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; /** @@ -211,7 +215,7 @@ final class TestCall // @phpstan-ignore-line { foreach ($groups as $group) { $this->testCaseMethod->attributes[] = new Attribute( - \PHPUnit\Framework\Attributes\Group::class, + Group::class, [$group], ); } @@ -604,7 +608,7 @@ final class TestCall // @phpstan-ignore-line { foreach ($classes as $class) { $this->testCaseFactoryAttributes[] = new Attribute( - \PHPUnit\Framework\Attributes\CoversClass::class, + CoversClass::class, [$class], ); } @@ -627,7 +631,7 @@ final class TestCall // @phpstan-ignore-line { foreach ($traits as $trait) { $this->testCaseFactoryAttributes[] = new Attribute( - \PHPUnit\Framework\Attributes\CoversTrait::class, + CoversTrait::class, [$trait], ); } @@ -650,7 +654,7 @@ final class TestCall // @phpstan-ignore-line { foreach ($functions as $function) { $this->testCaseFactoryAttributes[] = new Attribute( - \PHPUnit\Framework\Attributes\CoversFunction::class, + CoversFunction::class, [$function], ); } diff --git a/src/Pest.php b/src/Pest.php index ba3a540e..8595bd5f 100644 --- a/src/Pest.php +++ b/src/Pest.php @@ -6,7 +6,7 @@ namespace Pest; function version(): string { - return '4.3.2'; + return '4.4.4'; } function testDirectory(string $file = ''): string diff --git a/src/Plugins/Concerns/HandleArguments.php b/src/Plugins/Concerns/HandleArguments.php index 9cf5e606..6fdcff8c 100644 --- a/src/Plugins/Concerns/HandleArguments.php +++ b/src/Plugins/Concerns/HandleArguments.php @@ -56,4 +56,31 @@ trait HandleArguments return array_values(array_flip($arguments)); } + + /** + * Pops the given argument and its value from the arguments, returning the value. + * + * @param array $arguments + */ + public function popArgumentValue(string $argument, array &$arguments): ?string + { + foreach ($arguments as $key => $value) { + if (str_contains($value, "$argument=")) { + unset($arguments[$key]); + $arguments = array_values($arguments); + + return substr($value, strlen($argument) + 1); + } + + if ($value === $argument && isset($arguments[$key + 1])) { + $result = $arguments[$key + 1]; + unset($arguments[$key], $arguments[$key + 1]); + $arguments = array_values($arguments); + + return $result; + } + } + + return null; + } } diff --git a/src/Plugins/Coverage.php b/src/Plugins/Coverage.php index 712f5de5..ed7b1214 100644 --- a/src/Plugins/Coverage.php +++ b/src/Plugins/Coverage.php @@ -23,6 +23,8 @@ final class Coverage implements AddsOutput, HandlesArguments private const string EXACTLY_OPTION = 'exactly'; + private const string ONLY_COVERED_OPTION = 'only-covered'; + /** * Whether it should show the coverage or not. */ @@ -43,6 +45,11 @@ final class Coverage implements AddsOutput, HandlesArguments */ public ?float $coverageExactly = null; + /** + * Whether it should show only covered files. + */ + public bool $showOnlyCovered = false; + /** * Creates a new Plugin instance. */ @@ -57,7 +64,7 @@ final class Coverage implements AddsOutput, HandlesArguments public function handleArguments(array $originals): array { $arguments = [...[''], ...array_values(array_filter($originals, function (string $original): bool { - foreach ([self::COVERAGE_OPTION, self::MIN_OPTION, self::EXACTLY_OPTION] as $option) { + foreach ([self::COVERAGE_OPTION, self::MIN_OPTION, self::EXACTLY_OPTION, self::ONLY_COVERED_OPTION] as $option) { if ($original === sprintf('--%s', $option)) { return true; } @@ -80,6 +87,7 @@ final class Coverage implements AddsOutput, HandlesArguments $inputs[] = new InputOption(self::COVERAGE_OPTION, null, InputOption::VALUE_NONE); $inputs[] = new InputOption(self::MIN_OPTION, null, InputOption::VALUE_REQUIRED); $inputs[] = new InputOption(self::EXACTLY_OPTION, null, InputOption::VALUE_REQUIRED); + $inputs[] = new InputOption(self::ONLY_COVERED_OPTION, null, InputOption::VALUE_NONE); $input = new ArgvInput($arguments, new InputDefinition($inputs)); if ((bool) $input->getOption(self::COVERAGE_OPTION)) { @@ -120,6 +128,10 @@ final class Coverage implements AddsOutput, HandlesArguments $this->coverageExactly = (float) $exactlyOption; } + if ((bool) $input->getOption(self::ONLY_COVERED_OPTION)) { + $this->showOnlyCovered = true; + } + if ($_SERVER['COLLISION_PRINTER_COMPACT'] ?? false) { $this->compact = true; } @@ -144,7 +156,7 @@ final class Coverage implements AddsOutput, HandlesArguments exit(1); } - $coverage = \Pest\Support\Coverage::report($this->output, $this->compact); + $coverage = \Pest\Support\Coverage::report($this->output, $this->compact, $this->showOnlyCovered); $exitCode = (int) ($coverage < $this->coverageMin); if ($exitCode === 0 && $this->coverageExactly !== null) { diff --git a/src/Plugins/Help.php b/src/Plugins/Help.php index 096f2914..8c43fefa 100644 --- a/src/Plugins/Help.php +++ b/src/Plugins/Help.php @@ -107,6 +107,13 @@ final readonly class Help implements HandlesArguments 'desc' => 'Initialise a standard Pest configuration', ]], ...$content['Configuration']]; + $content['AI'] = [ + [ + 'arg' => '--ai', + 'desc' => 'Run a code snippet as a fully scaffolded test for AI verification', + ], + ]; + $content['Execution'] = [...[ [ 'arg' => '--parallel', @@ -160,6 +167,12 @@ final readonly class Help implements HandlesArguments ], [ 'arg' => '--coverage --min', 'desc' => 'Set the minimum required coverage percentage, and fail if not met', + ], [ + 'arg' => '--coverage --exactly', + 'desc' => 'Set the exact required coverage percentage, and fail if not met', + ], [ + 'arg' => '--coverage --only-covered', + 'desc' => 'Hide files with 0% coverage from the code coverage report', ], ...$content['Code Coverage']]; $content['Mutation Testing'] = [[ diff --git a/src/Plugins/Parallel.php b/src/Plugins/Parallel.php index 94902823..d2509695 100644 --- a/src/Plugins/Parallel.php +++ b/src/Plugins/Parallel.php @@ -127,7 +127,9 @@ final class Parallel implements HandlesArguments $arguments ); - $exitCode = $this->paratestCommand()->run(new ArgvInput($filteredArguments), new CleanConsoleOutput); + $filteredArguments = $this->processTeamcityArguments($filteredArguments); + + $exitCode = $this->paratestCommand()->run(new ArgvInput(array_values($filteredArguments)), new CleanConsoleOutput); return CallsAddsOutput::execute($exitCode); } @@ -197,4 +199,18 @@ final class Parallel implements HandlesArguments return $this->popArgument('-p', $arguments); } + + /** + * @param string[] $arguments + * @return string[] + */ + public function processTeamcityArguments(array $arguments): array + { + $argv = new ArgvInput; + if ($argv->hasParameterOption('--teamcity')) { + $arguments[] = '--teamcity'; + } + + return $arguments; + } } diff --git a/src/Plugins/Parallel/Handlers/Laravel.php b/src/Plugins/Parallel/Handlers/Laravel.php index f634be56..30063d5f 100644 --- a/src/Plugins/Parallel/Handlers/Laravel.php +++ b/src/Plugins/Parallel/Handlers/Laravel.php @@ -7,6 +7,7 @@ namespace Pest\Plugins\Parallel\Handlers; use Closure; use Composer\InstalledVersions; use Illuminate\Testing\ParallelRunner; +use Orchestra\Testbench\TestCase; use ParaTest\Options; use ParaTest\RunnerInterface; use Pest\Contracts\Plugins\HandlesArguments; @@ -39,13 +40,13 @@ final class Laravel implements HandlesArguments * Executes the given closure when running Laravel. * * @param array $arguments - * @param CLosure(array): array $closure + * @param Closure(array): array $closure * @return array */ private function whenUsingLaravel(array $arguments, Closure $closure): array { $isLaravelApplication = InstalledVersions::isInstalled('laravel/framework', false); - $isLaravelPackage = class_exists(\Orchestra\Testbench\TestCase::class); + $isLaravelPackage = class_exists(TestCase::class); if ($isLaravelApplication && ! $isLaravelPackage) { return $closure($arguments); diff --git a/src/Plugins/Parallel/Paratest/ResultPrinter.php b/src/Plugins/Parallel/Paratest/ResultPrinter.php index e7a1c24d..52fe6543 100644 --- a/src/Plugins/Parallel/Paratest/ResultPrinter.php +++ b/src/Plugins/Parallel/Paratest/ResultPrinter.php @@ -92,14 +92,13 @@ final class ResultPrinter $this->teamcityLogFileHandle = $teamcityLogFileHandle; } - /** @param list $teamcityFiles */ public function printFeedback( SplFileInfo $progressFile, SplFileInfo $outputFile, - array $teamcityFiles + ?SplFileInfo $teamcityFile, ): void { - if ($this->options->needsTeamcity) { - $teamcityProgress = $this->tailMultiple($teamcityFiles); + if ($this->options->needsTeamcity && $teamcityFile instanceof SplFileInfo) { + $teamcityProgress = $this->tailMultiple([$teamcityFile]); if ($this->teamcityLogFileHandle !== null) { fwrite($this->teamcityLogFileHandle, $teamcityProgress); @@ -171,8 +170,18 @@ final class ResultPrinter $state = (new StateGenerator)->fromPhpUnitTestResult($this->passedTests, $testResult); - $this->compactPrinter->errors($state); - $this->compactPrinter->recap($state, $testResult, $duration, $this->options); + if ($testResult->numberOfTestsRun() === 0 && $state->testSuiteTestsCount() === 0) { + $this->output->writeln([ + '', + ' INFO No tests found.', + '', + ]); + } + + if (! isset($_SERVER['PEST_PARALLEL_NO_OUTPUT'])) { + $this->compactPrinter->errors($state); + $this->compactPrinter->recap($state, $testResult, $duration, $this->options); + } } private function printFeedbackItem(string $item): void diff --git a/src/Plugins/Parallel/Paratest/WrapperRunner.php b/src/Plugins/Parallel/Paratest/WrapperRunner.php index 469f2aa6..331b0c7d 100644 --- a/src/Plugins/Parallel/Paratest/WrapperRunner.php +++ b/src/Plugins/Parallel/Paratest/WrapperRunner.php @@ -39,6 +39,7 @@ use function dirname; use function file_get_contents; use function max; use function realpath; +use function str_starts_with; use function unlink; use function unserialize; use function usleep; @@ -51,6 +52,11 @@ final class WrapperRunner implements RunnerInterface /** * The time to sleep between cycles. */ + /** + * The merged test result from the parallel run. + */ + public static ?TestResult $result = null; + private const int CYCLE_SLEEP = 10000; /** @@ -131,6 +137,7 @@ final class WrapperRunner implements RunnerInterface $parameters = $this->handleLaravelHerd($parameters); $parameters[] = $wrapper; + $parameters[] = '--test-directory='.TestSuite::getInstance()->testPath; $this->parameters = $parameters; $this->codeCoverageFilterRegistry = new CodeCoverageFilterRegistry; @@ -225,7 +232,7 @@ final class WrapperRunner implements RunnerInterface $this->printer->printFeedback( $worker->progressFile, $worker->unexpectedOutputFile, - $this->teamcityFiles, + $worker->teamcityFile ?? null, ); $worker->reset(); } @@ -385,6 +392,8 @@ final class WrapperRunner implements RunnerInterface $testResultSum->numberOfIssuesIgnoredByBaseline(), ); + self::$result = $testResultSum; + if ($this->options->configuration->cacheResult()) { $resultCacheSum = new DefaultResultCache($this->options->configuration->testResultCacheFile()); foreach ($this->resultCacheFiles as $resultCacheFile) { @@ -483,15 +492,61 @@ final class WrapperRunner implements RunnerInterface */ private function getTestFiles(SuiteLoader $suiteLoader): array { - /** @var array $files */ - $files = [ - ...array_values(array_filter( - $suiteLoader->tests, - fn (string $filename): bool => ! str_ends_with($filename, "eval()'d code") - )), - ...TestSuite::getInstance()->tests->getFilenames(), - ]; + /** @var array $files */ + $files = []; - return $files; // @phpstan-ignore-line + foreach (array_filter( + $suiteLoader->tests, + fn (string $filename): bool => ! str_ends_with($filename, "eval()'d code") + ) as $filename) { + $resolved = realpath($filename) ?: $filename; + $files[$resolved] = null; + } + + foreach (TestSuite::getInstance()->tests->getFilenames() as $filename) { + if ($this->shouldIncludeBootstrappedTestFile($filename)) { + $resolved = realpath($filename) + ?: realpath($this->options->cwd.DIRECTORY_SEPARATOR.$filename) + ?: $filename; + $files[$resolved] = null; + } + } + + return array_keys($files); // @phpstan-ignore-line + } + + private function shouldIncludeBootstrappedTestFile(string $filename): bool + { + if (! $this->options->configuration->hasCliArguments()) { + return true; + } + + $resolvedFilename = realpath($filename); + + if ($resolvedFilename === false) { + $resolvedFilename = realpath($this->options->cwd.DIRECTORY_SEPARATOR.$filename); + } + + if ($resolvedFilename === false) { + return false; + } + + foreach ($this->options->configuration->cliArguments() as $path) { + $resolvedPath = realpath($path); + + if ($resolvedPath === false) { + continue; + } + + if ($resolvedFilename === $resolvedPath) { + return true; + } + + if (is_dir($resolvedPath) && str_starts_with($resolvedFilename, $resolvedPath.DIRECTORY_SEPARATOR)) { + return true; + } + } + + return false; } } diff --git a/src/Repositories/TestRepository.php b/src/Repositories/TestRepository.php index 466d3226..cfce2cf1 100644 --- a/src/Repositories/TestRepository.php +++ b/src/Repositories/TestRepository.php @@ -113,6 +113,16 @@ final class TestRepository $this->testCaseMethodFilters[] = $filter; } + /** + * Gets the class and traits configured for the given directory path. + * + * @return array + */ + public function getUsesForPath(string $path): array + { + return $this->uses[$path][0] ?? []; + } + /** * Gets the test case factory from the given filename. */ diff --git a/src/Support/Closure.php b/src/Support/Closure.php index e447903f..bf715780 100644 --- a/src/Support/Closure.php +++ b/src/Support/Closure.php @@ -19,14 +19,14 @@ final class Closure */ public static function bind(?BaseClosure $closure, ?object $newThis, object|string|null $newScope = 'static'): BaseClosure { - if (! $closure instanceof \Closure) { + if (! $closure instanceof BaseClosure) { throw ShouldNotHappen::fromMessage('Could not bind null closure.'); } // @phpstan-ignore-next-line $closure = BaseClosure::bind($closure, $newThis, $newScope); - if (! $closure instanceof \Closure) { + if (! $closure instanceof BaseClosure) { throw ShouldNotHappen::fromMessage('Could not bind closure.'); } diff --git a/src/Support/Container.php b/src/Support/Container.php index 241825f5..d43c22be 100644 --- a/src/Support/Container.php +++ b/src/Support/Container.php @@ -28,7 +28,7 @@ final class Container */ public static function getInstance(): self { - if (! self::$instance instanceof \Pest\Support\Container) { + if (! self::$instance instanceof Container) { self::$instance = new self; } diff --git a/src/Support/Coverage.php b/src/Support/Coverage.php index 955bbfc4..a36dd8ed 100644 --- a/src/Support/Coverage.php +++ b/src/Support/Coverage.php @@ -74,7 +74,7 @@ final class Coverage * Reports the code coverage report to the * console and returns the result in float. */ - public static function report(OutputInterface $output, bool $compact = false): float + public static function report(OutputInterface $output, bool $compact = false, bool $showOnlyCovered = false): float { if (! file_exists($reportPath = self::getPath())) { if (self::usingXdebug()) { @@ -109,6 +109,10 @@ final class Coverage $basename, ]); + if ($showOnlyCovered && $file->percentageOfExecutedLines()->asFloat() === 0.0) { + continue; + } + $percentage = $file->numberOfExecutableLines() === 0 ? '100.0' : number_format($file->percentageOfExecutedLines()->asFloat(), 1, '.', ''); diff --git a/src/Support/DatasetInfo.php b/src/Support/DatasetInfo.php index c67f317c..70ca6df5 100644 --- a/src/Support/DatasetInfo.php +++ b/src/Support/DatasetInfo.php @@ -17,7 +17,7 @@ final class DatasetInfo public static function isInsideADatasetsDirectory(string $file): bool { - return basename(dirname($file)) === self::DATASETS_DIR_NAME; + return in_array(self::DATASETS_DIR_NAME, self::directorySegmentsInsideTestsDirectory($file), true); } public static function isADatasetsFile(string $file): bool @@ -32,7 +32,23 @@ final class DatasetInfo } if (self::isInsideADatasetsDirectory($file)) { - return dirname($file, 2); + $scope = []; + + foreach (self::directorySegmentsInsideTestsDirectory($file) as $segment) { + if ($segment === self::DATASETS_DIR_NAME) { + break; + } + + $scope[] = $segment; + } + + $testsDirectoryPath = self::testsDirectoryPath($file); + + if ($scope === []) { + return $testsDirectoryPath; + } + + return $testsDirectoryPath.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $scope); } if (self::isADatasetsFile($file)) { @@ -41,4 +57,45 @@ final class DatasetInfo return $file; } + + /** + * @return list + */ + private static function directorySegmentsInsideTestsDirectory(string $file): array + { + $directory = dirname(self::pathInsideTestsDirectory($file)); + + if ($directory === '.' || $directory === DIRECTORY_SEPARATOR) { + return []; + } + + return array_values(array_filter( + explode(DIRECTORY_SEPARATOR, trim($directory, DIRECTORY_SEPARATOR)), + static fn (string $segment): bool => $segment !== '', + )); + } + + private static function pathInsideTestsDirectory(string $file): string + { + $testsDirectory = DIRECTORY_SEPARATOR.trim(testDirectory(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR; + $position = strrpos($file, $testsDirectory); + + if ($position === false) { + return $file; + } + + return substr($file, $position + strlen($testsDirectory)); + } + + private static function testsDirectoryPath(string $file): string + { + $testsDirectory = DIRECTORY_SEPARATOR.trim(testDirectory(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR; + $position = strrpos($file, $testsDirectory); + + if ($position === false) { + return dirname($file); + } + + return substr($file, 0, $position + strlen($testsDirectory) - 1); + } } diff --git a/src/Support/ExceptionTrace.php b/src/Support/ExceptionTrace.php index 9d4132e2..92047840 100644 --- a/src/Support/ExceptionTrace.php +++ b/src/Support/ExceptionTrace.php @@ -26,6 +26,7 @@ final class ExceptionTrace return $closure(); } catch (Throwable $throwable) { if (Str::startsWith($message = $throwable->getMessage(), self::UNDEFINED_METHOD)) { + // @phpstan-ignore-next-line $class = preg_match('/^Call to undefined method ([^:]+)::/', $message, $matches) === false ? null : $matches[1]; $message = str_replace(self::UNDEFINED_METHOD, 'Call to undefined method ', $message); diff --git a/src/Support/Reflection.php b/src/Support/Reflection.php index d4f5f133..ac1a4273 100644 --- a/src/Support/Reflection.php +++ b/src/Support/Reflection.php @@ -8,6 +8,7 @@ use Closure; use InvalidArgumentException; use Pest\Exceptions\ShouldNotHappen; use Pest\TestSuite; +use PHPUnit\Framework\TestCase; use ReflectionClass; use ReflectionException; use ReflectionFunction; @@ -66,7 +67,7 @@ final class Reflection { $test = TestSuite::getInstance()->test; - if (! $test instanceof \PHPUnit\Framework\TestCase) { + if (! $test instanceof TestCase) { return self::bindCallable($callable); } @@ -221,7 +222,7 @@ final class Reflection { $getProperties = fn (ReflectionClass $reflectionClass): array => array_filter( array_map( - fn (ReflectionProperty $property): \ReflectionProperty => $property, + fn (ReflectionProperty $property): ReflectionProperty => $property, $reflectionClass->getProperties(), ), fn (ReflectionProperty $property): bool => $property->getDeclaringClass()->getName() === $reflectionClass->getName(), ); @@ -256,7 +257,7 @@ final class Reflection { $getMethods = fn (ReflectionClass $reflectionClass): array => array_filter( array_map( - fn (ReflectionMethod $method): \ReflectionMethod => $method, + fn (ReflectionMethod $method): ReflectionMethod => $method, $reflectionClass->getMethods($filter), ), fn (ReflectionMethod $method): bool => $method->getDeclaringClass()->getName() === $reflectionClass->getName(), ); diff --git a/src/Support/StateGenerator.php b/src/Support/StateGenerator.php index a7ddba1a..9872f52d 100644 --- a/src/Support/StateGenerator.php +++ b/src/Support/StateGenerator.php @@ -11,6 +11,10 @@ use PHPUnit\Event\Code\TestDoxBuilder; use PHPUnit\Event\Code\TestMethod; use PHPUnit\Event\Code\ThrowableBuilder; use PHPUnit\Event\Test\Errored; +use PHPUnit\Event\Test\PhpunitDeprecationTriggered; +use PHPUnit\Event\Test\PhpunitErrorTriggered; +use PHPUnit\Event\Test\PhpunitNoticeTriggered; +use PHPUnit\Event\Test\PhpunitWarningTriggered; use PHPUnit\Event\TestData\TestDataCollection; use PHPUnit\Framework\SkippedWithMessageException; use PHPUnit\Metadata\MetadataCollection; @@ -43,6 +47,8 @@ final class StateGenerator )); } + $this->addTriggeredPhpunitEvents($state, $testResult->testTriggeredPhpunitErrorEvents(), TestResult::FAIL); + foreach ($testResult->testMarkedIncompleteEvents() as $testResultEvent) { $state->add(TestResult::fromPestParallelTestCase( $testResultEvent->test(), @@ -99,6 +105,8 @@ final class StateGenerator } } + $this->addTriggeredPhpunitEvents($state, $testResult->testTriggeredPhpunitDeprecationEvents(), TestResult::DEPRECATED); + foreach ($testResult->notices() as $testResultEvent) { foreach ($testResultEvent->triggeringTests() as $triggeringTest) { ['test' => $test] = $triggeringTest; @@ -123,6 +131,8 @@ final class StateGenerator } } + $this->addTriggeredPhpunitEvents($state, $testResult->testTriggeredPhpunitNoticeEvents(), TestResult::NOTICE); + foreach ($testResult->warnings() as $testResultEvent) { foreach ($testResultEvent->triggeringTests() as $triggeringTest) { ['test' => $test] = $triggeringTest; @@ -135,6 +145,8 @@ final class StateGenerator } } + $this->addTriggeredPhpunitEvents($state, $testResult->testTriggeredPhpunitWarningEvents(), TestResult::WARN); + foreach ($testResult->phpWarnings() as $testResultEvent) { foreach ($testResultEvent->triggeringTests() as $triggeringTest) { ['test' => $test] = $triggeringTest; @@ -165,4 +177,24 @@ final class StateGenerator return $state; } + + /** + * @param array> $testResultEvents + */ + private function addTriggeredPhpunitEvents(State $state, array $testResultEvents, string $type): void + { + foreach ($testResultEvents as $events) { + foreach ($events as $event) { + if (! $event->test()->isTestMethod()) { + continue; + } + + $state->add(TestResult::fromPestParallelTestCase( + $event->test(), + $type, + ThrowableBuilder::from(new TestOutcome($event->message())) + )); + } + } + } } diff --git a/stubs/init-laravel/Pest.php.stub b/stubs/init-laravel/Pest.php.stub index 60f04a45..2c5012ca 100644 --- a/stubs/init-laravel/Pest.php.stub +++ b/stubs/init-laravel/Pest.php.stub @@ -1,5 +1,8 @@ extend(Tests\TestCase::class) - // ->use(Illuminate\Foundation\Testing\RefreshDatabase::class) +pest()->extend(TestCase::class) + // ->use(RefreshDatabase::class) ->in('Feature'); /* diff --git a/stubs/init/Pest.php.stub b/stubs/init/Pest.php.stub index b239048c..d4ffffba 100644 --- a/stubs/init/Pest.php.stub +++ b/stubs/init/Pest.php.stub @@ -1,5 +1,7 @@ extend(Tests\TestCase::class)->in('Feature'); +pest()->extend(TestCase::class)->in('Feature'); /* |-------------------------------------------------------------------------- diff --git a/tests/.pest/snapshots/Visual/Help/visual_snapshot_of_help_command_output.snap b/tests/.pest/snapshots/Visual/Help/visual_snapshot_of_help_command_output.snap index ef023f6c..f0e77b0d 100644 --- a/tests/.pest/snapshots/Visual/Help/visual_snapshot_of_help_command_output.snap +++ b/tests/.pest/snapshots/Visual/Help/visual_snapshot_of_help_command_output.snap @@ -1,5 +1,5 @@ - Pest Testing Framework 4.3.2. + Pest Testing Framework 4.4.4. USAGE: pest [options] @@ -92,7 +92,7 @@ --random-order-seed [N] Use the specified random seed when running tests in random order REPORTING OPTIONS: - --colors [flag] ......... Use colors in output ("never", "auto" or "always") + --colors=[flag] ......... Use colors in output ("never", "auto" or "always") --columns [n] ................. Number of columns to use for progress output --columns max ............ Use maximum number of columns for progress output --stderr ................................. Write to STDERR instead of STDOUT @@ -130,6 +130,8 @@ CODE COVERAGE OPTIONS: --coverage ..... Generate code coverage report and output to standard output --coverage --min Set the minimum required coverage percentage, and fail if not met + --coverage --exactly Set the exact required coverage percentage, and fail if not met + --coverage --only-covered Hide files with 0% coverage from the code coverage report --coverage-clover [file] Write code coverage report in Clover XML format to file --coverage-openclover [file] Write code coverage report in OpenClover XML format to file --coverage-cobertura [file] Write code coverage report in Cobertura XML format to file @@ -147,6 +149,9 @@ --disable-coverage-ignore ...... Disable metadata for ignoring code coverage --no-coverage Ignore code coverage reporting configured in the XML configuration file + AI OPTIONS: + --ai ..... Run a code snippet as a fully scaffolded test for AI verification + MUTATION TESTING OPTIONS: --mutate .... Runs mutation testing, to understand the quality of your tests --mutate --parallel ...................... Runs mutation testing in parallel diff --git a/tests/.pest/snapshots/Visual/Version/visual_snapshot_of_help_command_output.snap b/tests/.pest/snapshots/Visual/Version/visual_snapshot_of_help_command_output.snap index c6a7cadf..988eec06 100644 --- a/tests/.pest/snapshots/Visual/Version/visual_snapshot_of_help_command_output.snap +++ b/tests/.pest/snapshots/Visual/Version/visual_snapshot_of_help_command_output.snap @@ -1,3 +1,3 @@ - Pest Testing Framework 4.3.2. + Pest Testing Framework 4.4.4. diff --git a/tests/.snapshots/success.txt b/tests/.snapshots/success.txt index 7b3d6f9b..d6ae24e0 100644 --- a/tests/.snapshots/success.txt +++ b/tests/.snapshots/success.txt @@ -448,6 +448,10 @@ ✓ failures with custom message ✓ not failures + PASS Tests\Features\Expect\toBeCasedCorrectly + ✓ pass + ✓ failure + PASS Tests\Features\Expect\toBeDigits ✓ pass ✓ failures @@ -1034,6 +1038,10 @@ ✓ pass ✓ failures ✓ not failures + ✓ trait inheritance - direct usage + ✓ trait inheritance - inherited usage + ✓ trait inheritance - negative case + ✓ nested trait inheritance PASS Tests\Features\Expect\unless ✓ it pass @@ -1490,6 +1498,10 @@ PASS Tests\Fixtures\ExampleTest ✓ it example 2 + PASS Tests\Fixtures\ParallelNestedDatasets\TestFileWithNestedDataset + ✓ loads nested dataset with ('alice') + ✓ loads nested dataset with ('bob') + WARN Tests\Fixtures\UnexpectedOutput - output @@ -1640,9 +1652,14 @@ ✓ it cannot resolve a parameter without type PASS Tests\Unit\Support\DatasetInfo - ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Datase…rs.php', true) + ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/Datasets/project/tes…rs.php', true) #1 + ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/Datasets/project/tes…rs.php', true) #2 + ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Datase…rs.php', true) #1 + ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Datase…rs.php', true) #2 ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Datasets.php', false) - ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Featur…rs.php', true) + ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Featur…rs.php', true) #1 + ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Featur…rs.php', true) #2 + ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Featur…rs.php', true) #3 ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Featur…rs.php', false) ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Featur…ts.php', false) ✓ it can check if dataset is defined inside a Datasets.php file with ('/var/www/project/tests/Datase…rs.php', false) @@ -1650,12 +1667,18 @@ ✓ it can check if dataset is defined inside a Datasets.php file with ('/var/www/project/tests/Featur…rs.php', false) #1 ✓ it can check if dataset is defined inside a Datasets.php file with ('/var/www/project/tests/Featur…rs.php', false) #2 ✓ it can check if dataset is defined inside a Datasets.php file with ('/var/www/project/tests/Featur…ts.php', true) - ✓ it computes the dataset scope with ('/var/www/project/tests/Datase…rs.php', '/var/www/project/tests') + ✓ it computes the dataset scope with ('/var/www/Datasets/project/tes…rs.php', '/var/www/Datasets/project/tests') + ✓ it computes the dataset scope with ('/var/www/Datasets/project/tes…rs.php', '/var/www/Datasets/project/tes…atures') + ✓ it computes the dataset scope with ('/var/www/project/tests/Datase…rs.php', '/var/www/project/tests') #1 + ✓ it computes the dataset scope with ('/var/www/project/tests/Datase…rs.php', '/var/www/project/tests') #2 ✓ it computes the dataset scope with ('/var/www/project/tests/Datasets.php', '/var/www/project/tests') - ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…rs.php', '/var/www/project/tests/Features') + ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…rs.php', '/var/www/project/tests/Features') #1 + ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…rs.php', '/var/www/project/tests/Features') #2 ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…rs.php', '/var/www/project/tests/Featur…rs.php') #1 ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…ts.php', '/var/www/project/tests/Features') - ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…rs.php', '/var/www/project/tests/Featur…ollers') + ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…rs.php', '/var/www/project/tests/Featur…ollers') #1 + ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…rs.php', '/var/www/project/tests/Featur…ollers') #2 + ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…rs.php', '/var/www/project/tests/Features') #3 ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…rs.php', '/var/www/project/tests/Featur…rs.php') #2 ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…ts.php', '/var/www/project/tests/Featur…ollers') @@ -1756,6 +1779,10 @@ PASS Tests\Visual\Parallel ✓ parallel ✓ a parallel test can extend another test with same name + ✓ parallel reports invalid datasets as failures + + PASS Tests\Visual\ParallelNestedDatasets + ✓ parallel loads nested datasets from nested directories PASS Tests\Visual\SingleTestOrDirectory ✓ allows to run a single test @@ -1775,6 +1802,10 @@ - todo - todo in parallel + PASS Tests\Visual\UnicodeFilename + ✓ filter works with unicode characters in filename + ✓ filter with unicode regex matches unicode filename + WARN Tests\Visual\Version - visual snapshot of help command output @@ -1782,4 +1813,4 @@ ✓ pass with dataset with ('my-datas-set-value') ✓ within describe → pass with dataset with ('my-datas-set-value') - Tests: 2 deprecated, 4 warnings, 5 incomplete, 2 notices, 39 todos, 35 skipped, 1188 passed (2813 assertions) \ No newline at end of file + Tests: 2 deprecated, 4 warnings, 5 incomplete, 2 notices, 39 todos, 35 skipped, 1211 passed (2847 assertions) \ No newline at end of file diff --git a/tests/.tests/ParallelInvalidDataset/MissingDatasetTest.php b/tests/.tests/ParallelInvalidDataset/MissingDatasetTest.php new file mode 100644 index 00000000..c7a1245f --- /dev/null +++ b/tests/.tests/ParallelInvalidDataset/MissingDatasetTest.php @@ -0,0 +1,5 @@ +toBe('x'); +})->with('missing.dataset'); diff --git a/tests/.tests/ParallelInvalidDataset/PassingTest.php b/tests/.tests/ParallelInvalidDataset/PassingTest.php new file mode 100644 index 00000000..915336ab --- /dev/null +++ b/tests/.tests/ParallelInvalidDataset/PassingTest.php @@ -0,0 +1,3 @@ +assertTrue(true); diff --git a/tests/.tests/StraßenTest.php b/tests/.tests/StraßenTest.php new file mode 100644 index 00000000..682d1062 --- /dev/null +++ b/tests/.tests/StraßenTest.php @@ -0,0 +1,3 @@ +assertTrue(true); diff --git a/tests/Autoload.php b/tests/Autoload.php index 2d3ce530..5bd3c23b 100644 --- a/tests/Autoload.php +++ b/tests/Autoload.php @@ -1,5 +1,7 @@ bar = 0; beforeAll(function () use ($foo) { diff --git a/tests/Features/Coverage.php b/tests/Features/Coverage.php index 974568e6..55ce4164 100644 --- a/tests/Features/Coverage.php +++ b/tests/Features/Coverage.php @@ -17,7 +17,7 @@ it('adds coverage if --coverage exist', function () { $arguments = $plugin->handleArguments(['--coverage']); expect($arguments)->toEqual(['--coverage-php', Coverage::getPath()]) ->and($plugin->coverage)->toBeTrue(); -})->skip(! \Pest\Support\Coverage::isAvailable() || ! function_exists('xdebug_info') || ! in_array('coverage', xdebug_info('mode'), true), 'Coverage is not available'); +})->skip(! Coverage::isAvailable() || ! function_exists('xdebug_info') || ! in_array('coverage', xdebug_info('mode'), true), 'Coverage is not available'); it('adds coverage if --min exist', function () { $plugin = new CoveragePlugin(new ConsoleOutput); diff --git a/tests/Features/DatasetsTests.php b/tests/Features/DatasetsTests.php index 837b56f6..99682015 100644 --- a/tests/Features/DatasetsTests.php +++ b/tests/Features/DatasetsTests.php @@ -457,3 +457,88 @@ dataset('after-describe', ['after']); test('after describe block with named dataset', function (...$args) { expect($args)->toBe(['after']); })->with('after-describe'); + +test('named parameters match by parameter name', function (string $email, string $name) { + expect($name)->toBe('Taylor'); + expect($email)->toBe('taylor@laravel.com'); +})->with([ + ['name' => 'Taylor', 'email' => 'taylor@laravel.com'], +]); + +test('named parameters work with multiple dataset items', function (string $email, string $name) { + expect($name)->toBeString(); + expect($email)->toContain('@'); +})->with([ + ['name' => 'Taylor', 'email' => 'taylor@laravel.com'], + ['name' => 'James', 'email' => 'james@laravel.com'], +]); + +test('named parameters work in different order than closure params', function (string $third, string $first, string $second) { + expect($first)->toBe('a'); + expect($second)->toBe('b'); + expect($third)->toBe('c'); +})->with([ + ['first' => 'a', 'second' => 'b', 'third' => 'c'], +]); + +test('named parameters work with named dataset keys', function (string $email, string $name) { + expect($name)->toBeString(); + expect($email)->toContain('@'); +})->with([ + 'taylor' => ['name' => 'Taylor', 'email' => 'taylor@laravel.com'], + 'james' => ['name' => 'James', 'email' => 'james@laravel.com'], +]); + +test('named parameters work with closures that should be resolved', function (string $email, string $name) { + expect($name)->toBe('bar'); + expect($email)->toBe('bar@example.com'); +})->with([ + [ + 'name' => function () { + return $this->foo; + }, + 'email' => function () { + return $this->foo.'@example.com'; + }, + ], +]); + +test('named parameters work with closure type hints', function (Closure $callback, string $name) { + expect($name)->toBe('Taylor'); + expect($callback())->toBe('resolved'); +})->with([ + [ + 'name' => 'Taylor', + 'callback' => function () { + return 'resolved'; + }, + ], +]); + +dataset('named-params-dataset', [ + ['name' => 'Taylor', 'email' => 'taylor@laravel.com'], + ['name' => 'James', 'email' => 'james@laravel.com'], +]); + +test('named parameters work with registered datasets', function (string $email, string $name) { + expect($name)->toBeString(); + expect($email)->toContain('@'); +})->with('named-params-dataset'); + +test('named parameters work with bound closure returning associative array', function (string $email, string $name) { + expect($name)->toBe('bar'); + expect($email)->toBe('test@example.com'); +})->with([ + function () { + return ['name' => $this->foo, 'email' => 'test@example.com']; + }, +]); + +test('dataset items can mix named and sequential styles', function (string $name, string $email) { + expect($name)->toBeString(); + expect($email)->toContain('@'); +})->with([ + ['name' => 'Taylor', 'email' => 'taylor@laravel.com'], + ['James', 'james@laravel.com'], + ['James', 'email' => 'james@laravel.com'], +]); diff --git a/tests/Features/Expect/toBeCasedCorrectly.php b/tests/Features/Expect/toBeCasedCorrectly.php new file mode 100644 index 00000000..6a8432d2 --- /dev/null +++ b/tests/Features/Expect/toBeCasedCorrectly.php @@ -0,0 +1,12 @@ +expect('Tests\Fixtures\Arch\ToBeCasedCorrectly\CorrectCasing') + ->toBeCasedCorrectly(); + +test('failure') + ->expect('Tests\Fixtures\Arch\ToBeCasedCorrectly\IncorrectCasing') + ->toBeCasedCorrectly() + ->throws(ArchExpectationFailedException::class); diff --git a/tests/Features/Expect/toUseTrait.php b/tests/Features/Expect/toUseTrait.php index fd9c933f..806490b3 100644 --- a/tests/Features/Expect/toUseTrait.php +++ b/tests/Features/Expect/toUseTrait.php @@ -14,3 +14,19 @@ test('failures', function () { test('not failures', function () { expect('Pest\Expectations\HigherOrderExpectation')->not->toUseTrait('Pest\Concerns\Retrievable'); })->throws(ArchExpectationFailedException::class); + +test('trait inheritance - direct usage', function () { + expect('Tests\Fixtures\Arch\ToUseTrait\HasTrait\ParentClassWithTrait')->toUseTrait('Tests\Fixtures\Arch\ToUseTrait\HasTrait\TestTraitForInheritance'); +}); + +test('trait inheritance - inherited usage', function () { + expect('Tests\Fixtures\Arch\ToUseTrait\HasInheritedTrait\ChildClassExtendingParent')->toUseTrait('Tests\Fixtures\Arch\ToUseTrait\HasTrait\TestTraitForInheritance'); +}); + +test('trait inheritance - negative case', function () { + expect('Tests\Fixtures\Arch\ToUseTrait\HasInheritedTrait\ChildClassExtendingParent')->not->toUseTrait('NonExistentTrait'); +}); + +test('nested trait inheritance', function () { + expect('Tests\Fixtures\Arch\ToUseTrait\HasInheritedTrait\ChildClassExtendingParent')->toUseTrait('Tests\Fixtures\Arch\ToUseTrait\HasNestedTrait\NestedTrait'); +}); diff --git a/tests/Features/Helpers.php b/tests/Features/Helpers.php index e32faffa..d2ea9485 100644 --- a/tests/Features/Helpers.php +++ b/tests/Features/Helpers.php @@ -39,7 +39,7 @@ it('allows to call underlying protected/private methods', function () { it('throws error if method do not exist', function () { test()->foo(); -})->throws(\ReflectionException::class, 'Call to undefined method PHPUnit\Framework\TestCase::foo()'); +})->throws(ReflectionException::class, 'Call to undefined method PHPUnit\Framework\TestCase::foo()'); it('can forward unexpected calls to any global function')->_assertThat(); diff --git a/tests/Fixtures/Arch/ToBeCasedCorrectly/CorrectCasing/CorrectCasing.php b/tests/Fixtures/Arch/ToBeCasedCorrectly/CorrectCasing/CorrectCasing.php new file mode 100644 index 00000000..8418d969 --- /dev/null +++ b/tests/Fixtures/Arch/ToBeCasedCorrectly/CorrectCasing/CorrectCasing.php @@ -0,0 +1,5 @@ +not->toBeEmpty(); +})->with('nested.users'); diff --git a/tests/Helpers.php b/tests/Helpers.php index 7a7be690..f7870f38 100644 --- a/tests/Helpers.php +++ b/tests/Helpers.php @@ -1,7 +1,9 @@ use(Tests\CustomTestCase\CustomTestCase::class)->in(__DIR__); +use Tests\CustomTestCase\CustomTestCase; + +pest()->use(CustomTestCase::class)->in(__DIR__); test('closure was bound to CustomTestCase', function () { $this->assertCustomTrue(); diff --git a/tests/PHPUnit/CustomTestCaseInSubFolders/SubFolder2/UsesPerFile.php b/tests/PHPUnit/CustomTestCaseInSubFolders/SubFolder2/UsesPerFile.php index 676e80f4..edce0fe6 100644 --- a/tests/PHPUnit/CustomTestCaseInSubFolders/SubFolder2/UsesPerFile.php +++ b/tests/PHPUnit/CustomTestCaseInSubFolders/SubFolder2/UsesPerFile.php @@ -1,5 +1,7 @@ printer(); - expect($theme)->toBeInstanceOf(Pest\Configuration\Printer::class); + expect($theme)->toBeInstanceOf(Printer::class); }); diff --git a/tests/Unit/Support/DatasetInfo.php b/tests/Unit/Support/DatasetInfo.php index b00c7b94..4feb6121 100644 --- a/tests/Unit/Support/DatasetInfo.php +++ b/tests/Unit/Support/DatasetInfo.php @@ -5,9 +5,14 @@ use Pest\Support\DatasetInfo; it('can check if dataset is defined inside a Datasets directory', function (string $file, bool $inside) { expect(DatasetInfo::isInsideADatasetsDirectory($file))->toBe($inside); })->with([ + ['file' => '/var/www/Datasets/project/tests/Datasets/Nested/Numbers.php', 'inside' => true], + ['file' => '/var/www/Datasets/project/tests/Features/Datasets/Nested/Numbers.php', 'inside' => true], ['file' => '/var/www/project/tests/Datasets/Numbers.php', 'inside' => true], + ['file' => '/var/www/project/tests/Datasets/Nested/Numbers.php', 'inside' => true], ['file' => '/var/www/project/tests/Datasets.php', 'inside' => false], ['file' => '/var/www/project/tests/Features/Datasets/Numbers.php', 'inside' => true], + ['file' => '/var/www/project/tests/Features/Datasets/Nested/Numbers.php', 'inside' => true], + ['file' => '/var/www/project/tests/Features/Datasets/Nested/Datasets/Numbers.php', 'inside' => true], ['file' => '/var/www/project/tests/Features/Numbers.php', 'inside' => false], ['file' => '/var/www/project/tests/Features/Datasets.php', 'inside' => false], ]); @@ -25,12 +30,18 @@ it('can check if dataset is defined inside a Datasets.php file', function (strin it('computes the dataset scope', function (string $file, string $scope) { expect(DatasetInfo::scope($file))->toBe($scope); })->with([ + ['file' => '/var/www/Datasets/project/tests/Datasets/Nested/Numbers.php', 'scope' => '/var/www/Datasets/project/tests'], + ['file' => '/var/www/Datasets/project/tests/Features/Datasets/Nested/Numbers.php', 'scope' => '/var/www/Datasets/project/tests/Features'], ['file' => '/var/www/project/tests/Datasets/Numbers.php', 'scope' => '/var/www/project/tests'], + ['file' => '/var/www/project/tests/Datasets/Nested/Numbers.php', 'scope' => '/var/www/project/tests'], ['file' => '/var/www/project/tests/Datasets.php', 'scope' => '/var/www/project/tests'], ['file' => '/var/www/project/tests/Features/Datasets/Numbers.php', 'scope' => '/var/www/project/tests/Features'], + ['file' => '/var/www/project/tests/Features/Datasets/Nested/Numbers.php', 'scope' => '/var/www/project/tests/Features'], ['file' => '/var/www/project/tests/Features/Numbers.php', 'scope' => '/var/www/project/tests/Features/Numbers.php'], ['file' => '/var/www/project/tests/Features/Datasets.php', 'scope' => '/var/www/project/tests/Features'], ['file' => '/var/www/project/tests/Features/Controllers/Datasets/Numbers.php', 'scope' => '/var/www/project/tests/Features/Controllers'], + ['file' => '/var/www/project/tests/Features/Controllers/Datasets/Nested/Numbers.php', 'scope' => '/var/www/project/tests/Features/Controllers'], + ['file' => '/var/www/project/tests/Features/Datasets/Nested/Datasets/Numbers.php', 'scope' => '/var/www/project/tests/Features'], ['file' => '/var/www/project/tests/Features/Controllers/Numbers.php', 'scope' => '/var/www/project/tests/Features/Controllers/Numbers.php'], ['file' => '/var/www/project/tests/Features/Controllers/Datasets.php', 'scope' => '/var/www/project/tests/Features/Controllers'], ]); diff --git a/tests/Visual/Collision.php b/tests/Visual/Collision.php index 7812fc0d..99870cac 100644 --- a/tests/Visual/Collision.php +++ b/tests/Visual/Collision.php @@ -1,8 +1,10 @@ 'DefaultPrinter', 'COLLISION_IGNORE_DURATION' => 'true', 'COLLISION_TEST' => true] diff --git a/tests/Visual/Help.php b/tests/Visual/Help.php index eea3fd99..35b25989 100644 --- a/tests/Visual/Help.php +++ b/tests/Visual/Help.php @@ -1,8 +1,10 @@ 'DefaultPrinter', 'COLLISION_IGNORE_DURATION' => 'true'])); + $process = (new Process(['php', 'bin/pest', '--help'], null, ['COLLISION_PRINTER' => 'DefaultPrinter', 'COLLISION_IGNORE_DURATION' => 'true'])); $process->run(); diff --git a/tests/Visual/Parallel.php b/tests/Visual/Parallel.php index 1aced21d..68b3ee1f 100644 --- a/tests/Visual/Parallel.php +++ b/tests/Visual/Parallel.php @@ -16,10 +16,17 @@ $run = function () { test('parallel', function () use ($run) { expect($run('--exclude-group=integration')) - ->toContain('Tests: 2 deprecated, 4 warnings, 5 incomplete, 2 notices, 39 todos, 26 skipped, 1177 passed (2789 assertions)') + ->toContain('Tests: 2 deprecated, 4 warnings, 5 incomplete, 3 notices, 39 todos, 26 skipped, 1196 passed (2809 assertions)') ->toContain('Parallel: 3 processes'); })->skipOnWindows(); test('a parallel test can extend another test with same name', function () use ($run) { - expect($run('tests/Fixtures/Inheritance'))->toContain('Tests: 1 skipped, 2 passed (2 assertions)'); -}); + expect($run('tests/Fixtures/Inheritance'))->toContain('Tests: 1 skipped, 1 passed (1 assertions)'); +})->skipOnWindows(); + +test('parallel reports invalid datasets as failures', function () use ($run) { + expect($run('tests/.tests/ParallelInvalidDataset')) + ->toContain("A dataset with the name `missing.dataset` does not exist. You can create it using `dataset('missing.dataset', ['a', 'b']);`.") + ->toContain('Tests: 1 failed, 1 passed (1 assertions)') + ->toContain('Parallel: 3 processes'); +})->skipOnWindows(); diff --git a/tests/Visual/ParallelNestedDatasets.php b/tests/Visual/ParallelNestedDatasets.php new file mode 100644 index 00000000..37052556 --- /dev/null +++ b/tests/Visual/ParallelNestedDatasets.php @@ -0,0 +1,40 @@ + 'DefaultPrinter', 'COLLISION_IGNORE_DURATION' => 'true'], + ); + + $process->run(); + + return [ + 'exitCode' => $process->getExitCode(), + 'output' => removeAnsiEscapeSequences($process->getOutput().$process->getErrorOutput()), + ]; +}; + +test('parallel loads nested datasets from nested directories', function () use ($run) { + $serial = $run(); + $parallel = $run(true); + + expect($serial['exitCode'])->toBe(0) + ->and($parallel['exitCode'])->toBe(0) + ->and($serial['output'])->toContain('Tests: 2 passed (2 assertions)') + ->and($parallel['output'])->toContain('Tests: 2 passed (2 assertions)') + ->and($parallel['output'])->toContain('Parallel: 2 processes') + ->and($parallel['output'])->not->toContain('No tests found.'); +})->skipOnWindows(); diff --git a/tests/Visual/Success.php b/tests/Visual/Success.php index d87ad304..7906378f 100644 --- a/tests/Visual/Success.php +++ b/tests/Visual/Success.php @@ -1,5 +1,7 @@ 'integration', '--exclude-group' => 'integration', 'REBUILD_SNAPSHOTS' => false, 'PARATEST' => 0, 'COLLISION_PRINTER' => 'DefaultPrinter', 'COLLISION_IGNORE_DURATION' => 'true'], )); diff --git a/tests/Visual/TeamCity.php b/tests/Visual/TeamCity.php index c02ee21e..926f3957 100644 --- a/tests/Visual/TeamCity.php +++ b/tests/Visual/TeamCity.php @@ -1,5 +1,7 @@ 'DefaultPrinter', 'COLLISION_IGNORE_DURATION' => 'true']); + + $process->run(); + + $output = $process->getOutput(); + + expect($output)->toContain('StraßenTest'); + expect($output)->toContain('tests unicode filename'); + expect($output)->toContain('1 passed'); +})->skipOnWindows(); + +test('filter with unicode regex matches unicode filename', function () { + $process = new Process([ + 'php', + 'bin/pest', + '--filter=.*Straß.*', + 'tests/.tests/', + '--colors=never', + ], dirname(__DIR__, 2), ['COLLISION_PRINTER' => 'DefaultPrinter', 'COLLISION_IGNORE_DURATION' => 'true']); + + $process->run(); + + $output = $process->getOutput(); + + expect($output)->toContain('StraßenTest'); + expect($output)->toContain('1 passed'); +})->skipOnWindows(); diff --git a/tests/Visual/Version.php b/tests/Visual/Version.php index abdb6cbf..0ce85109 100644 --- a/tests/Visual/Version.php +++ b/tests/Visual/Version.php @@ -1,8 +1,10 @@ 'DefaultPrinter', 'COLLISION_IGNORE_DURATION' => 'true'])); + $process = (new Process(['php', 'bin/pest', '--version'], null, ['COLLISION_PRINTER' => 'DefaultPrinter', 'COLLISION_IGNORE_DURATION' => 'true'])); $process->run();