Merge branch 'master' of https://github.com/pestphp/pest

fix: resolve test directory before function call

CHANGELOG.md

@@ -4,6 +4,10 @@ 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.2.1 (2021-05-14)](https://github.com/pestphp/pest/compare/v1.2.0...v1.2.1)
+### Fixed
+- Laravel commands failing with new `--test-directory` option ([#297](https://github.com/pestphp/pest/pull/297))
+
 ## [v1.2.0 (2021-05-13)](https://github.com/pestphp/pest/compare/v1.1.0...v1.2.0)
 ### Added
 - Adds JUnit / Infection support ([#291](https://github.com/pestphp/pest/pull/291))

src/Laravel/Commands/PestDatasetCommand.php

@@ -9,6 +9,7 @@ use Illuminate\Support\Facades\File;
 use Illuminate\Support\Str;
 use Pest\Exceptions\InvalidConsoleArgument;
 use function Pest\testDirectory;
+use Pest\TestSuite;
 
 /**
  * @internal
@@ -20,7 +21,8 @@ final class PestDatasetCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'pest:dataset {name : The name of the dataset}';
+    protected $signature = 'pest:dataset {name : The name of the dataset}
+                                         {--test-directory=tests : The name of the tests directory}';
 
     /**
      * The console command description.
@@ -34,6 +36,9 @@ final class PestDatasetCommand extends Command
      */
     public function handle(): void
     {
+        /* @phpstan-ignore-next-line */
+        TestSuite::getInstance(base_path(), $this->option('test-directory'));
+
         /** @var string $name */
         $name = $this->argument('name');
 

src/Laravel/Commands/PestInstallCommand.php

@@ -9,6 +9,7 @@ use Illuminate\Support\Facades\File;
 use Pest\Console\Thanks;
 use Pest\Exceptions\InvalidConsoleArgument;
 use function Pest\testDirectory;
+use Pest\TestSuite;
 
 /**
  * @internal
@@ -20,7 +21,7 @@ final class PestInstallCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'pest:install';
+    protected $signature = 'pest:install {--test-directory=tests : The name of the tests directory}';
 
     /**
      * The console command description.
@@ -34,6 +35,9 @@ final class PestInstallCommand extends Command
      */
     public function handle(): void
     {
+        /* @phpstan-ignore-next-line */
+        TestSuite::getInstance(base_path(), $this->option('test-directory'));
+
         /* @phpstan-ignore-next-line */
         $pest    = base_path(testDirectory('Pest.php'));
         $stubs   = 'stubs/Laravel';

src/Laravel/Commands/PestTestCommand.php

@@ -9,6 +9,7 @@ use Illuminate\Support\Facades\File;
 use Pest\Exceptions\InvalidConsoleArgument;
 use Pest\Support\Str;
 use function Pest\testDirectory;
+use Pest\TestSuite;
 
 /**
  * @internal
@@ -20,7 +21,7 @@ final class PestTestCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'pest:test {name : The name of the file} {--unit : Create a unit test} {--dusk : Create a Dusk test}';
+    protected $signature = 'pest:test {name : The name of the file} {--unit : Create a unit test} {--dusk : Create a Dusk test} {--test-directory=tests : The name of the tests directory}';
 
     /**
      * The console command description.
@@ -34,12 +35,16 @@ final class PestTestCommand extends Command
      */
     public function handle(): void
     {
+        /* @phpstan-ignore-next-line */
+        TestSuite::getInstance(base_path(), $this->option('test-directory'));
+
         /** @var string $name */
         $name = $this->argument('name');
 
         $type = ((bool) $this->option('unit')) ? 'Unit' : (((bool) $this->option('dusk')) ? 'Browser' : 'Feature');
 
-        $relativePath = sprintf(testDirectory('%s/%s.php'),
+        $relativePath = sprintf(
+            testDirectory('%s/%s.php'),
             $type,
             ucfirst($name)
         );

src/Pest.php

@@ -6,7 +6,7 @@ namespace Pest;
 
 function version(): string
 {
-    return '1.2.0';
+    return '1.2.1';
 }
 
 function testDirectory(string $file = ''): string