docs: update changelog

chore(deps): add support for PHPUnit 9.5.1

.github/FUNDING.yml

@@ -1,5 +1,5 @@
 # These are supported funding model platforms
 
-github: nunomaduro
+github: [nunomaduro,owenvoke,olivernybroe,octoper]
 patreon: nunomaduro
 custom: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66BYDWAT92N6L

CHANGELOG.md

@@ -4,6 +4,37 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [v1.0.2 (2021-02-04)](https://github.com/pestphp/pest/compare/v1.0.1...v1.0.2)
+### Added
+- Support for PHPUnit 9.5.2 ([#267](https://github.com/pestphp/pest/pull/267))
+
+## [v1.0.1 (2021-01-18)](https://github.com/pestphp/pest/compare/v1.0.0...v1.0.1)
+### Added
+- Support for PHPUnit 9.5.1 ([#261](https://github.com/pestphp/pest/pull/261))
+
+### Fixed
+- Fix `TestCase@expect` PHPDoc tag ([#251](https://github.com/pestphp/pest/pull/251))
+
+## [v1.0.0 (2021-01-03)](https://github.com/pestphp/pest/compare/v0.3.19...v1.0.0)
+### Added
+- `pest:test --dusk` option ([#245](https://github.com/pestphp/pest/pull/245))
+
+### Changed
+- Stable version
+- Updates init structure ([#240](https://github.com/pestphp/pest/pull/240))
+
+## [v0.3.19 (2020-12-27)](https://github.com/pestphp/pest/compare/v0.3.18...v0.3.19)
+### Fixed
+- Fix binary path in `pest:dusk` command ([#239](https://github.com/pestphp/pest/pull/239))
+
+## [v0.3.18 (2020-12-26)](https://github.com/pestphp/pest/compare/v0.3.17...v0.3.18)
+### Added
+- `toBeJson()` expectation ([plugin-expectations#2](https://github.com/pestphp/pest-plugin-expectations/pull/2))
+
+## [v0.3.17 (2020-12-20)](https://github.com/pestphp/pest/compare/v0.3.16...v0.3.17)
+### Fixed
+- Class inheritance with `depends()` ([#236](https://github.com/pestphp/pest/pull/236))
+
 ## [v0.3.16 (2020-12-13)](https://github.com/pestphp/pest/compare/v0.3.15...v0.3.16)
 ### Changed
 - Moves expectation API for external plugin ([5d7f262](https://github.com/pestphp/pest/commit/5d7f262f4ab280a660a85900f402eebb23abfda8))

README.md

@@ -21,6 +21,7 @@ We would like to extend our thanks to the following sponsors for funding Pest de
 
 ### Premium Sponsors
 
-- **[Scout APM](https://github.com/scoutapp)**
+- **[Scout APM](https://scoutapm.com)**
+- **[Akaunting](https://akaunting.com)**
 
 Pest was created by **[Nuno Maduro](https://twitter.com/enunomaduro)** under the **[Sponsorware license](https://github.com/sponsorware/docs)**. It got open-sourced and is now licensed under the **[MIT license](https://opensource.org/licenses/MIT)**.

bin/pest

@@ -19,13 +19,16 @@ use Symfony\Component\Console\Output\OutputInterface;
 
     if (file_exists($vendorPath)) {
         include_once $vendorPath;
+        $autoloadPath = $vendorPath;
     } else {
         include_once $localPath;
+        $autoloadPath = $localPath;
     }
 
     (new Provider())->register();
 
-    $rootPath = getcwd();
+    // get $rootPath based on $autoloadPath
+    $rootPath =  dirname($autoloadPath, 2);
 
     $testSuite = TestSuite::getInstance($rootPath);
 

composer.json

@@ -19,11 +19,11 @@
     "require": {
         "php": "^7.3 || ^8.0",
         "nunomaduro/collision": "^5.0",
-        "pestphp/pest-plugin": "^0.3",
-        "pestphp/pest-plugin-coverage": "^0.3",
-        "pestphp/pest-plugin-expectations": "^0.3.2",
-        "pestphp/pest-plugin-init": "^0.3",
-        "phpunit/phpunit": ">= 9.3.7 <= 9.5.0"
+        "pestphp/pest-plugin": "^1.0",
+        "pestphp/pest-plugin-coverage": "^1.0",
+        "pestphp/pest-plugin-expectations": "^1.0",
+        "pestphp/pest-plugin-init": "^1.0",
+        "phpunit/phpunit": ">= 9.3.7 <= 9.5.2"
     },
     "autoload": {
         "psr-4": {
@@ -43,8 +43,8 @@
         ]
     },
     "require-dev": {
-        "illuminate/console": "^7.16.1",
-        "illuminate/support": "^7.16.1",
+        "illuminate/console": "^8.0",
+        "illuminate/support": "^8.0",
         "laravel/dusk": "^6.9.1",
         "mockery/mockery": "^1.4.1",
         "pestphp/pest-dev-tools": "dev-master"
@@ -74,7 +74,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.4.x-dev"
+            "dev-master": "1.x-dev"
         },
         "pest": {
             "plugins": [

src/Concerns/TestCase.php

@@ -7,6 +7,7 @@ namespace Pest\Concerns;
 use Closure;
 use Pest\Support\ExceptionTrace;
 use Pest\TestSuite;
+use PHPUnit\Framework\ExecutionOrderDependency;
 use PHPUnit\Util\Test;
 use Throwable;
 
@@ -54,6 +55,24 @@ trait TestCase
         $this->setGroups($groups);
     }
 
+    /**
+     * Add dependencies to the test case and map them to instances of ExecutionOrderDependency.
+     */
+    public function addDependencies(array $tests): void
+    {
+        $className = get_class($this);
+
+        $tests = array_map(function (string $test) use ($className): ExecutionOrderDependency {
+            if (strpos($test, '::') === false) {
+                $test = "{$className}::{$test}";
+            }
+
+            return new ExecutionOrderDependency($test, null, '');
+        }, $tests);
+
+        $this->setDependencies($tests);
+    }
+
     /**
      * Returns the test case name. Note that, in Pest
      * we ignore withDataset argument as the description

src/Factories/TestCaseFactory.php

@@ -156,14 +156,6 @@ final class TestCaseFactory
         return array_map($createTest, array_keys($datasets), $datasets);
     }
 
-    /**
-     * Makes a fully qualified class name from the current filename.
-     */
-    public function getClassName(): string
-    {
-        return $this->makeClassFromFilename($this->filename);
-    }
-
     /**
      * Makes a fully qualified class name from the given filename.
      */

src/Laravel/Commands/PestDuskCommand.php

@@ -33,9 +33,9 @@ final class PestDuskCommand extends DuskCommand
     protected function binary()
     {
         if ('phpdbg' === PHP_SAPI) {
-            return [PHP_BINARY, '-qrr', 'vendor/bin/pest'];
+            return [PHP_BINARY, '-qrr', 'vendor/pestphp/pest/bin/pest'];
         }
 
-        return [PHP_BINARY, 'vendor/bin/pest'];
+        return [PHP_BINARY, 'vendor/pestphp/pest/bin/pest'];
     }
 }

src/Laravel/Commands/PestInstallCommand.php

@@ -8,7 +8,6 @@ use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
 use Pest\Console\Thanks;
 use Pest\Exceptions\InvalidConsoleArgument;
-use Pest\Support\Str;
 
 /**
  * @internal
@@ -36,14 +35,10 @@ final class PestInstallCommand extends Command
     {
         /* @phpstan-ignore-next-line */
         $pest    = base_path('tests/Pest.php');
-        /* @phpstan-ignore-next-line */
-        $helpers = base_path('tests/Helpers.php');
-        $stubs   = $this->isLumen() ? 'stubs/Lumen' : 'stubs/Laravel';
+        $stubs   = 'stubs/Laravel';
 
-        foreach ([$pest, $helpers] as $file) {
-            if (File::exists($file)) {
-                throw new InvalidConsoleArgument(sprintf('%s already exist', $file));
-            }
+        if (File::exists($pest)) {
+            throw new InvalidConsoleArgument(sprintf('%s already exist', $pest));
         }
 
         File::copy(implode(DIRECTORY_SEPARATOR, [
@@ -52,26 +47,10 @@ final class PestInstallCommand extends Command
             'Pest.php',
         ]), $pest);
 
-        File::copy(implode(DIRECTORY_SEPARATOR, [
-            dirname(__DIR__, 3),
-            $stubs,
-            'Helpers.php',
-        ]), $helpers);
-
         $this->output->success('`tests/Pest.php` created successfully.');
-        $this->output->success('`tests/Helpers.php` created successfully.');
 
         if (!(bool) $this->option('no-interaction')) {
             (new Thanks($this->output))();
         }
     }
-
-    /**
-     * Determine if this is a Lumen application.
-     */
-    private function isLumen(): bool
-    {
-        /* @phpstan-ignore-next-line */
-        return Str::startsWith(app()->version(), 'Lumen');
-    }
 }

src/Laravel/Commands/PestTestCommand.php

@@ -19,7 +19,7 @@ final class PestTestCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'pest:test {name : The name of the file} {--unit : Create a unit test}';
+    protected $signature = 'pest:test {name : The name of the file} {--unit : Create a unit test} {--dusk : Create a Dusk test}';
 
     /**
      * The console command description.
@@ -36,7 +36,7 @@ final class PestTestCommand extends Command
         /** @var string $name */
         $name = $this->argument('name');
 
-        $type = ((bool) $this->option('unit')) ? 'Unit' : 'Feature';
+        $type = ((bool) $this->option('unit')) ? 'Unit' : (((bool) $this->option('dusk')) ? 'Browser' : 'Feature');
 
         $relativePath = sprintf('tests/%s/%s.php',
             $type,

src/PendingObjects/TestCall.php

@@ -9,11 +9,10 @@ use Pest\Factories\TestCaseFactory;
 use Pest\Support\Backtrace;
 use Pest\Support\NullClosure;
 use Pest\TestSuite;
-use PHPUnit\Framework\ExecutionOrderDependency;
 use SebastianBergmann\Exporter\Exporter;
 
 /**
- * @method \Pest\Expectation expect(mixed $value)
+ * @method \Pest\Expectations\Expectation expect(mixed $value)
  *
  * @internal
  */
@@ -92,19 +91,9 @@ final class TestCall
      */
     public function depends(string ...$tests): TestCall
     {
-        $className = $this->testCaseFactory->getClassName();
-
-        $tests = array_map(function (string $test) use ($className): ExecutionOrderDependency {
-            if (strpos($test, '::') === false) {
-                $test = "{$className}::{$test}";
-            }
-
-            return new ExecutionOrderDependency($test, null, '');
-        }, $tests);
-
         $this->testCaseFactory
             ->factoryProxies
-            ->add(Backtrace::file(), Backtrace::line(), 'setDependencies', [$tests]);
+            ->add(Backtrace::file(), Backtrace::line(), 'addDependencies', [$tests]);
 
         return $this;
     }

src/Pest.php

@@ -6,5 +6,5 @@ namespace Pest;
 
 function version(): string
 {
-    return '0.3.15';
+    return '1.0.2';
 }

src/TeamCity.php

@@ -205,6 +205,9 @@ final class TeamCity extends DefaultResultPrinter
 
     private static function isPestTest(Test $test): bool
     {
-        return in_array(TestCase::class, class_uses($test), true);
+        /** @var array<string, string> $uses */
+        $uses = class_uses($test);
+
+        return in_array(TestCase::class, $uses, true);
     }
 }

stubs/Browser.php

@@ -0,0 +1,10 @@
+<?php
+
+use Laravel\Dusk\Browser;
+
+it('has {name} page', function () {
+    $this->browse(function (Browser $browser) {
+        $browser->visit('/{name}')
+            ->assertSee('{name}');
+    });
+});

stubs/Laravel/Helpers.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace Tests;
-
-/**
- * A basic assert example.
- */
-function assertExample(): void
-{
-    test()->assertTrue(true);
-}

stubs/Laravel/Pest.php

@@ -1,3 +1,45 @@
 <?php
 
+/*
+|--------------------------------------------------------------------------
+| Test Case
+|--------------------------------------------------------------------------
+|
+| The closure you provide to your test functions is always bound to a specific PHPUnit test
+| case class. By default, that class is "PHPUnit\Framework\TestCase". Of course, you may
+| need to change it using the "uses()" function to bind a different classes or traits.
+|
+*/
+
 uses(Tests\TestCase::class)->in('Feature');
+
+/*
+|--------------------------------------------------------------------------
+| Expectations
+|--------------------------------------------------------------------------
+|
+| When you're writing tests, you often need to check that values meet certain conditions. The
+| "expect()" function gives you access to a set of "expectations" methods that you can use
+| to assert different things. Of course, you may extend the Expectation API at any time.
+|
+*/
+
+expect()->extend('toBeOne', function () {
+    return $this->toBe(1);
+});
+
+/*
+|--------------------------------------------------------------------------
+| Functions
+|--------------------------------------------------------------------------
+|
+| While Pest is very powerful out-of-the-box, you may have some testing code specific to your
+| project that you don't want to repeat in every file. Here you can also expose helpers as
+| global functions to help you to reduce the number of lines of code in your test files.
+|
+*/
+
+function something()
+{
+    // ..
+}

stubs/Lumen/Helpers.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace Tests;
-
-/**
- * A basic assert example.
- */
-function assertExample(): void
-{
-    test()->assertTrue(true);
-}

stubs/Lumen/Pest.php

@@ -1,3 +0,0 @@
-<?php
-
-uses(TestCase::class)->in(__DIR__);

stubs/Lumen/phpunit.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         colors="true"
->
-    <testsuites>
-        <testsuite name="Application Test Suite">
-            <directory suffix="Test.php">./tests</directory>
-        </testsuite>
-    </testsuites>
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">./app</directory>
-        </include>
-    </coverage>
-</phpunit>

tests/.snapshots/success.txt

@@ -184,5 +184,9 @@
   ✓ depends run test only once
   ✓ depends works with the correct test name
 
-  Tests:  7 skipped, 106 passed
+   PASS  Tests\Features\DependsInheritance
+  ✓ it is a test
+  ✓ it uses correct parent class
+
+  Tests:  7 skipped, 108 passed
   

tests/Features/DependsInheritance.php

@@ -0,0 +1,22 @@
+<?php
+
+use PHPUnit\Framework\TestCase;
+
+class InheritanceTest extends TestCase
+{
+    public function foo()
+    {
+        return 'bar';
+    }
+}
+
+uses(InheritanceTest::class);
+
+it('is a test', function () {
+    expect(true)->toBeTrue();
+});
+
+it('uses correct parent class', function () {
+    expect(get_parent_class($this))->toEqual(InheritanceTest::class);
+    expect($this->foo())->toEqual('bar');
+})->depends('it is a test');