From ce0d197ea5c3fcccb1eeafed8333b6a910d7295a Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Sat, 14 Oct 2023 10:18:13 +0800 Subject: [PATCH 1/3] Fixes unknown option "--ansi" and "--no-ansi" fixes #1066 Signed-off-by: Mior Muhammad Zaki --- src/Console/DuskCommand.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Console/DuskCommand.php b/src/Console/DuskCommand.php index 0701b2367..3e46d5660 100644 --- a/src/Console/DuskCommand.php +++ b/src/Console/DuskCommand.php @@ -125,13 +125,21 @@ protected function phpunitArguments($options) } $options = array_values(array_filter($options, function ($option) { - return ! Str::startsWith($option, ['--env=', '--pest']); + return ! Str::startsWith($option, ['--env=', '--pest', '--ansi', '--no-ansi']); })); if (! file_exists($file = base_path('phpunit.dusk.xml'))) { $file = base_path('phpunit.dusk.xml.dist'); } + if ($this->option('ansi')) { + $options[] = '--colors="always"'; + } + + if ($this->option('no-ansi')) { + $options[] = '--colors="never"'; + } + return array_merge(['-c', $file], $options); } From 2424b6c4efed163fec231200e7f32635e618c47b Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Sat, 14 Oct 2023 10:20:12 +0800 Subject: [PATCH 2/3] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2162959f1..21810efe0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -104,6 +104,6 @@ jobs: run: php artisan serve --no-reload & - name: Run Dusk Tests - run: php artisan dusk --without-tty + run: php artisan dusk --without-tty --ansi env: APP_URL: http://127.0.0.1:8000 From 8aa6735203aaf7a186b6006ee932abb60e67561e Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Sat, 14 Oct 2023 10:24:07 +0800 Subject: [PATCH 3/3] wip Signed-off-by: Mior Muhammad Zaki --- src/Console/DuskCommand.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Console/DuskCommand.php b/src/Console/DuskCommand.php index 3e46d5660..1260c3dc2 100644 --- a/src/Console/DuskCommand.php +++ b/src/Console/DuskCommand.php @@ -132,12 +132,14 @@ protected function phpunitArguments($options) $file = base_path('phpunit.dusk.xml.dist'); } - if ($this->option('ansi')) { - $options[] = '--colors="always"'; - } + if (version_compare(Version::id(), '10.0', '>=')) { + if ($this->option('ansi')) { + $options[] = '--colors=always'; + } - if ($this->option('no-ansi')) { - $options[] = '--colors="never"'; + if ($this->option('no-ansi')) { + $options[] = '--colors=never'; + } } return array_merge(['-c', $file], $options);