Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
rubenvanassche committed Jun 5, 2024
1 parent 48d44da commit 727c5fd
Showing 54 changed files with 118 additions and 319 deletions.
68 changes: 34 additions & 34 deletions config/flare.php
Original file line number Diff line number Diff line change
@@ -7,38 +7,38 @@
use Spatie\Ignition\Solutions\SolutionProviders\BadMethodCallSolutionProvider;
use Spatie\Ignition\Solutions\SolutionProviders\MergeConflictSolutionProvider;
use Spatie\Ignition\Solutions\SolutionProviders\UndefinedPropertySolutionProvider;
use Spatie\LaravelIgnition\FlareMiddleware\AddDumps;
use Spatie\LaravelIgnition\FlareMiddleware\AddEnvironmentInformation;
use Spatie\LaravelIgnition\FlareMiddleware\AddExceptionHandledStatus;
use Spatie\LaravelIgnition\FlareMiddleware\AddExceptionInformation;
use Spatie\LaravelIgnition\FlareMiddleware\AddJobs;
use Spatie\LaravelIgnition\FlareMiddleware\AddLogs;
use Spatie\LaravelIgnition\FlareMiddleware\AddQueries;
use Spatie\LaravelIgnition\FlareMiddleware\AddContext;
use Spatie\LaravelIgnition\FlareMiddleware\AddNotifierName;
use Spatie\LaravelIgnition\Recorders\DumpRecorder\DumpRecorder;
use Spatie\LaravelIgnition\Recorders\JobRecorder\JobRecorder;
use Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder;
use Spatie\LaravelIgnition\Recorders\QueryRecorder\QueryRecorder;
use Spatie\LaravelIgnition\Solutions\SolutionProviders\DefaultDbNameSolutionProvider;
use Spatie\LaravelIgnition\Solutions\SolutionProviders\GenericLaravelExceptionSolutionProvider;
use Spatie\LaravelIgnition\Solutions\SolutionProviders\IncorrectValetDbCredentialsSolutionProvider;
use Spatie\LaravelIgnition\Solutions\SolutionProviders\InvalidRouteActionSolutionProvider;
use Spatie\LaravelIgnition\Solutions\SolutionProviders\MissingAppKeySolutionProvider;
use Spatie\LaravelIgnition\Solutions\SolutionProviders\MissingColumnSolutionProvider;
use Spatie\LaravelIgnition\Solutions\SolutionProviders\MissingImportSolutionProvider;
use Spatie\LaravelIgnition\Solutions\SolutionProviders\MissingLivewireComponentSolutionProvider;
use Spatie\LaravelIgnition\Solutions\SolutionProviders\MissingMixManifestSolutionProvider;
use Spatie\LaravelIgnition\Solutions\SolutionProviders\MissingViteManifestSolutionProvider;
use Spatie\LaravelIgnition\Solutions\SolutionProviders\OpenAiSolutionProvider;
use Spatie\LaravelIgnition\Solutions\SolutionProviders\RunningLaravelDuskInProductionProvider;
use Spatie\LaravelIgnition\Solutions\SolutionProviders\SailNetworkSolutionProvider;
use Spatie\LaravelIgnition\Solutions\SolutionProviders\TableNotFoundSolutionProvider;
use Spatie\LaravelIgnition\Solutions\SolutionProviders\UndefinedViewVariableSolutionProvider;
use Spatie\LaravelIgnition\Solutions\SolutionProviders\UnknownMariadbCollationSolutionProvider;
use Spatie\LaravelIgnition\Solutions\SolutionProviders\UnknownMysql8CollationSolutionProvider;
use Spatie\LaravelIgnition\Solutions\SolutionProviders\UnknownValidationSolutionProvider;
use Spatie\LaravelIgnition\Solutions\SolutionProviders\ViewNotFoundSolutionProvider;
use Spatie\LaravelFlare\FlareMiddleware\AddDumps;
use Spatie\LaravelFlare\FlareMiddleware\AddEnvironmentInformation;
use Spatie\LaravelFlare\FlareMiddleware\AddExceptionHandledStatus;
use Spatie\LaravelFlare\FlareMiddleware\AddExceptionInformation;
use Spatie\LaravelFlare\FlareMiddleware\AddJobs;
use Spatie\LaravelFlare\FlareMiddleware\AddLogs;
use Spatie\LaravelFlare\FlareMiddleware\AddQueries;
use Spatie\LaravelFlare\FlareMiddleware\AddContext;
use Spatie\LaravelFlare\FlareMiddleware\AddNotifierName;
use Spatie\LaravelFlare\Recorders\DumpRecorder\DumpRecorder;
use Spatie\LaravelFlare\Recorders\JobRecorder\JobRecorder;
use Spatie\LaravelFlare\Recorders\LogRecorder\LogRecorder;
use Spatie\LaravelFlare\Recorders\QueryRecorder\QueryRecorder;
use Spatie\LaravelFlare\Solutions\SolutionProviders\DefaultDbNameSolutionProvider;
use Spatie\LaravelFlare\Solutions\SolutionProviders\GenericLaravelExceptionSolutionProvider;
use Spatie\LaravelFlare\Solutions\SolutionProviders\IncorrectValetDbCredentialsSolutionProvider;
use Spatie\LaravelFlare\Solutions\SolutionProviders\InvalidRouteActionSolutionProvider;
use Spatie\LaravelFlare\Solutions\SolutionProviders\MissingAppKeySolutionProvider;
use Spatie\LaravelFlare\Solutions\SolutionProviders\MissingColumnSolutionProvider;
use Spatie\LaravelFlare\Solutions\SolutionProviders\MissingImportSolutionProvider;
use Spatie\LaravelFlare\Solutions\SolutionProviders\MissingLivewireComponentSolutionProvider;
use Spatie\LaravelFlare\Solutions\SolutionProviders\MissingMixManifestSolutionProvider;
use Spatie\LaravelFlare\Solutions\SolutionProviders\MissingViteManifestSolutionProvider;
use Spatie\LaravelFlare\Solutions\SolutionProviders\OpenAiSolutionProvider;
use Spatie\LaravelFlare\Solutions\SolutionProviders\RunningLaravelDuskInProductionProvider;
use Spatie\LaravelFlare\Solutions\SolutionProviders\SailNetworkSolutionProvider;
use Spatie\LaravelFlare\Solutions\SolutionProviders\TableNotFoundSolutionProvider;
use Spatie\LaravelFlare\Solutions\SolutionProviders\UndefinedViewVariableSolutionProvider;
use Spatie\LaravelFlare\Solutions\SolutionProviders\UnknownMariadbCollationSolutionProvider;
use Spatie\LaravelFlare\Solutions\SolutionProviders\UnknownMysql8CollationSolutionProvider;
use Spatie\LaravelFlare\Solutions\SolutionProviders\UnknownValidationSolutionProvider;
use Spatie\LaravelFlare\Solutions\SolutionProviders\ViewNotFoundSolutionProvider;

return [
/*
@@ -222,8 +222,8 @@
\Spatie\Backtrace\Arguments\Reducers\DateTimeArgumentReducer::class,
\Spatie\Backtrace\Arguments\Reducers\DateTimeZoneArgumentReducer::class,
\Spatie\Backtrace\Arguments\Reducers\SymphonyRequestArgumentReducer::class,
\Spatie\LaravelIgnition\ArgumentReducers\ModelArgumentReducer::class,
\Spatie\LaravelIgnition\ArgumentReducers\CollectionArgumentReducer::class,
\Spatie\LaravelFlare\ArgumentReducers\ModelArgumentReducer::class,
\Spatie\LaravelFlare\ArgumentReducers\CollectionArgumentReducer::class,
\Spatie\Backtrace\Arguments\Reducers\StringableArgumentReducer::class,
],
];
2 changes: 1 addition & 1 deletion src/Solutions/GenerateAppKeySolution.php
Original file line number Diff line number Diff line change
@@ -22,6 +22,6 @@ public function getDocumentationLinks(): array

public function getSolutionDescription(): string
{
return '';
return 'Generate your application encryption key using `php artisan key:generate`.';
}
}
8 changes: 4 additions & 4 deletions tests/Arguments/ArgumentReducersTest.php
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@

use Illuminate\Foundation\Auth\User;
use Illuminate\Support\Collection;
use Spatie\LaravelIgnition\Facades\Flare;
use Spatie\LaravelIgnition\Tests\TestClasses\FakeArgumentsReducer;
use Spatie\LaravelFlare\Facades\Flare;
use Spatie\LaravelFlare\Tests\TestClasses\FakeArgumentsReducer;

beforeEach(function () {
ini_set('zend.exception_ignore_args', 0); // Enabled on GH actions
@@ -54,7 +54,7 @@ function exceptionWithArgumentsDisabled(string $string)
return new Exception('Whoops');
}

config()->set('ignition.with_stack_frame_arguments', false);
config()->set('flare.with_stack_frame_arguments', false);

$report = Flare::createReport(exceptionWithArgumentsDisabled('Hello World'));

@@ -67,7 +67,7 @@ function exceptionWithCustomArgumentReducer(string $string)
return new Exception('Whoops');
}

config()->set('ignition.argument_reducers', [
config()->set('flare.argument_reducers', [
FakeArgumentsReducer::class,
]);

2 changes: 1 addition & 1 deletion tests/Context/LaravelRequestContextProviderTest.php
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

use Illuminate\Foundation\Auth\User;
use Illuminate\Support\Facades\Route;
use Spatie\LaravelIgnition\ContextProviders\LaravelRequestContextProvider;
use Spatie\LaravelFlare\ContextProviders\LaravelRequestContextProvider;

it('returns route name in context data', function () {
$route = Route::get('/route/', fn () => null)->name('routeName');
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@

use Illuminate\Http\Request;
use Illuminate\Support\Facades\Route;
use Spatie\LaravelIgnition\ContextProviders\LaravelLivewireRequestContextProvider;
use Spatie\LaravelIgnition\Tests\TestClasses\FakeLivewireManager;
use Spatie\LaravelFlare\ContextProviders\LaravelLivewireRequestContextProvider;
use Spatie\LaravelFlare\Tests\TestClasses\FakeLivewireManager;

beforeEach(function () {
$this->livewireManager = resolve(FakeLivewireManager::class);
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@

use Illuminate\Http\Request;
use Illuminate\Support\Facades\Route;
use Spatie\LaravelIgnition\ContextProviders\LaravelLivewireRequestContextProvider;
use Spatie\LaravelIgnition\Tests\TestClasses\FakeLivewireManager;
use Spatie\LaravelFlare\ContextProviders\LaravelLivewireRequestContextProvider;
use Spatie\LaravelFlare\Tests\TestClasses\FakeLivewireManager;

beforeEach(function () {
$this->livewireManager = FakeLivewireManager::setUp();
8 changes: 4 additions & 4 deletions tests/ExceptionSolutionTest.php
Original file line number Diff line number Diff line change
@@ -4,9 +4,9 @@
use Spatie\Ignition\Contracts\BaseSolution;
use Spatie\Ignition\Solutions\SolutionProviders\BadMethodCallSolutionProvider;
use Spatie\Ignition\Solutions\SolutionProviders\SolutionProviderRepository;
use Spatie\LaravelIgnition\Solutions\SolutionProviders\MissingAppKeySolutionProvider;
use Spatie\LaravelIgnition\Tests\Exceptions\AlwaysFalseSolutionProvider;
use Spatie\LaravelIgnition\Tests\Exceptions\AlwaysTrueSolutionProvider;
use Spatie\LaravelFlare\Solutions\SolutionProviders\MissingAppKeySolutionProvider;
use Spatie\LaravelFlare\Tests\Exceptions\AlwaysFalseSolutionProvider;
use Spatie\LaravelFlare\Tests\Exceptions\AlwaysTrueSolutionProvider;

it('returns possible solutions', function () {
$repository = new SolutionProviderRepository();
@@ -76,5 +76,5 @@

$solution = new MissingAppKeySolutionProvider();

expect($solution->getSolutions($exception)[0]->getSolutionActionDescription())->toBe('Generate your application encryption key using `php artisan key:generate`.');
expect($solution->getSolutions($exception)[0]->getSolutionDescription())->toBe('Generate your application encryption key using `php artisan key:generate`.');
});
2 changes: 1 addition & 1 deletion tests/Exceptions/AlwaysFalseSolutionProvider.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Spatie\LaravelIgnition\Tests\Exceptions;
namespace Spatie\LaravelFlare\Tests\Exceptions;

use Spatie\Ignition\Contracts\BaseSolution;
use Spatie\Ignition\Contracts\HasSolutionsForThrowable;
2 changes: 1 addition & 1 deletion tests/Exceptions/AlwaysTrueSolutionProvider.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Spatie\LaravelIgnition\Tests\Exceptions;
namespace Spatie\LaravelFlare\Tests\Exceptions;

use Spatie\Ignition\Contracts\BaseSolution;
use Spatie\Ignition\Contracts\HasSolutionsForThrowable;
2 changes: 1 addition & 1 deletion tests/FlareMiddleware/AddExceptionHandledTest.php
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
use Illuminate\Contracts\Debug\ExceptionHandler;
use Orchestra\Testbench\Exceptions\Handler;
use Spatie\FlareClient\Report;
use Spatie\LaravelIgnition\Facades\Flare;
use Spatie\LaravelFlare\Facades\Flare;

it('can see when an exception is handled, meaning it is reported', function () {
$handler = new class(app()) extends Handler {
2 changes: 1 addition & 1 deletion tests/FlareMiddleware/AddExceptionInformationTest.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

use Illuminate\Database\QueryException;
use Spatie\LaravelIgnition\Facades\Flare;
use Spatie\LaravelFlare\Facades\Flare;

it('will add query information with a query exception', function () {
$sql = 'select * from users where emai = "ruben@spatie.be"';
2 changes: 1 addition & 1 deletion tests/FlareMiddleware/ContextTest.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

use Illuminate\Support\Facades\Context;
use Spatie\LaravelIgnition\Facades\Flare;
use Spatie\LaravelFlare\Facades\Flare;

beforeEach(function () {
// We need to duplicate the class check here because this runs before the skip check
6 changes: 3 additions & 3 deletions tests/FlareTest.php
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\View;
use Spatie\FlareClient\Flare;
use Spatie\LaravelIgnition\Tests\Mocks\FakeClient;
use Spatie\LaravelFlare\Tests\Mocks\FakeClient;

beforeEach(function () {
Artisan::call('view:clear');
@@ -27,9 +27,9 @@
});

it('can manually report exceptions', function () {
\Spatie\LaravelIgnition\Facades\Flare::sendReportsImmediately();
\Spatie\LaravelFlare\Facades\Flare::sendReportsImmediately();

\Spatie\LaravelIgnition\Facades\Flare::report(new Exception());
\Spatie\LaravelFlare\Facades\Flare::report(new Exception());

$this->fakeClient->assertRequestsSent(1);
});
5 changes: 0 additions & 5 deletions tests/HelpersTest.php

This file was deleted.

71 changes: 0 additions & 71 deletions tests/Http/Controllers/ExecuteSolutionControllerTest.php

This file was deleted.

49 changes: 0 additions & 49 deletions tests/Http/Controllers/UpdateConfigControllerTest.php

This file was deleted.

21 changes: 0 additions & 21 deletions tests/Http/Middleware/IgnitionEnabledTest.php

This file was deleted.

2 changes: 1 addition & 1 deletion tests/LogRecorder/LogRecorderTest.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

use Illuminate\Log\Events\MessageLogged;
use Spatie\LaravelIgnition\Recorders\LogRecorder\LogRecorder;
use Spatie\LaravelFlare\Recorders\LogRecorder\LogRecorder;

it('limits the amount of recorded logs', function () {
$recorder = new LogRecorder(app(), 200);
Loading

0 comments on commit 727c5fd

Please sign in to comment.