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

fix: resolve test directory before function call

Browse Source
This commit is contained in:
Owen Voke
2021-05-14 09:33:52 +01:00
parent fb0eef4200
commit 41ce87450f
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Laravel/Commands/PestDatasetCommand.php
View File

@ -8,6 +8,7 @@ use Illuminate\Console\Command;
use Illuminate\Support\Facades\File;
use Illuminate\Support\Str;
use Pest\Exceptions\InvalidConsoleArgument;
use Pest\TestSuite;
use function Pest\testDirectory;
/**
@ -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,8 @@ final class PestDatasetCommand extends Command
*/
public function handle(): void
{
TestSuite::getInstance(base_path(), $this->option('test-directory', 'tests'));
/** @var string $name */
$name = $this->argument('name');

5
src/Laravel/Commands/PestInstallCommand.php
View File

@ -8,6 +8,7 @@ use Illuminate\Console\Command;
use Illuminate\Support\Facades\File;
use Pest\Console\Thanks;
use Pest\Exceptions\InvalidConsoleArgument;
use Pest\TestSuite;
use function Pest\testDirectory;
/**
@ -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,8 @@ final class PestInstallCommand extends Command
*/
public function handle(): void
{
TestSuite::getInstance(base_path(), $this->option('test-directory', 'tests'));
/* @phpstan-ignore-next-line */
$pest = base_path(testDirectory('Pest.php'));
$stubs = 'stubs/Laravel';

8
src/Laravel/Commands/PestTestCommand.php
View File

@ -8,6 +8,7 @@ use Illuminate\Console\Command;
use Illuminate\Support\Facades\File;
use Pest\Exceptions\InvalidConsoleArgument;
use Pest\Support\Str;
use Pest\TestSuite;
use function Pest\testDirectory;
/**
@ -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,15 @@ final class PestTestCommand extends Command
*/
public function handle(): void
{
TestSuite::getInstance(base_path(), $this->option('test-directory', 'tests'));
/** @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)
);