-
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5815 from thedevdojo/1.6-l10-failing-tests
Fix failing tests for Laravel 10
- Loading branch information
Showing
26 changed files
with
136 additions
and
141 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -76,4 +76,5 @@ jobs: | |
|
||
# Run phpunit tests | ||
- name: Run tests | ||
run: ./vendor/bin/phpunit | ||
run: ./vendor/bin/phpunit --no-coverage | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,3 +6,4 @@ build | |
.lock | ||
composer.lock | ||
.phpunit.result.cache | ||
.phpunit.cache |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,55 +1,65 @@ | ||
{ | ||
"name": "tcg/voyager", | ||
"description": "A Laravel Admin Package for The Control Group to make your life easier and steer your project in the right direction", | ||
"keywords": ["laravel", "admin", "panel"], | ||
"license": "MIT", | ||
"homepage": "https://voyager.devdojo.com/", | ||
"support": { | ||
"issues": "https://github.com/the-control-group/voyager/issues", | ||
"source": "https://github.com/the-control-group/voyager" | ||
}, | ||
"authors": [ | ||
{ | ||
"name": "Tony Lea", | ||
"email": "tony.lea@thecontrolgroup.com" | ||
} | ||
], | ||
"require": { | ||
"php": "^7.3|^7.4|^8.0", | ||
"illuminate/support": "~8.0|~9.0|~10.0", | ||
"intervention/image": "^2.4", | ||
"doctrine/dbal": "^3.1|^3.5", | ||
"laravel/ui": ">=1.0", | ||
"arrilot/laravel-widgets": "^3.7", | ||
"league/flysystem": "~1.1|~2.0|~3.0", | ||
"ext-json": "*" | ||
}, | ||
"require-dev": { | ||
"phpunit/phpcov": ">=6.0", | ||
"phpunit/phpunit": ">=8.0", | ||
"laravel/framework": "~8.0|~9.0|~10.0", | ||
"orchestra/testbench": ">=6.0", | ||
"laravel/browser-kit-testing": ">=6.1.0", | ||
"orchestra/testbench-browser-kit": ">=4.0" | ||
}, | ||
"autoload": { | ||
"psr-4": { | ||
"TCG\\Voyager\\": "src/" | ||
} | ||
}, | ||
"autoload-dev": { | ||
"psr-4": { | ||
"TCG\\Voyager\\Tests\\": "tests/", | ||
"TCG\\Voyager\\Tests\\Database\\Factories\\": "tests/database/factories/" | ||
} | ||
}, | ||
"minimum-stability": "stable", | ||
"extra": { | ||
"laravel": { | ||
"providers": [ | ||
"TCG\\Voyager\\VoyagerServiceProvider", | ||
"TCG\\Voyager\\Providers\\VoyagerDummyServiceProvider" | ||
] | ||
} | ||
"name": "tcg/voyager", | ||
"description": "A Laravel Admin Package for The Control Group to make your life easier and steer your project in the right direction", | ||
"keywords": [ | ||
"laravel", | ||
"admin", | ||
"panel" | ||
], | ||
"license": "MIT", | ||
"homepage": "https://voyager.devdojo.com/", | ||
"support": { | ||
"issues": "https://github.com/the-control-group/voyager/issues", | ||
"source": "https://github.com/the-control-group/voyager" | ||
}, | ||
"authors": [ | ||
{ | ||
"name": "Tony Lea", | ||
"email": "tony.lea@thecontrolgroup.com" | ||
} | ||
], | ||
"require": { | ||
"php": "^7.3|^7.4|^8.0|^8.1|^8.2", | ||
"illuminate/support": "~8.0|~9.0|~10.0", | ||
"intervention/image": "^2.7", | ||
"doctrine/dbal": "^3.1|^3.5", | ||
"laravel/ui": ">=1.0", | ||
"arrilot/laravel-widgets": "^3.7", | ||
"league/flysystem": "~1.1|~2.0|~3.0", | ||
"ext-json": "*" | ||
}, | ||
"require-dev": { | ||
"phpunit/phpcov": ">=6.0", | ||
"phpunit/phpunit": ">=8.0", | ||
"laravel/framework": "~8.0|~9.0|~10.0", | ||
"orchestra/testbench": ">=6.0", | ||
"laravel/browser-kit-testing": ">=6.1.0", | ||
"orchestra/testbench-browser-kit": ">=4.0" | ||
}, | ||
"autoload": { | ||
"psr-4": { | ||
"TCG\\Voyager\\": "src/" | ||
} | ||
}, | ||
"autoload-dev": { | ||
"psr-4": { | ||
"TCG\\Voyager\\Tests\\": "tests/", | ||
"TCG\\Voyager\\Tests\\Database\\Factories\\": "tests/database/factories/", | ||
"Database\\Seeders\\": "vendor/orchestra/testbench-core/laravel/database/seeders" | ||
} | ||
}, | ||
"minimum-stability": "stable", | ||
"extra": { | ||
"laravel": { | ||
"providers": [ | ||
"TCG\\Voyager\\VoyagerServiceProvider", | ||
"TCG\\Voyager\\Providers\\VoyagerDummyServiceProvider" | ||
] | ||
} | ||
}, | ||
"scripts": { | ||
"post-autoload-dump": [ | ||
"@php vendor/bin/testbench package:discover --ansi" | ||
] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,34 +1,28 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<phpunit backupGlobals="false" | ||
backupStaticAttributes="false" | ||
bootstrap="tests/bootstrap.php" | ||
colors="true" | ||
verbose="true" | ||
convertErrorsToExceptions="true" | ||
convertNoticesToExceptions="true" | ||
convertWarningsToExceptions="true" | ||
processIsolation="false" | ||
stopOnFailure="false" | ||
> | ||
<testsuites> | ||
<testsuite name="Voyager Test Suite"> | ||
<directory>tests</directory> | ||
</testsuite> | ||
</testsuites> | ||
<logging> | ||
<log type="junit" target="build/report.junit.xml"/> | ||
<log type="coverage-html" target="build/coverage" /> | ||
<log type="coverage-text" target="php://stdout" showUncoveredFiles="false" showOnlySummary="true"/> | ||
</logging> | ||
<filter> | ||
<whitelist processUncoveredFilesFromWhitelist="true"> | ||
<directory suffix=".php">./src/</directory> | ||
</whitelist> | ||
</filter> | ||
<php> | ||
<env name="APP_ENV" value="testing"/> | ||
<env name="APP_DEBUG" value="true"/> | ||
<env name="APP_URL" value="http://localhost"/> | ||
<env name="APP_KEY" value="base64:M1igrxNfAWlVGyxxDholHqvVqvtPjAzCoJ+2/ILAVPw="/> | ||
</php> | ||
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="tests/bootstrap.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false"> | ||
<coverage> | ||
<report> | ||
<html outputDirectory="build/coverage"/> | ||
<text outputFile="php://stdout" showUncoveredFiles="false" showOnlySummary="true"/> | ||
</report> | ||
</coverage> | ||
<testsuites> | ||
<testsuite name="Voyager Test Suite"> | ||
<directory>tests</directory> | ||
</testsuite> | ||
</testsuites> | ||
<logging> | ||
<junit outputFile="build/report.junit.xml"/> | ||
</logging> | ||
<php> | ||
<env name="APP_ENV" value="testing"/> | ||
<env name="APP_DEBUG" value="true"/> | ||
<env name="APP_URL" value="http://localhost"/> | ||
<env name="APP_KEY" value="base64:M1igrxNfAWlVGyxxDholHqvVqvtPjAzCoJ+2/ILAVPw="/> | ||
</php> | ||
<source> | ||
<include> | ||
<directory suffix=".php">./src/</directory> | ||
</include> | ||
</source> | ||
</phpunit> |
2 changes: 2 additions & 0 deletions
2
...ase/dummy_seeds/CategoriesTableSeeder.php → ...e/dummy_seeders/CategoriesTableSeeder.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
...database/dummy_seeds/PagesTableSeeder.php → ...tabase/dummy_seeders/PagesTableSeeder.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
...database/dummy_seeds/PostsTableSeeder.php → ...tabase/dummy_seeders/PostsTableSeeder.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
...database/dummy_seeds/UsersTableSeeder.php → ...tabase/dummy_seeders/UsersTableSeeder.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
...le/database/seeds/DataRowsTableSeeder.php → .../database/seeders/DataRowsTableSeeder.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
...e/database/seeds/DataTypesTableSeeder.php → ...database/seeders/DataTypesTableSeeder.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,7 @@ | ||
<?php | ||
|
||
namespace Database\Seeders; | ||
|
||
use Illuminate\Database\Seeder; | ||
use TCG\Voyager\Models\DataType; | ||
|
||
|
2 changes: 2 additions & 0 deletions
2
...e/database/seeds/MenuItemsTableSeeder.php → ...database/seeders/MenuItemsTableSeeder.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
...hable/database/seeds/MenusTableSeeder.php → ...ble/database/seeders/MenusTableSeeder.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,7 @@ | ||
<?php | ||
|
||
namespace Database\Seeders; | ||
|
||
use Illuminate\Database\Seeder; | ||
use TCG\Voyager\Models\Menu; | ||
|
||
|
2 changes: 2 additions & 0 deletions
2
...abase/seeds/PermissionRoleTableSeeder.php → ...ase/seeders/PermissionRoleTableSeeder.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
...database/seeds/PermissionsTableSeeder.php → ...tabase/seeders/PermissionsTableSeeder.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,7 @@ | ||
<?php | ||
|
||
namespace Database\Seeders; | ||
|
||
use Illuminate\Database\Seeder; | ||
use TCG\Voyager\Models\Permission; | ||
|
||
|
2 changes: 2 additions & 0 deletions
2
...hable/database/seeds/RolesTableSeeder.php → ...ble/database/seeders/RolesTableSeeder.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,7 @@ | ||
<?php | ||
|
||
namespace Database\Seeders; | ||
|
||
use Illuminate\Database\Seeder; | ||
use TCG\Voyager\Models\Role; | ||
|
||
|
2 changes: 2 additions & 0 deletions
2
...le/database/seeds/SettingsTableSeeder.php → .../database/seeders/SettingsTableSeeder.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,7 @@ | ||
<?php | ||
|
||
namespace Database\Seeders; | ||
|
||
use Illuminate\Database\Seeder; | ||
use TCG\Voyager\Models\Setting; | ||
|
||
|
2 changes: 2 additions & 0 deletions
2
...atabase/seeds/TranslationsTableSeeder.php → ...abase/seeders/TranslationsTableSeeder.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
.../database/seeds/VoyagerDatabaseSeeder.php → ...atabase/seeders/VoyagerDatabaseSeeder.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...base/seeds/VoyagerDummyDatabaseSeeder.php → ...se/seeders/VoyagerDummyDatabaseSeeder.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.