Skip to content

Commit cc6f3bd

Browse files
committed
refactor: Remove TogglesHeadlessMode redundant methods
laravel/dusk#1098 Laravel Dusk 8.x now defines these methods in class Laravel\Dusk\TestCase so the stub classes that extend TestCase don't need to redefine hasHeadlessDisabled() and shouldStartMaximized().
1 parent d798ea5 commit cc6f3bd

File tree

3 files changed

+32
-28
lines changed

3 files changed

+32
-28
lines changed

src/Concerns/TogglesHeadlessMode.php

-22
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,4 @@ protected function filterHeadlessArguments(array $args = [])
1919
]);
2020
})->values()->all();
2121
}
22-
23-
/**
24-
* Determine whether the Dusk command has disabled headless mode.
25-
*
26-
* @return bool
27-
*/
28-
protected function hasHeadlessDisabled()
29-
{
30-
return isset($_SERVER['DUSK_HEADLESS_DISABLED']) ||
31-
isset($_ENV['DUSK_HEADLESS_DISABLED']);
32-
}
33-
34-
/**
35-
* Determine if the browser window should start maximized.
36-
*
37-
* @return bool
38-
*/
39-
protected function shouldStartMaximized()
40-
{
41-
return isset($_SERVER['DUSK_START_MAXIMIZED']) ||
42-
isset($_ENV['DUSK_START_MAXIMIZED']);
43-
}
4422
}

tests/Stubs/TogglesHeadlessStub.php

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?php
2+
3+
namespace Derekmd\Dusk\Tests\Stubs;
4+
5+
use Derekmd\Dusk\Concerns\TogglesHeadlessMode;
6+
use Laravel\Dusk\TestCase;
7+
8+
class TogglesHeadlessStub extends TestCase
9+
{
10+
use TogglesHeadlessMode {
11+
filterHeadlessArguments as filterHeadlessArgumentsProtected;
12+
}
13+
14+
public function __construct()
15+
{
16+
parent::__construct('TogglesHeadless');
17+
}
18+
19+
public function createApplication()
20+
{
21+
// Not needed in this test suite. Method must be declared for PHPUnit v10.
22+
}
23+
24+
public function filterHeadlessArguments($args)
25+
{
26+
return $this->filterHeadlessArgumentsProtected($args);
27+
}
28+
}

tests/TogglesHeadlessModeTest.php

+4-6
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22

33
namespace Derekmd\Dusk\Tests;
44

5-
use Derekmd\Dusk\Concerns\TogglesHeadlessMode;
5+
use Derekmd\Dusk\Tests\Stubs\TogglesHeadlessStub;
66
use PHPUnit\Framework\TestCase;
77

88
class TogglesHeadlessModeTest extends TestCase
99
{
10-
use TogglesHeadlessMode;
11-
12-
protected function tearDown() : void
10+
protected function tearDown(): void
1311
{
1412
unset($_ENV['DUSK_HEADLESS_DISABLED']);
1513

@@ -20,7 +18,7 @@ public function test_building_arguments_with_headless_mode()
2018
{
2119
unset($_ENV['DUSK_HEADLESS_DISABLED']);
2220

23-
$args = $this->filterHeadlessArguments([
21+
$args = (new TogglesHeadlessStub)->filterHeadlessArguments([
2422
'--disable-gpu',
2523
'--headless',
2624
'--window-size=1920,1080',
@@ -37,7 +35,7 @@ public function test_building_arguments_when_headless_mode_is_disabled()
3735
{
3836
$_ENV['DUSK_HEADLESS_DISABLED'] = true;
3937

40-
$args = $this->filterHeadlessArguments([
38+
$args = (new TogglesHeadlessStub)->filterHeadlessArguments([
4139
'--disable-gpu',
4240
'--headless',
4341
'--window-size=1920,1080',

0 commit comments

Comments
 (0)