Skip to content

Commit

Permalink
Merge pull request #800 from laravel/laravel8
Browse files Browse the repository at this point in the history
[6.x] Support Laravel 8
  • Loading branch information
driesvints authored Aug 25, 2020
2 parents db10ac7 + d94fad8 commit cfd09a8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@ jobs:
fail-fast: true
matrix:
php: [7.2, 7.3, 7.4]
laravel: [^6.0, ^7.0]
laravel: [^6.0, ^7.0, ^8.0]
phpunit: [^7.5, ^8.0, ^9.0]
exclude:
- php: 7.2
phpunit: ^9.0
- php: 7.2
laravel: ^8.0

name: P${{ matrix.php }} - L${{ matrix.laravel }} - U${{ matrix.phpunit }}

Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"ext-zip": "*",
"php-webdriver/webdriver": "^1.8.1",
"nesbot/carbon": "^2.0",
"illuminate/console": "^6.0|^7.0",
"illuminate/support": "^6.0|^7.0",
"illuminate/console": "^6.0|^7.0|^8.0",
"illuminate/support": "^6.0|^7.0|^8.0",
"symfony/console": "^4.3|^5.0",
"symfony/finder": "^4.3|^5.0",
"symfony/process": "^4.3|^5.0",
Expand Down
6 changes: 3 additions & 3 deletions tests/ComponentTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ public function test_resolver_prefix()
$driver = m::mock(stdClass::class);
$browser = new Browser($driver);

$browser->within($component = new TestComponent, function ($browser) use ($component) {
$browser->within($component = new TestComponent, function ($browser) {
$this->assertEquals('body #component-root', $browser->resolver->prefix);

$browser->within($nested = new TestNestedComponent, function ($browser) use ($nested) {
$browser->within($nested = new TestNestedComponent, function ($browser) {
$this->assertEquals('body #component-root #nested-root', $browser->resolver->prefix);

$browser->with('prefix', function ($browser) {
Expand Down Expand Up @@ -75,7 +75,7 @@ public function test_component_elements()
'@overridden-alias' => '#not-overridden',
], $browser->resolver->elements);

$browser->within($nested = new TestNestedComponent, function ($browser) use ($nested) {
$browser->within($nested = new TestNestedComponent, function ($browser) {
$this->assertEquals([
'@nested-alias' => '#nested-alias',
'@overridden-alias' => '#overridden',
Expand Down

0 comments on commit cfd09a8

Please sign in to comment.