@include('users.settings.profile')
@include('users.settings.password')
+ @include('users.settings.github')
@include('users.settings.api_tokens')
@include('users.settings.notification_settings')
@include('users.settings.blocked')
diff --git a/routes/console.php b/routes/console.php
index 9c925fe1a..b45ac35de 100644
--- a/routes/console.php
+++ b/routes/console.php
@@ -8,5 +8,4 @@
Schedule::command('horizon:snapshot')->everyFiveMinutes();
Schedule::command('lio:post-article-to-social-media')->twiceDaily(14, 18);
Schedule::command('lio:generate-sitemap')->daily()->graceTimeInMinutes(25);
-Schedule::command('lio:sync-article-images')->cron('*/5 7-23 * * *');
Schedule::command('lio:update-article-view-counts')->twiceDaily();
diff --git a/routes/web.php b/routes/web.php
index 3e141b0bb..5c7e652f5 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,8 +1,7 @@
name('settings.profile.update');
Route::delete('settings', [ProfileSettingsController::class, 'destroy'])->name('settings.profile.delete');
Route::put('settings/password', [PasswordController::class, 'update'])->name('settings.password.update');
+Route::post('settings/github/connect', [GitHubAccountController::class, 'connect'])->name('settings.github.connect');
+Route::post('settings/github/disconnect', [GitHubAccountController::class, 'disconnect'])->name('settings.github.disconnect');
Route::put('settings/users/{username}/unblock', UnblockUserSettingsController::class)->name('settings.users.unblock');
Route::post('settings/api-tokens', [ApiTokenController::class, 'store'])->name('settings.api-tokens.store');
Route::delete('settings/api-tokens', [ApiTokenController::class, 'destroy'])->name('settings.api-tokens.delete');
@@ -129,16 +131,9 @@
// Admin
Route::prefix('admin')->name('admin')->group(function () {
- Route::get('/', [AdminArticlesController::class, 'index']);
- Route::get('replies', [AdminRepliesController::class, 'index'])->name('.replies');
-
// Users
- Route::get('users', [UsersController::class, 'index'])->name('.users');
- Route::put('users/{username}/ban', [UsersController::class, 'ban'])->name('.users.ban');
- Route::put('users/{username}/unban', [UsersController::class, 'unban'])->name('.users.unban');
- Route::delete('users/{username}', [UsersController::class, 'delete'])->name('.users.delete');
-
- Route::delete('users/{username}/threads', [UsersController::class, 'deleteThreads'])->name('.users.threads.delete');
+ Route::put('users/{username}/ban', [AdminUsersController::class, 'ban'])->name('.users.ban');
+ Route::put('users/{username}/unban', [AdminUsersController::class, 'unban'])->name('.users.unban');
// Articles
Route::put('articles/{article}/approve', [AdminArticlesController::class, 'approve'])->name('.articles.approve');
diff --git a/tests/CreatesUsers.php b/tests/CreatesUsers.php
index cde560304..d5300256a 100644
--- a/tests/CreatesUsers.php
+++ b/tests/CreatesUsers.php
@@ -3,6 +3,7 @@
namespace Tests;
use App\Models\User;
+use Database\Factories\UserFactory;
trait CreatesUsers
{
@@ -30,9 +31,9 @@ protected function loginAsAdmin(array $attributes = []): User
return $this->login(array_merge($attributes, ['type' => User::ADMIN]));
}
- protected function createUser(array $attributes = []): User
+ protected function createUser(array $attributes = [], ?UserFactory $userFactory = null): User
{
- return User::factory()->create(array_merge([
+ return ($userFactory ?? User::factory())->create(array_merge([
'name' => 'John Doe',
'username' => 'johndoe',
'email' => 'john@example.com',
diff --git a/tests/Feature/AdminTest.php b/tests/Feature/AdminTest.php
index bac4da402..33c395b8a 100644
--- a/tests/Feature/AdminTest.php
+++ b/tests/Feature/AdminTest.php
@@ -1,19 +1,23 @@
get('/admin')
- ->assertRedirect('/login');
+ ->assertRedirect('/admin/login');
});
test('normal users cannot visit the admin section', function () {
@@ -119,12 +123,10 @@
$this->loginAsAdmin();
- $this->delete('/admin/users/'.$user->username())
- ->assertRedirect('/admin/users');
+ livewire(ListUsers::class)
+ ->callAction(TestAction::make('delete')->table($user));
$this->assertDatabaseMissing('users', ['name' => 'Freek Murze']);
-
- // Make sure associated content is deleted.
$this->assertDatabaseMissing('threads', ['author_id' => $user->id()]);
$this->assertDatabaseMissing('replies', ['replyable_id' => $thread->id()]);
$this->assertDatabaseMissing('replies', ['author_id' => $user->id()]);
@@ -135,8 +137,8 @@
$this->loginAsAdmin();
- $this->delete('/admin/users/'.$user->username())
- ->assertForbidden();
+ livewire(ListUsers::class)
+ ->assertActionHidden(TestAction::make('delete')->table($user));
});
test('moderators cannot delete users', function () {
@@ -144,8 +146,8 @@
$this->loginAsModerator();
- $this->delete('/admin/users/'.$user->username())
- ->assertForbidden();
+ livewire(ListUsers::class)
+ ->assertActionHidden(TestAction::make('delete')->table($user));
});
test('admins can list submitted articles', function () {
@@ -155,7 +157,7 @@
$this->loginAsAdmin();
- $this->get('admin')
+ $this->get('admin/articles')
->assertSee($submittedArticle->title())
->assertDontSee($draftArticle->title())
->assertDontSee($liveArticle->title());
@@ -168,7 +170,7 @@
$this->loginAsModerator();
- $this->get('admin')
+ $this->get('admin/articles')
->assertSee($submittedArticle->title())
->assertDontSee($draftArticle->title())
->assertDontSee($liveArticle->title());
@@ -183,7 +185,7 @@
test('guests cannot list submitted articles', function () {
$this->get('admin')
- ->assertRedirect('/login');
+ ->assertRedirect('/admin/login');
});
test('admins can view submitted articles', function () {
diff --git a/tests/Feature/ArticleTest.php b/tests/Feature/ArticleTest.php
index bf5e50f1b..0206b5754 100644
--- a/tests/Feature/ArticleTest.php
+++ b/tests/Feature/ArticleTest.php
@@ -1,18 +1,21 @@
get('/articles/create')
@@ -345,6 +348,7 @@
Article::factory()->create([
'author_id' => $user->id(),
'slug' => 'my-first-article',
+ 'is_sponsored' => false,
]);
$this->loginAs($user);
@@ -363,6 +367,20 @@
->assertForbidden();
});
+test('users cannot delete an article that is sponsored', function () {
+ $user = $this->createUser();
+ Article::factory()->create([
+ 'author_id' => $user->id(),
+ 'slug' => 'my-first-article',
+ 'is_sponsored' => true,
+ ]);
+
+ $this->loginAs($user);
+
+ $this->delete('/articles/my-first-article')
+ ->assertForbidden();
+});
+
test('canonical urls are rendered', function () {
Article::factory()->create(['slug' => 'my-first-article', 'submitted_at' => now(), 'approved_at' => now()]);
@@ -549,7 +567,13 @@
});
test('only articles with ten or more views render a view count', function () {
- $article = Article::factory()->create(['title' => 'My First Article', 'slug' => 'my-first-article', 'submitted_at' => now(), 'approved_at' => now(), 'view_count' => 9]);
+ $article = Article::factory()->create([
+ 'title' => 'My First Article',
+ 'slug' => 'my-first-article',
+ 'submitted_at' => now(),
+ 'approved_at' => now(),
+ 'view_count' => 9,
+ ]);
$this->get("/articles/{$article->slug()}")
->assertSee('My First Article')
@@ -561,3 +585,37 @@
->assertSee('My First Article')
->assertSee('10 views');
});
+
+test('verified authors can publish two articles per day with no approval needed', function () {
+ $author = $this->createUser(userFactory: User::factory()->verifiedAuthor());
+
+ Article::factory()->count(2)->create([
+ 'author_id' => $author->id,
+ 'submitted_at' => now()->addMinutes(1), // after verification
+ ]);
+
+ expect($author->canVerifiedAuthorPublishMoreArticlesToday())->toBeFalse();
+});
+
+test('verified authors skip the approval message when submitting new article', function () {
+ Bus::fake(SyncArticleImage::class);
+
+ $author = $this->createUser(userFactory: User::factory()->verifiedAuthor());
+ $this->loginAs($author);
+
+ $response = $this->post('/articles', [
+ 'title' => 'Using database migrations',
+ 'hero_image_id' => 'NoiJZhDF4Es',
+ 'body' => 'This article will go into depth on working with database migrations.',
+ 'tags' => [],
+ 'submitted' => '1',
+ ]);
+
+ $response
+ ->assertRedirect('/articles/using-database-migrations')
+ ->assertSessionMissing('success');
+
+ Bus::assertDispatched(SyncArticleImage::class, function (SyncArticleImage $job) {
+ return $job->article->hero_image_id === 'NoiJZhDF4Es';
+ });
+});
diff --git a/tests/Feature/AuthTest.php b/tests/Feature/AuthTest.php
index 8893db7c8..bf0a42266 100644
--- a/tests/Feature/AuthTest.php
+++ b/tests/Feature/AuthTest.php
@@ -4,7 +4,7 @@
use Carbon\Carbon;
use Illuminate\Auth\Notifications\VerifyEmail;
use Illuminate\Contracts\Auth\PasswordBroker;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Notification;
@@ -12,7 +12,7 @@
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
test('users can register', function () {
Notification::fake();
diff --git a/tests/Feature/CanonicalUrlTest.php b/tests/Feature/CanonicalUrlTest.php
index ce0d2434a..d7d8c6421 100644
--- a/tests/Feature/CanonicalUrlTest.php
+++ b/tests/Feature/CanonicalUrlTest.php
@@ -3,13 +3,13 @@
use App\Models\Article;
use App\Models\Tag;
use App\Models\Thread;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\App;
use Illuminate\Support\HtmlString;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
function inProduction()
{
diff --git a/tests/Feature/EditorTest.php b/tests/Feature/EditorTest.php
index 8edbe08c9..5b6c16eab 100644
--- a/tests/Feature/EditorTest.php
+++ b/tests/Feature/EditorTest.php
@@ -3,12 +3,12 @@
use App\Livewire\Editor;
use App\Models\User;
use Illuminate\Database\Eloquent\Factories\Sequence;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Livewire\Livewire;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
test('participants are rendered when mentions are invoked', function () {
$participants = User::factory()->count(3)->create();
diff --git a/tests/Feature/ForumTest.php b/tests/Feature/ForumTest.php
index cd25f72a0..5e9c20aee 100644
--- a/tests/Feature/ForumTest.php
+++ b/tests/Feature/ForumTest.php
@@ -9,7 +9,7 @@
use App\Models\User;
use App\Notifications\MentionNotification;
use App\Notifications\ThreadDeletedNotification;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Notifications\DatabaseNotification;
use Illuminate\Support\Facades\Notification;
use Illuminate\Support\HtmlString;
@@ -17,7 +17,7 @@
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
test('users can see a list of latest threads', function () {
Thread::factory()->create(['subject' => 'The first thread']);
diff --git a/tests/Feature/GitHubAccountSettingTest.php b/tests/Feature/GitHubAccountSettingTest.php
new file mode 100644
index 000000000..b351cfb38
--- /dev/null
+++ b/tests/Feature/GitHubAccountSettingTest.php
@@ -0,0 +1,122 @@
+login();
+
+ $response = $this->actingAs($user)->post('/settings/github/connect');
+
+ $response->assertRedirect(route('login.github'));
+
+ expect(session('settings.github.connect.intended'))->toBeTrue();
+});
+
+test('users can disconnect their GitHub account from settings', function () {
+ $user = $this->login([
+ 'github_id' => '11405387',
+ 'github_username' => 'theHocineSaad',
+ 'github_has_identicon' => true,
+ ]);
+
+ $response = $this->actingAs($user)->post('/settings/github/disconnect');
+
+ $response->assertRedirect(route('settings.profile'));
+ $response->assertSessionHas('success', 'Your GitHub account has been disconnected.');
+
+ $user->refresh();
+
+ expect($user->github_id)->toBeNull();
+ expect($user->github_username)->toBeNull();
+ expect($user->github_has_identicon)->toBeFalse();
+});
+
+test('users can connect their GitHub account after returning from GitHub', function () {
+ Queue::fake();
+
+ $user = $this->login([
+ 'github_id' => null,
+ 'github_username' => null,
+ ]);
+
+ $socialiteUser = fakeSocialiteUser('11405387', 'theHocineSaad');
+
+ mockGitHubProvider($socialiteUser);
+
+ $this->withSession(['settings.github.connect.intended' => true]);
+
+ $response = $this->actingAs($user)->get('/auth/github');
+
+ $response->assertRedirect(route('settings.profile'));
+ $response->assertSessionHas('success', 'Your GitHub account has been connected.');
+
+ $user->refresh();
+
+ expect($user->github_id)->toBe('11405387');
+ expect($user->github_username)->toBe('theHocineSaad');
+
+ Queue::assertPushed(UpdateUserIdenticonStatus::class);
+});
+
+test('users cannot connect a GitHub account that belongs to another user', function () {
+ Queue::fake();
+
+ User::factory()->create([
+ 'github_id' => '11405387',
+ 'github_username' => 'theHocineSaad',
+ ]);
+
+ $user = $this->login([
+ 'github_id' => null,
+ 'github_username' => null,
+ ]);
+
+ $socialiteUser = fakeSocialiteUser('11405387', 'theHocineSaad');
+
+ mockGitHubProvider($socialiteUser);
+
+ $this->withSession(['settings.github.connect.intended' => true]);
+
+ $response = $this->actingAs($user)->get('/auth/github');
+
+ $response->assertRedirect(route('settings.profile'));
+ $response->assertSessionHas('error', 'This GitHub account is already connected to another user.');
+
+ $user->refresh();
+
+ expect($user->github_id)->toBeNull();
+ expect($user->github_username)->toBeNull();
+
+ Queue::assertNothingPushed();
+});
+
+function fakeSocialiteUser(string $id, string $nickname): SocialiteUser
+{
+ return tap(new SocialiteUser)
+ ->setRaw([
+ 'id' => $id,
+ 'login' => $nickname,
+ ])
+ ->map([
+ 'id' => $id,
+ 'nickname' => $nickname,
+ ]);
+}
+
+function mockGitHubProvider(SocialiteUser $user): void
+{
+ $provider = Mockery::mock(Provider::class);
+ $provider->shouldReceive('user')->once()->andReturn($user);
+
+ Socialite::shouldReceive('driver')->once()->with('github')->andReturn($provider);
+}
diff --git a/tests/Feature/HomeTest.php b/tests/Feature/HomeTest.php
index b60056090..ddf0aedbd 100644
--- a/tests/Feature/HomeTest.php
+++ b/tests/Feature/HomeTest.php
@@ -1,10 +1,10 @@
get('/')
diff --git a/tests/Feature/ModeratorTest.php b/tests/Feature/ModeratorTest.php
index 14067386a..e175f5e0d 100644
--- a/tests/Feature/ModeratorTest.php
+++ b/tests/Feature/ModeratorTest.php
@@ -1,11 +1,11 @@
create();
diff --git a/tests/Feature/NavigationTest.php b/tests/Feature/NavigationTest.php
index d52e094a7..1b1d2dee1 100644
--- a/tests/Feature/NavigationTest.php
+++ b/tests/Feature/NavigationTest.php
@@ -4,13 +4,13 @@
use App\Models\Reply;
use App\Models\Thread;
use App\Notifications\NewReplyNotification;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Str;
use Livewire\Livewire;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
test('a user sees the correct number of notifications', function () {
$userOne = $this->createUser();
diff --git a/tests/Feature/NotificationsTest.php b/tests/Feature/NotificationsTest.php
index a8bbdde9f..792e9f219 100644
--- a/tests/Feature/NotificationsTest.php
+++ b/tests/Feature/NotificationsTest.php
@@ -1,10 +1,10 @@
createUser();
@@ -37,7 +37,7 @@
$this->loginAs($userOne);
- Livewire::test(Notifications::class)
+ Livewire::test(UserNotifications::class)
->assertSee(new HtmlString(
"A new reply was added to
\"{$thread->subject()}\".",
));
@@ -65,7 +65,7 @@
$this->loginAs($userOne);
- Livewire::test(Notifications::class)
+ Livewire::test(UserNotifications::class)
->assertSee(new HtmlString(
"A new reply was added to
\"{$thread->subject()}\".",
))
@@ -77,7 +77,7 @@
});
test('a_non_logged_in_user_cannot_access_notifications', function () {
- Livewire::test(Notifications::class)->assertForbidden();
+ Livewire::test(UserNotifications::class)->assertForbidden();
});
test('a_user_cannot_mark_other_users_notifications_as_read', function () {
@@ -108,7 +108,7 @@
$this->loginAs($userTwo);
- Livewire::test(Notifications::class)
+ Livewire::test(UserNotifications::class)
->call('markAsRead', $notification->id)
->assertForbidden();
});
@@ -143,7 +143,7 @@
$this->loginAs($userOne);
- Livewire::test(Notifications::class)
+ Livewire::test(UserNotifications::class)
->assertSee('10');
});
@@ -167,13 +167,13 @@
$this->loginAs($userOne);
- Livewire::test(Notifications::class)
+ Livewire::test(UserNotifications::class)
->assertSee('Clear All')
->assertViewHas('notificationCount', 1);
post('/notifications/mark-as-read');
- Livewire::test(Notifications::class)
+ Livewire::test(UserNotifications::class)
->assertDontSee('Clear All')
->assertViewHas('notificationCount', 0);
});
diff --git a/tests/Feature/ProfileTest.php b/tests/Feature/ProfileTest.php
index 76c02c49a..1474ae723 100644
--- a/tests/Feature/ProfileTest.php
+++ b/tests/Feature/ProfileTest.php
@@ -1,10 +1,10 @@
createUser();
diff --git a/tests/Feature/SettingsTest.php b/tests/Feature/SettingsTest.php
index 620282dd7..72130c384 100644
--- a/tests/Feature/SettingsTest.php
+++ b/tests/Feature/SettingsTest.php
@@ -2,14 +2,14 @@
use App\Models\User;
use Database\Factories\UserFactory;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Http;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
test('requires login', function () {
$this->get('/settings')
@@ -197,7 +197,12 @@
});
test('website is optional', function () {
- $user = $this->createUser(['email' => 'freek@example.com', 'username' => 'freekmurze', 'twitter' => 'freektwitter', 'website' => 'https://laravel.io']);
+ $user = $this->createUser([
+ 'email' => 'freek@example.com',
+ 'username' => 'freekmurze',
+ 'twitter' => 'freektwitter',
+ 'website' => 'https://freek.dev',
+ ]);
$this->loginAs($user);
@@ -212,7 +217,7 @@
->assertRedirect('/settings');
$this->followRedirects($response)
- ->assertDontSee('https://laravel.io');
+ ->assertDontSee('https://freek.dev');
expect($user->fresh()->website())->toBeEmpty();
});
diff --git a/tests/Feature/SubscriptionsTest.php b/tests/Feature/SubscriptionsTest.php
index 86698c0db..5708fb56f 100644
--- a/tests/Feature/SubscriptionsTest.php
+++ b/tests/Feature/SubscriptionsTest.php
@@ -6,7 +6,7 @@
use App\Models\Thread;
use App\Models\User;
use App\Notifications\NewReplyNotification;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Foundation\Testing\WithFaker;
use Illuminate\Support\Facades\Notification;
use Illuminate\Support\HtmlString;
@@ -14,7 +14,7 @@
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
uses(WithFaker::class);
test('users receive notifications for new replies to threads where they are subscribed to', function () {
diff --git a/tests/Integration/Api/ArticleTest.php b/tests/Integration/Api/ArticleTest.php
index d2e9a8fd7..5ff02ec19 100644
--- a/tests/Integration/Api/ArticleTest.php
+++ b/tests/Integration/Api/ArticleTest.php
@@ -4,12 +4,12 @@
use App\Models\Article;
use Database\Factories\ArticleFactory;
use Database\Factories\TagFactory;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Laravel\Sanctum\Sanctum;
use Tests\CreatesUsers;
use Tests\TestCase;
-uses(TestCase::class, CreatesUsers::class, DatabaseMigrations::class);
+uses(TestCase::class, CreatesUsers::class, RefreshDatabase::class);
it('can store an article over the API', function (array $body, array $response) {
Event::fake();
@@ -105,7 +105,7 @@
$user = $this->createUser();
Sanctum::actingAs($user);
- $article = ArticleFactory::new()->for($user, 'authorRelation')->create();
+ $article = ArticleFactory::new(['is_sponsored' => false])->for($user, 'authorRelation')->create();
$this->deleteJson(route('api.articles.delete', $article->slug()))
->assertNoContent();
diff --git a/tests/Integration/Commands/PostArticleToSocialMediaTest.php b/tests/Integration/Commands/PostArticleToSocialMediaTest.php
index f519702cd..bb793a4b9 100644
--- a/tests/Integration/Commands/PostArticleToSocialMediaTest.php
+++ b/tests/Integration/Commands/PostArticleToSocialMediaTest.php
@@ -4,14 +4,14 @@
use App\Models\Article;
use App\Notifications\PostArticleToBluesky;
use App\Notifications\PostArticleToTwitter;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Notifications\AnonymousNotifiable;
use Illuminate\Support\Facades\Notification;
use Illuminate\Support\Str;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
beforeEach(function () {
Notification::fake();
diff --git a/tests/Integration/Commands/UpdateArticleViewCountsTest.php b/tests/Integration/Commands/UpdateArticleViewCountsTest.php
index fb5c473ea..ea0c6f010 100644
--- a/tests/Integration/Commands/UpdateArticleViewCountsTest.php
+++ b/tests/Integration/Commands/UpdateArticleViewCountsTest.php
@@ -2,12 +2,12 @@
use App\Console\Commands\UpdateArticleViewCounts;
use App\Models\Article;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Http;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
test('article view counts can be updated', function () {
Http::fake(function () {
diff --git a/tests/Integration/Jobs/BanUserTest.php b/tests/Integration/Jobs/BanUserTest.php
index 985977d6c..bf14f9814 100644
--- a/tests/Integration/Jobs/BanUserTest.php
+++ b/tests/Integration/Jobs/BanUserTest.php
@@ -1,11 +1,11 @@
createUser(['banned_at' => null]);
diff --git a/tests/Integration/Jobs/BlockUserTest.php b/tests/Integration/Jobs/BlockUserTest.php
index 398848914..10b2a4dd2 100644
--- a/tests/Integration/Jobs/BlockUserTest.php
+++ b/tests/Integration/Jobs/BlockUserTest.php
@@ -1,11 +1,11 @@
createUser();
diff --git a/tests/Integration/Jobs/CreateApiTokenTest.php b/tests/Integration/Jobs/CreateApiTokenTest.php
index b1a965157..534fb7cb1 100644
--- a/tests/Integration/Jobs/CreateApiTokenTest.php
+++ b/tests/Integration/Jobs/CreateApiTokenTest.php
@@ -1,11 +1,11 @@
createUser();
diff --git a/tests/Integration/Jobs/CreateArticleTest.php b/tests/Integration/Jobs/CreateArticleTest.php
index 01e483a1a..8796c6625 100644
--- a/tests/Integration/Jobs/CreateArticleTest.php
+++ b/tests/Integration/Jobs/CreateArticleTest.php
@@ -3,19 +3,19 @@
use App\Events\ArticleWasSubmittedForApproval;
use App\Jobs\CreateArticle;
use App\Models\Article;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Str;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
test('we can create a draft article', function () {
$user = $this->createUser();
$uuid = Str::uuid();
- $this->dispatch(new CreateArticle($uuid, 'Title', 'Body', $user, false, [
+ $this->dispatch(new CreateArticle($uuid, 'Title', 'Body', $user, false, null, [
'original_url' => 'https://laravel.io',
]));
@@ -35,7 +35,7 @@
$uuid = Str::uuid();
- $this->dispatch(new CreateArticle($uuid, 'Title', 'Body', $user, true, [
+ $this->dispatch(new CreateArticle($uuid, 'Title', 'Body', $user, true, null, [
'original_url' => 'https://laravel.io',
]));
diff --git a/tests/Integration/Jobs/CreateReplyTest.php b/tests/Integration/Jobs/CreateReplyTest.php
index 5e7356937..4a77e4a89 100644
--- a/tests/Integration/Jobs/CreateReplyTest.php
+++ b/tests/Integration/Jobs/CreateReplyTest.php
@@ -4,13 +4,13 @@
use App\Jobs\CreateReply;
use App\Models\Reply;
use App\Models\Thread;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Event;
use Illuminate\Support\Str;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
test('we can create a reply', function () {
Event::fake();
diff --git a/tests/Integration/Jobs/CreateThreadTest.php b/tests/Integration/Jobs/CreateThreadTest.php
index f1ab6cf20..7649ac13f 100644
--- a/tests/Integration/Jobs/CreateThreadTest.php
+++ b/tests/Integration/Jobs/CreateThreadTest.php
@@ -2,12 +2,12 @@
use App\Jobs\CreateThread;
use App\Models\Thread;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Str;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
test('we can create a thread', function () {
$user = $this->createUser();
diff --git a/tests/Integration/Jobs/DeleteApiTokenTest.php b/tests/Integration/Jobs/DeleteApiTokenTest.php
index c35965cc6..1a911ddfc 100644
--- a/tests/Integration/Jobs/DeleteApiTokenTest.php
+++ b/tests/Integration/Jobs/DeleteApiTokenTest.php
@@ -2,11 +2,11 @@
use App\Jobs\DeleteApiToken;
use Database\Factories\UserFactory;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
it('deletes the specified API token for the given user', function () {
$user = $this->createUser();
diff --git a/tests/Integration/Jobs/DeleteArticleTest.php b/tests/Integration/Jobs/DeleteArticleTest.php
index debe0203d..f8c2f436f 100644
--- a/tests/Integration/Jobs/DeleteArticleTest.php
+++ b/tests/Integration/Jobs/DeleteArticleTest.php
@@ -2,11 +2,11 @@
use App\Jobs\DeleteArticle;
use App\Models\Article;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
test('an article can be deleted', function () {
$article = Article::factory()->create();
diff --git a/tests/Integration/Jobs/DeleteRepliesTest.php b/tests/Integration/Jobs/DeleteRepliesTest.php
index e88137177..6f771198f 100644
--- a/tests/Integration/Jobs/DeleteRepliesTest.php
+++ b/tests/Integration/Jobs/DeleteRepliesTest.php
@@ -3,11 +3,11 @@
use App\Jobs\DeleteReply;
use App\Models\Reply;
use App\Models\Thread;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
test('reply authors can force delete their replies', function () {
$user = $this->createUser();
diff --git a/tests/Integration/Jobs/DeleteThreadTest.php b/tests/Integration/Jobs/DeleteThreadTest.php
index b3e9db2c9..c95410f27 100644
--- a/tests/Integration/Jobs/DeleteThreadTest.php
+++ b/tests/Integration/Jobs/DeleteThreadTest.php
@@ -4,11 +4,11 @@
use App\Models\Like;
use App\Models\Reply;
use App\Models\Thread;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
test('we can delete a thread and its replies', function () {
$thread = Thread::factory()->create();
diff --git a/tests/Integration/Jobs/DeleteUserTest.php b/tests/Integration/Jobs/DeleteUserTest.php
index 8dd2dfb1b..c830d3d8e 100644
--- a/tests/Integration/Jobs/DeleteUserTest.php
+++ b/tests/Integration/Jobs/DeleteUserTest.php
@@ -4,11 +4,11 @@
use App\Models\Reply;
use App\Models\Thread;
use App\Models\User;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
test('we can delete a user with replies', function () {
$user = User::factory()->create();
diff --git a/tests/Integration/Jobs/DeleteUserThreadsTest.php b/tests/Integration/Jobs/DeleteUserThreadsTest.php
index bc6907773..e0c2c07ef 100644
--- a/tests/Integration/Jobs/DeleteUserThreadsTest.php
+++ b/tests/Integration/Jobs/DeleteUserThreadsTest.php
@@ -3,11 +3,11 @@
use App\Jobs\DeleteUserThreads;
use App\Models\Thread;
use App\Models\User;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
test('we can delete an user threads', function () {
$user = User::factory()->create();
diff --git a/tests/Integration/Jobs/GenerateSocialShareImageTest.php b/tests/Integration/Jobs/GenerateSocialShareImageTest.php
index 57deaa5f9..029bb5140 100644
--- a/tests/Integration/Jobs/GenerateSocialShareImageTest.php
+++ b/tests/Integration/Jobs/GenerateSocialShareImageTest.php
@@ -2,12 +2,12 @@
use App\Jobs\GenerateSocialShareImage;
use App\Models\Article;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Spatie\Pixelmatch\Pixelmatch;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
test('social image is generated for articles', function () {
$article = Article::factory()->create([
diff --git a/tests/Integration/Jobs/RegisterUserTest.php b/tests/Integration/Jobs/RegisterUserTest.php
index 2b05b7cf6..1c2daaffe 100644
--- a/tests/Integration/Jobs/RegisterUserTest.php
+++ b/tests/Integration/Jobs/RegisterUserTest.php
@@ -3,11 +3,11 @@
use App\Exceptions\CannotCreateUser;
use App\Jobs\RegisterUser;
use App\Models\User;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
test('we can create a user', function () {
$this->dispatch(
diff --git a/tests/Integration/Commands/SyncArticleImagesTest.php b/tests/Integration/Jobs/SyncArticleImageTest.php
similarity index 89%
rename from tests/Integration/Commands/SyncArticleImagesTest.php
rename to tests/Integration/Jobs/SyncArticleImageTest.php
index 422994b7d..7096d104e 100644
--- a/tests/Integration/Commands/SyncArticleImagesTest.php
+++ b/tests/Integration/Jobs/SyncArticleImageTest.php
@@ -1,14 +1,14 @@
now(),
]);
- (new SyncArticleImages)->handle();
+ SyncArticleImage::dispatchSync($article);
$article->refresh();
@@ -53,7 +53,7 @@
'approved_at' => now(),
]);
- (new SyncArticleImages)->handle();
+ SyncArticleImage::dispatchSync($article);
$article->refresh();
diff --git a/tests/Integration/Jobs/UnbanUserTest.php b/tests/Integration/Jobs/UnbanUserTest.php
index 76fcfe8f9..a641bae7e 100644
--- a/tests/Integration/Jobs/UnbanUserTest.php
+++ b/tests/Integration/Jobs/UnbanUserTest.php
@@ -2,11 +2,11 @@
use App\Jobs\UnbanUser;
use Carbon\Carbon;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
it('can unban a user', function () {
$user = $this->createUser(['banned_at' => Carbon::yesterday()]);
diff --git a/tests/Integration/Jobs/UnblockUserTest.php b/tests/Integration/Jobs/UnblockUserTest.php
index 1594d7592..3506458ab 100644
--- a/tests/Integration/Jobs/UnblockUserTest.php
+++ b/tests/Integration/Jobs/UnblockUserTest.php
@@ -1,11 +1,11 @@
createUser();
diff --git a/tests/Integration/Jobs/UpdateArticleTest.php b/tests/Integration/Jobs/UpdateArticleTest.php
index 3795516d9..66dbb75d8 100644
--- a/tests/Integration/Jobs/UpdateArticleTest.php
+++ b/tests/Integration/Jobs/UpdateArticleTest.php
@@ -3,11 +3,11 @@
use App\Events\ArticleWasSubmittedForApproval;
use App\Jobs\UpdateArticle;
use App\Models\Article;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
test('we can update an article', function () {
$user = $this->createUser();
diff --git a/tests/Integration/Jobs/UpdateProfileTest.php b/tests/Integration/Jobs/UpdateProfileTest.php
index c62ee7871..2eead3f97 100644
--- a/tests/Integration/Jobs/UpdateProfileTest.php
+++ b/tests/Integration/Jobs/UpdateProfileTest.php
@@ -2,12 +2,12 @@
use App\Events\EmailAddressWasChanged;
use App\Jobs\UpdateProfile;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Event;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
test('we can update a user profile', function () {
$user = $this->createUser();
diff --git a/tests/Integration/Mail/NewReplyEmailTest.php b/tests/Integration/Mail/NewReplyEmailTest.php
index a63c39a24..eb23d5fce 100644
--- a/tests/Integration/Mail/NewReplyEmailTest.php
+++ b/tests/Integration/Mail/NewReplyEmailTest.php
@@ -4,11 +4,11 @@
use App\Models\Reply;
use App\Models\Subscription;
use App\Models\User;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
it('contains a note about solutions when the receiver is the thread author', function () {
$reply = Reply::factory()->create();
diff --git a/tests/Integration/Models/SubscriptionTest.php b/tests/Integration/Models/SubscriptionTest.php
index c7577d681..733b34912 100644
--- a/tests/Integration/Models/SubscriptionTest.php
+++ b/tests/Integration/Models/SubscriptionTest.php
@@ -1,11 +1,11 @@
create()->uuid();
diff --git a/tests/Integration/Models/ThreadTest.php b/tests/Integration/Models/ThreadTest.php
index abd479325..ee7dac109 100644
--- a/tests/Integration/Models/ThreadTest.php
+++ b/tests/Integration/Models/ThreadTest.php
@@ -5,12 +5,12 @@
use App\Models\Thread;
use App\Models\User;
use Carbon\Carbon;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Str;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
it('can find by slug', function () {
Thread::factory()->create(['slug' => 'foo']);
diff --git a/tests/Integration/Models/UserTest.php b/tests/Integration/Models/UserTest.php
index aee6a20c7..eba990694 100644
--- a/tests/Integration/Models/UserTest.php
+++ b/tests/Integration/Models/UserTest.php
@@ -5,11 +5,11 @@
use App\Models\Reply;
use App\Models\Thread;
use App\Models\User;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
it('can find by username', function () {
$this->createUser(['username' => 'johndoe']);
diff --git a/tests/Integration/Queries/SearchUsersTest.php b/tests/Integration/Queries/SearchUsersTest.php
index 5a98051f2..c79296498 100644
--- a/tests/Integration/Queries/SearchUsersTest.php
+++ b/tests/Integration/Queries/SearchUsersTest.php
@@ -2,11 +2,11 @@
use App\Models\User;
use App\Queries\SearchUsers;
-use Illuminate\Foundation\Testing\DatabaseMigrations;
+use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
uses(TestCase::class);
-uses(DatabaseMigrations::class);
+uses(RefreshDatabase::class);
it('can search by name or email or username', function () {
User::factory()->create(['name' => 'Freek Murze', 'email' => 'freek@freek.com']);
 }}){kind=icon}
merge(['class' => 'bg-gray-50 rounded-full']) }}
- />
-@endif
+ }})
- Laravel
-  }})
- Laravel News
-  }})
- Laracasts
-  }})
- Laravel Podcast
-  }}){kind=icon}
- Ecosystem
-