-
Danger Zone
-
Please be aware that deleting your account will also remove all of your data, including your threads and replies. This cannot be undone.
-
-
- @include('_partials._delete_modal', [
- 'identifier' => 'delete-user',
- 'route' => ['settings.profile.delete'],
- 'title' => 'Delete Account',
- 'submit' => 'Confirm',
- 'body' => '
Deleting your account will remove any related content like threads & replies. This cannot be undone.
',
- ])
- @endunless
-@endsection
+
+
diff --git a/resources/views/users/settings/remove.blade.php b/resources/views/users/settings/remove.blade.php
new file mode 100644
index 000000000..04bf1ae69
--- /dev/null
+++ b/resources/views/users/settings/remove.blade.php
@@ -0,0 +1,32 @@
+@unless (Auth::user()->isAdmin())
+
+
+
+
+
+ Danger Zone
+
+
+ Please be aware that deleting your account will also remove all of your data, including your threads and replies. This cannot be undone.
+
+
+
+
+
+
+ Delete Account
+
+
+
+
+
+
+ Deleting your account will remove any related content like threads & replies. This cannot be undone.
+
+@endunless
diff --git a/resources/views/users/settings/settings.blade.php b/resources/views/users/settings/settings.blade.php
new file mode 100644
index 000000000..2c8ff5fba
--- /dev/null
+++ b/resources/views/users/settings/settings.blade.php
@@ -0,0 +1,63 @@
+@title('Settings')
+
+@extends('layouts.base')
+
+@section('body')
+
+
+
+ @include('layouts._alerts')
+
+
+
+
+
+ @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')
+ @include('users.settings.remove')
+
+
+
+@endsection
diff --git a/resources/views/vendor/mail/html/button.blade.php b/resources/views/vendor/mail/html/button.blade.php
index 674e7a461..eb471ab0e 100644
--- a/resources/views/vendor/mail/html/button.blade.php
+++ b/resources/views/vendor/mail/html/button.blade.php
@@ -7,7 +7,7 @@
diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php
index 79848c983..4a27b5033 100644
--- a/resources/views/vendor/mail/html/message.blade.php
+++ b/resources/views/vendor/mail/html/message.blade.php
@@ -3,7 +3,7 @@
@slot('header')
@component('mail::header', ['url' => config('app.url')])
-
 }} "Laravel.io")
+
@endcomponent
@endslot
diff --git a/resources/views/vendor/mail/html/themes/default.css b/resources/views/vendor/mail/html/themes/default.css
index adfa44c82..1c3e6f8b8 100644
--- a/resources/views/vendor/mail/html/themes/default.css
+++ b/resources/views/vendor/mail/html/themes/default.css
@@ -1,13 +1,14 @@
/* Base */
-body, body *:not(html):not(style):not(br):not(tr):not(code) {
+body,
+body *:not(html):not(style):not(br):not(tr):not(code) {
font-family: Avenir, Helvetica, sans-serif;
box-sizing: border-box;
}
body {
background-color: #f5f8fa;
- color: #74787E;
+ color: #74787e;
height: 100%;
hyphens: auto;
line-height: 1.4;
@@ -30,7 +31,7 @@ blockquote {
}
a {
- color: #3869D4;
+ color: #3869d4;
}
a img {
@@ -40,7 +41,7 @@ a img {
/* Typography */
h1 {
- color: #2F3133;
+ color: #2f3133;
font-size: 19px;
font-weight: bold;
margin-top: 0;
@@ -48,7 +49,7 @@ h1 {
}
h2 {
- color: #2F3133;
+ color: #2f3133;
font-size: 16px;
font-weight: bold;
margin-top: 0;
@@ -56,7 +57,7 @@ h2 {
}
h3 {
- color: #2F3133;
+ color: #2f3133;
font-size: 14px;
font-weight: bold;
margin-top: 0;
@@ -64,7 +65,7 @@ h3 {
}
p {
- color: #74787E;
+ color: #74787e;
font-size: 16px;
line-height: 1.5em;
margin-top: 0;
@@ -117,14 +118,14 @@ img {
}
.header img {
- width: 180px;
+ width: 180px;
}
/* Body */
.body {
- background-color: #FFFFFF;
- border-bottom: 1px solid #EDEFF2;
+ background-color: #ffffff;
+ border-bottom: 1px solid #edeff2;
margin: 0;
padding: 0;
width: 100%;
@@ -134,7 +135,7 @@ img {
}
.inner-body {
- background-color: #FFFFFF;
+ background-color: #ffffff;
margin: 0 auto;
padding: 0;
width: 570px;
@@ -146,7 +147,7 @@ img {
/* Subcopy */
.subcopy {
- border-top: 1px solid #EDEFF2;
+ border-top: 1px solid #edeff2;
margin-top: 25px;
padding-top: 25px;
}
@@ -168,7 +169,7 @@ img {
}
.footer p {
- color: #AEAEAE;
+ color: #aeaeae;
font-size: 12px;
text-align: center;
}
@@ -184,13 +185,13 @@ img {
}
.table th {
- border-bottom: 1px solid #EDEFF2;
+ border-bottom: 1px solid #edeff2;
padding-bottom: 8px;
margin: 0;
}
.table td {
- color: #74787E;
+ color: #74787e;
font-size: 15px;
line-height: 18px;
padding: 10px 0;
@@ -216,26 +217,26 @@ img {
.button {
border-radius: 3px;
box-shadow: 0 2px 3px rgba(0, 0, 0, 0.16);
- color: #FFF;
+ color: #fff;
display: inline-block;
text-decoration: none;
-webkit-text-size-adjust: none;
}
.button-blue {
- background-color: #3097D1;
- border-top: 10px solid #3097D1;
- border-right: 18px solid #3097D1;
- border-bottom: 10px solid #3097D1;
- border-left: 18px solid #3097D1;
+ background-color: #3097d1;
+ border-top: 10px solid #3097d1;
+ border-right: 18px solid #3097d1;
+ border-bottom: 10px solid #3097d1;
+ border-left: 18px solid #3097d1;
}
.button-green {
- background-color: #18BC9C;
- border-top: 10px solid #18BC9C;
- border-right: 18px solid #18BC9C;
- border-bottom: 10px solid #18BC9C;
- border-left: 18px solid #18BC9C;
+ background-color: #18bc9c;
+ border-top: 10px solid #18bc9c;
+ border-right: 18px solid #18bc9c;
+ border-bottom: 10px solid #18bc9c;
+ border-left: 18px solid #18bc9c;
}
.button-red {
@@ -253,7 +254,7 @@ img {
}
.panel-content {
- background-color: #EDEFF2;
+ background-color: #edeff2;
padding: 16px;
}
@@ -269,8 +270,8 @@ img {
/* Promotions */
.promotion {
- background-color: #FFFFFF;
- border: 2px dashed #9BA2AB;
+ background-color: #ffffff;
+ border: 2px dashed #9ba2ab;
margin: 0;
margin-bottom: 25px;
margin-top: 25px;
diff --git a/resources/views/vendor/mail/markdown/message.blade.php b/resources/views/vendor/mail/markdown/message.blade.php
index 79848c983..4a27b5033 100644
--- a/resources/views/vendor/mail/markdown/message.blade.php
+++ b/resources/views/vendor/mail/markdown/message.blade.php
@@ -3,7 +3,7 @@
@slot('header')
@component('mail::header', ['url' => config('app.url')])
-
+
@endcomponent
@endslot
diff --git a/routes/api.php b/routes/api.php
index 3f69b2ec4..bd952d2a0 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,18 +1,10 @@
get('/user', function (Request $request) {
-// return $request->user();
-//});
+Route::prefix('articles')->middleware('throttle:api')->group(function () {
+ Route::post('/', [ArticlesController::class, 'store'])->name('api.articles.store');
+ Route::put('{article}', [ArticlesController::class, 'update'])->name('api.articles.update');
+ Route::delete('{article}', [ArticlesController::class, 'delete'])->name('api.articles.delete');
+});
diff --git a/routes/bindings.php b/routes/bindings.php
index 317535db6..4d32e83f2 100644
--- a/routes/bindings.php
+++ b/routes/bindings.php
@@ -1,9 +1,11 @@
id === (int) $id;
-});
diff --git a/routes/console.php b/routes/console.php
index 75dd0cded..b45ac35de 100644
--- a/routes/console.php
+++ b/routes/console.php
@@ -1,18 +1,11 @@
comment(Inspiring::quote());
-})->describe('Display an inspiring quote');
+Schedule::command('schedule-monitor:sync')->dailyAt('04:56');
+Schedule::command('model:prune', ['--model' => MonitoredScheduledTaskLogItem::class])->daily();
+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:update-article-view-counts')->twiceDaily();
diff --git a/routes/web.php b/routes/web.php
index 62a3b11cf..5c7e652f5 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,87 +1,143 @@
name('home');
-Route::get('rules', 'HomeController@rules')->name('rules');
-Route::get('terms', 'HomeController@terms')->name('terms');
-Route::get('privacy', 'HomeController@privacy')->name('privacy');
-Route::get('bin/{paste?}', 'HomeController@pastebin');
-
-// Authentication
-Route::namespace('Auth')->group(function () {
- // Sessions
- Route::get('login', 'LoginController@showLoginForm')->name('login');
- Route::post('login', 'LoginController@login')->name('login.post');
- Route::get('logout', 'LoginController@logout')->name('logout');
-
- // Registration
- Route::get('register', 'RegisterController@showRegistrationForm')->name('register');
- Route::post('register', 'RegisterController@register')->name('register.post');
-
- // Password reset
- Route::get('password/reset', 'ForgotPasswordController@showLinkRequestForm')->name('password.forgot');
- Route::post('password/email', 'ForgotPasswordController@sendResetLinkEmail')->name('password.forgot.post');
- Route::get('password/reset/{token}', 'ResetPasswordController@showResetForm')->name('password.reset');
- Route::post('password/reset', 'ResetPasswordController@reset')->name('password.reset.post');
-
- // Email address confirmation
- Route::get('email-confirmation', 'EmailConfirmationController@send')->name('email.send_confirmation');
- Route::get('email-confirmation/{email_address}/{code}', 'EmailConfirmationController@confirm')
- ->name('email.confirm');
-
- // Social authentication
- Route::get('login/github', 'GithubController@redirectToProvider')->name('login.github');
- Route::get('auth/github', 'GithubController@handleProviderCallback');
-});
+Route::get('/', [HomeController::class, 'show'])->name('home');
+Route::view('rules', 'rules')->name('rules');
+Route::view('terms', 'terms')->name('terms');
+Route::view('privacy', 'privacy')->name('privacy');
+Route::get('bin/{paste?}', [HomeController::class, 'pastebin']);
+
+Route::get('articles/{article}/social.png', SocialImageController::class)->name('articles.image');
+
+// Sessions
+Route::get('login', [LoginController::class, 'showLoginForm'])->name('login');
+Route::post('login', [LoginController::class, 'login'])->name('login.post');
+Route::post('logout', [LoginController::class, 'logout'])->name('logout');
+
+// Registration
+Route::get('register', [RegisterController::class, 'showRegistrationForm'])->name('register');
+Route::post('register', [RegisterController::class, 'register'])->name('register.post');
+
+// Password reset
+Route::get('password/reset', [ForgotPasswordController::class, 'showLinkRequestForm'])->name('password.forgot');
+Route::post('password/email', [ForgotPasswordController::class, 'sendResetLinkEmail'])->name('password.forgot.post');
+Route::get('password/reset/{token}', [ResetPasswordController::class, 'showResetForm'])->name('password.reset');
+Route::post('password/reset', [ResetPasswordController::class, 'reset'])->name('password.reset.post');
+
+// Email address verification
+Route::get('email/verify', [VerificationController::class, 'show'])->name('verification.notice');
+Route::get('email/verify/{id}/{hash}', [VerificationController::class, 'verify'])->name('verification.verify');
+Route::post('email/resend', [VerificationController::class, 'resend'])->name('verification.resend');
+
+// Social authentication
+Route::get('login/github', [GitHubController::class, 'redirectToProvider'])->name('login.github');
+Route::get('auth/github', [GitHubController::class, 'handleProviderCallback']);
// Users
-Route::get('dashboard', 'DashboardController@show')->name('dashboard');
-Route::get('user/{username}', 'ProfileController@show')->name('profile');
-Route::get('avatar/{username}', 'ProfileController@avatar')->name('avatar');
+Route::redirect('/dashboard', '/user');
+Route::get('user/{username?}', [ProfileController::class, 'show'])->name('profile');
+Route::put('users/{username}/block', BlockUserController::class)->name('users.block');
+Route::put('users/{username}/unblock', UnblockUserController::class)->name('users.unblock');
+
+// Notifications
+Route::view('notifications', 'users.notifications')->name('notifications')->middleware(Authenticate::class);
+Route::post('notifications/mark-as-read', MarkNotificationsController::class)->name('notifications.mark-as-read');
// Settings
-Route::get('settings', 'Settings\ProfileController@edit')->name('settings.profile');
-Route::put('settings', 'Settings\ProfileController@update')->name('settings.profile.update');
-Route::delete('settings', 'Settings\ProfileController@destroy')->name('settings.profile.delete');
-Route::get('settings/password', 'Settings\PasswordController@edit')->name('settings.password');
-Route::put('settings/password', 'Settings\PasswordController@update')->name('settings.password.update');
+Route::get('settings', [ProfileSettingsController::class, 'edit'])->name('settings.profile');
+Route::put('settings', [ProfileSettingsController::class, 'update'])->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');
+Route::post('settings/notifications', [NotificationSettingsController::class, 'store'])->name('settings.notifications.store');
// Forum
-Route::prefix('forum')->namespace('Forum')->group(function () {
- Route::get('/', 'ThreadsController@overview')->name('forum');
- Route::get('create-thread', 'ThreadsController@create')->name('threads.create');
- Route::post('create-thread', 'ThreadsController@store')->name('threads.store');
-
- Route::get('{thread}', 'ThreadsController@show')->name('thread');
- Route::get('{thread}/edit', 'ThreadsController@edit')->name('threads.edit');
- Route::put('{thread}', 'ThreadsController@update')->name('threads.update');
- Route::delete('{thread}', 'ThreadsController@delete')->name('threads.delete');
- Route::put('{thread}/mark-solution/{reply}', 'ThreadsController@markSolution')->name('threads.solution.mark');
- Route::put('{thread}/unmark-solution', 'ThreadsController@unmarkSolution')->name('threads.solution.unmark');
- Route::get('{thread}/subscribe', 'ThreadsController@subscribe')->name('threads.subscribe');
- Route::get('{thread}/unsubscribe', 'ThreadsController@unsubscribe')->name('threads.unsubscribe');
-
- Route::get('tags/{tag}', 'TagsController@show')->name('forum.tag');
+Route::prefix('forum')->group(function () {
+ Route::get('/', [ThreadsController::class, 'overview'])->name('forum');
+ Route::get('create-thread', [ThreadsController::class, 'create'])->name('threads.create');
+ Route::post('create-thread', [ThreadsController::class, 'store'])->name('threads.store');
+
+ Route::get('{thread}', [ThreadsController::class, 'show'])->name('thread');
+ Route::get('{thread}/edit', [ThreadsController::class, 'edit'])->name('threads.edit');
+ Route::put('{thread}', [ThreadsController::class, 'update'])->name('threads.update');
+ Route::delete('{thread}', [ThreadsController::class, 'delete'])->name('threads.delete');
+ Route::post('{thread}/lock', [ThreadsController::class, 'lock'])->name('threads.lock');
+ Route::put('{thread}/mark-solution/{reply}', [ThreadsController::class, 'markSolution'])->name('threads.solution.mark');
+ Route::put('{thread}/unmark-solution', [ThreadsController::class, 'unmarkSolution'])->name('threads.solution.unmark');
+ Route::post('{thread}/subscribe', [ThreadsController::class, 'subscribe'])->name('threads.subscribe');
+ Route::post('{thread}/unsubscribe', [ThreadsController::class, 'unsubscribe'])->name('threads.unsubscribe');
+ Route::post('{thread}/mark-as-spam', [ThreadsController::class, 'markAsSpam'])->name('threads.spam.mark');
+
+ Route::get('tags/{tag}', [TagsController::class, 'show'])->name('forum.tag');
});
// Replies
-Route::post('replies', 'ReplyController@store')->name('replies.store');
-Route::get('replies/{reply}/edit', 'ReplyController@edit')->name('replies.edit');
-Route::put('replies/{reply}', 'ReplyController@update')->name('replies.update');
-Route::delete('replies/{reply}', 'ReplyController@delete')->name('replies.delete');
-Route::get('replyable/{id}/{type}', 'ReplyAbleController@redirect')->name('replyable');
+Route::post('replies', [ReplyController::class, 'store'])->name('replies.store');
+Route::delete('replies/{reply}', [ReplyController::class, 'delete'])->name('replies.delete');
+Route::post('replies/{reply}/mark-as-spam', [ReplyController::class, 'markAsSpam'])->name('replies.spam.mark');
+Route::get('replyable/{id}/{type}', [ReplyAbleController::class, 'redirect'])->name('replyable');
// Subscriptions
-Route::get('subscriptions/{subscription}/unsubscribe', 'SubscriptionController@unsubscribe')
+Route::get('subscriptions/{subscription}/unsubscribe', [SubscriptionController::class, 'unsubscribe'])
->name('subscriptions.unsubscribe');
+// Articles
+Route::prefix('articles')->group(function () {
+ Route::get('authored', AuthoredArticles::class)->name('user.articles');
+ Route::get('/', [ArticlesController::class, 'index'])->name('articles');
+ Route::get('create', [ArticlesController::class, 'create'])->name('articles.create');
+ Route::post('/', [ArticlesController::class, 'store'])->name('articles.store');
+ Route::get('{article}', [ArticlesController::class, 'show'])->name('articles.show');
+ Route::get('{article}/edit', [ArticlesController::class, 'edit'])->name('articles.edit');
+ Route::put('{article}', [ArticlesController::class, 'update'])->name('articles.update');
+ Route::delete('{article}', [ArticlesController::class, 'delete'])->name('articles.delete');
+});
+
// Admin
-Route::prefix('admin')->name('admin')->namespace('Admin')->group(function () {
- Route::get('/', 'AdminController@index');
- Route::get('users/{username}', 'UsersController@show')->name('.users.show');
- Route::put('users/{username}/ban', 'UsersController@ban')->name('.users.ban');
- Route::put('users/{username}/unban', 'UsersController@unban')->name('.users.unban');
- Route::delete('users/{username}', 'UsersController@delete')->name('.users.delete');
+Route::prefix('admin')->name('admin')->group(function () {
+ // Users
+ 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');
+ Route::put('articles/{article}/disapprove', [AdminArticlesController::class, 'disapprove'])->name('.articles.disapprove');
+ Route::put('articles/{article}/decline', [AdminArticlesController::class, 'decline'])->name('.articles.decline');
+ Route::put('articles/{article}/pinned', [AdminArticlesController::class, 'togglePinnedStatus'])->name('.articles.pinned');
});
diff --git a/server.php b/server.php
deleted file mode 100644
index 20bc389f0..000000000
--- a/server.php
+++ /dev/null
@@ -1,19 +0,0 @@
-
- */
-$uri = urldecode(
- parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
-);
-
-// This file allows us to emulate Apache's "mod_rewrite" functionality from the
-// built-in PHP web server. This provides a convenient way to test a Laravel
-// application without having installed a "real" web server software here.
-if ($uri !== '/' && file_exists(__DIR__.'/public'.$uri)) {
- return false;
-}
-
-require_once __DIR__.'/public/index.php';
diff --git a/storage/debugbar/.gitignore b/storage/debugbar/.gitignore
new file mode 100644
index 000000000..d6b7ef32c
--- /dev/null
+++ b/storage/debugbar/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/storage/framework/.gitignore b/storage/framework/.gitignore
index b02b700f1..05c4471f2 100644
--- a/storage/framework/.gitignore
+++ b/storage/framework/.gitignore
@@ -1,8 +1,9 @@
+compiled.php
config.php
+down
+events.scanned.php
+maintenance.php
routes.php
+routes.scanned.php
schedule-*
-compiled.php
services.json
-events.scanned.php
-routes.scanned.php
-down
diff --git a/tailwind.config.js b/tailwind.config.js
index 9a19ae46d..1edac60bb 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,30 +1,87 @@
-const defaultTheme = require('tailwindcss/defaultTheme')
+import forms from '@tailwindcss/forms';
+import typography from '@tailwindcss/typography';
-module.exports = {
- theme: {
- extend: {
- colors: {
- green: {
- light: '#baebe1',
- primary: '#18bc9c',
- dark: '#15a589',
- darker: '#12826c',
+/** @type {import('tailwindcss').Config} */
+export default {
+ darkMode: 'class', // Manually disable dark mode.
+ content: [
+ './resources/**/*.blade.php',
+ './resources/**/*.js',
+ './resources/macros/blade.php',
+ './vendor/laravel/framework/src/Illuminate/Pagination/resources/views/*.blade.php',
+ ],
+ theme: {
+ container: {
+ screens: {
+ sm: '640px',
+ md: '768px',
+ lg: '1024px',
+ xl: '1280px',
+ '2xl': '1280px',
+ },
},
- red: {
- primary: '#e53e3e',
- dark: '#c53030',
+ extend: {
+ colors: {
+ lio: {
+ 100: '#e6f6f3',
+ 200: '#a3ecde',
+ 300: '#6ee2cc',
+ 400: '#43d4b8',
+ 500: '#18bc9c',
+ 600: '#14a88b',
+ 700: '#0e8b73',
+ 800: '#0a6553',
+ 900: '#053c31',
+ },
+ gray: {
+ 100: '#f9fafb',
+ 200: '#dfdfdf',
+ 300: '#cbcbcb',
+ 400: '#b2b2b2',
+ 500: '#989898',
+ 600: '#7e7e7e',
+ 700: '#636363',
+ 800: '#484a4a',
+ 900: '#343636',
+ },
+ twitter: '#000000',
+ discord: '#7289da',
+ facebook: '#4267b2',
+ linkedin: '#2977c9',
+ },
+ minWidth: {
+ 8: '2rem',
+ },
+ maxWidth: {
+ 14: '14rem',
+ },
+ typography: (theme) => ({
+ DEFAULT: {
+ css: {
+ color: theme('colors.gray.900'),
+ a: {
+ 'text-decoration': 'none',
+ color: theme('colors.lio.500'),
+ 'border-bottom': `2px solid ${theme('colors.lio.100')}`,
+ '&:hover': {
+ color: theme('colors.lio.700'),
+ },
+ },
+ 'code::before': {
+ content: '""',
+ },
+ 'code::after': {
+ content: '""',
+ },
+ code: {
+ color: '#ec4073',
+ 'background-color': 'rgba(236, 64, 115, 0.1)',
+ 'border-radius': theme('borderRadius.DEFAULT'),
+ },
+ },
+ },
+ }),
},
- gray: {
- ...defaultTheme.colors.gray,
- },
- },
- fontFamily: {
- sans: ['Inter var', ...defaultTheme.fontFamily.sans],
- },
},
- },
- variants: {},
- plugins: [
- require('@tailwindcss/ui'),
- ],
+ plugins: [forms, typography],
};
diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php
deleted file mode 100644
index 60a3e8ca2..000000000
--- a/tests/CreatesApplication.php
+++ /dev/null
@@ -1,25 +0,0 @@
-make(Kernel::class)->bootstrap();
-
- Hash::driver('bcrypt')->setRounds(4);
-
- return $app;
- }
-}
diff --git a/tests/CreatesUsers.php b/tests/CreatesUsers.php
index 53f2e78fa..d5300256a 100644
--- a/tests/CreatesUsers.php
+++ b/tests/CreatesUsers.php
@@ -2,7 +2,8 @@
namespace Tests;
-use App\User;
+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 factory(User::class)->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 7787f9eb0..33c395b8a 100644
--- a/tests/Feature/AdminTest.php
+++ b/tests/Feature/AdminTest.php
@@ -1,184 +1,428 @@
get('/admin')
+ ->assertRedirect('/admin/login');
+});
+
+test('normal users cannot visit the admin section', function () {
+ $this->login();
+
+ $this->get('/admin')
+ ->assertForbidden();
+});
+
+test('admins can see the users overview', function () {
+ $this->loginAsAdmin();
+
+ assertCanSeeTheUserOverview();
+});
+
+test('moderators can see the users overview', function () {
+ $this->loginAsModerator();
+
+ assertCanSeeTheUserOverview();
+});
+
+test('admins can ban a user', function () {
+ $this->loginAsAdmin();
+
+ assertCanBanUsers();
+});
+
+test('admins can ban a user and delete their threads', function () {
+ $this->loginAsAdmin();
+
+ assertCanBanUsersAndDeleteThreads();
+});
+
+test('moderators can ban a user', function () {
+ $this->loginAsModerator();
+
+ assertCanBanUsers();
+});
+
+test('moderators can ban a user and delete their threads', function () {
+ $this->loginAsModerator();
+
+ assertCanBanUsersAndDeleteThreads();
+});
+
+test('admins can unban a user', function () {
+ $this->loginAsAdmin();
+
+ assertCanUnbanUsers();
+});
+
+test('moderators can unban a user', function () {
+ $this->loginAsModerator();
+
+ assertCanUnbanUsers();
+});
+
+test('admins cannot ban other admins', function () {
+ $this->loginAsAdmin();
+
+ assertCannotBanAdmins();
+});
+
+test('moderators cannot ban admins', function () {
+ $this->loginAsModerator();
+
+ assertCannotBanAdmins();
+});
+
+test('moderators cannot ban other moderators', function () {
+ $this->loginAsModerator();
+
+ assertCannotBanModerators();
+});
+
+test('admins cannot ban a user without a reason', function () {
+ $user = User::factory()->create(['name' => 'Freek Murze']);
+
+ $this->loginAsAdmin();
+
+ $this->put('/admin/users/'.$user->username().'/ban')
+ ->assertRedirect('/');
+
+ test()->assertDatabaseHas('users', ['id' => $user->id(), 'banned_at' => null, 'banned_reason' => null]);
+});
+
+test('moderators cannot ban a user without a reason', function () {
+ $user = User::factory()->create(['name' => 'Freek Murze']);
+
+ $this->loginAsModerator();
+
+ $this->put('/admin/users/'.$user->username().'/ban')
+ ->assertRedirect('/');
+
+ test()->assertDatabaseHas('users', ['id' => $user->id(), 'banned_at' => null, 'banned_reason' => null]);
+});
+
+test('admins can delete a user', function () {
+ $user = User::factory()->create(['name' => 'Freek Murze']);
+ $thread = Thread::factory()->create(['author_id' => $user->id()]);
+ Reply::factory()->create(['replyable_id' => $thread->id()]);
+ Reply::factory()->create(['author_id' => $user->id()]);
+
+ $this->loginAsAdmin();
+
+ livewire(ListUsers::class)
+ ->callAction(TestAction::make('delete')->table($user));
+
+ $this->assertDatabaseMissing('users', ['name' => 'Freek Murze']);
+ $this->assertDatabaseMissing('threads', ['author_id' => $user->id()]);
+ $this->assertDatabaseMissing('replies', ['replyable_id' => $thread->id()]);
+ $this->assertDatabaseMissing('replies', ['author_id' => $user->id()]);
+});
+
+test('admins cannot delete other admins', function () {
+ $user = User::factory()->create(['type' => User::ADMIN]);
+
+ $this->loginAsAdmin();
+
+ livewire(ListUsers::class)
+ ->assertActionHidden(TestAction::make('delete')->table($user));
+});
+
+test('moderators cannot delete users', function () {
+ $user = User::factory()->create();
+
+ $this->loginAsModerator();
+
+ livewire(ListUsers::class)
+ ->assertActionHidden(TestAction::make('delete')->table($user));
+});
+
+test('admins can list submitted articles', function () {
+ $submittedArticle = Article::factory()->create(['submitted_at' => now()]);
+ $draftArticle = Article::factory()->create();
+ $liveArticle = Article::factory()->create(['submitted_at' => now(), 'approved_at' => now()]);
+
+ $this->loginAsAdmin();
+
+ $this->get('admin/articles')
+ ->assertSee($submittedArticle->title())
+ ->assertDontSee($draftArticle->title())
+ ->assertDontSee($liveArticle->title());
+});
+
+test('moderators can list submitted articles', function () {
+ $submittedArticle = Article::factory()->create(['submitted_at' => now()]);
+ $draftArticle = Article::factory()->create();
+ $liveArticle = Article::factory()->create(['submitted_at' => now(), 'approved_at' => now()]);
+
+ $this->loginAsModerator();
+
+ $this->get('admin/articles')
+ ->assertSee($submittedArticle->title())
+ ->assertDontSee($draftArticle->title())
+ ->assertDontSee($liveArticle->title());
+});
+
+test('users cannot list submitted articles', function () {
+ $this->login();
+
+ $this->get('admin')
+ ->assertForbidden();
+});
+
+test('guests cannot list submitted articles', function () {
+ $this->get('admin')
+ ->assertRedirect('/admin/login');
+});
+
+test('admins can view submitted articles', function () {
+ $article = Article::factory()->create(['submitted_at' => now()]);
+
+ $this->loginAsAdmin();
+
+ $this->get("articles/{$article->slug()}")
+ ->assertSee('Awaiting Approval');
+});
+
+test('admins can approve articles', function () {
+ $article = Article::factory()->create(['submitted_at' => now()]);
+
+ $this->loginAsAdmin();
+
+ $this->put("/admin/articles/{$article->slug()}/approve");
+
+ $this->assertNotNull($article->fresh()->approvedAt());
+});
+
+test('moderators can approve articles', function () {
+ $article = Article::factory()->create(['submitted_at' => now()]);
+
+ $this->loginAsModerator();
+
+ $this->put("/admin/articles/{$article->slug()}/approve");
+
+ $this->assertNotNull($article->fresh()->approvedAt());
+});
+
+test('users cannot approve articles', function () {
+ $article = Article::factory()->create(['submitted_at' => now()]);
+
+ $this->login();
+
+ $this->put("/admin/articles/{$article->slug()}/approve")
+ ->assertForbidden();
+});
+
+test('guests cannot approve articles', function () {
+ $article = Article::factory()->create(['submitted_at' => now()]);
+
+ $this->put("/admin/articles/{$article->slug()}/approve")
+ ->assertRedirect('/login');
-class AdminTest extends BrowserKitTestCase
+ expect($article->fresh()->approvedAt())->toBeNull();
+});
+
+test('admins can disapprove articles', function () {
+ $article = Article::factory()->create(['submitted_at' => now(), 'approved_at' => now()]);
+
+ $this->loginAsAdmin();
+
+ $this->put("/admin/articles/{$article->slug()}/disapprove");
+
+ expect($article->fresh()->approvedAt())->toBeNull();
+});
+
+test('moderators can disapprove articles', function () {
+ $article = Article::factory()->create(['submitted_at' => now(), 'approved_at' => now()]);
+
+ $this->loginAsModerator();
+
+ $this->put("/admin/articles/{$article->slug()}/disapprove");
+
+ expect($article->fresh()->approvedAt())->toBeNull();
+});
+
+test('users cannot disapprove articles', function () {
+ $article = Article::factory()->create(['submitted_at' => now(), 'approved_at' => now()]);
+
+ $this->login();
+
+ $this->put("/admin/articles/{$article->slug()}/disapprove")
+ ->assertForbidden();
+});
+
+test('guests cannot disapprove articles', function () {
+ $article = Article::factory()->create(['submitted_at' => now(), 'approved_at' => now()]);
+
+ $this->put("/admin/articles/{$article->slug()}/disapprove")
+ ->assertRedirect('/login');
+
+ $this->assertNotNull($article->fresh()->approvedAt());
+});
+
+test('admins can pin articles', function () {
+ $article = Article::factory()->create(['submitted_at' => now(), 'approved_at' => now()]);
+
+ $this->loginAsAdmin();
+
+ $this->put("/admin/articles/{$article->slug()}/pinned");
+
+ expect($article->fresh()->isPinned())->toBeTrue();
+});
+
+test('moderators can pin articles', function () {
+ $article = Article::factory()->create(['submitted_at' => now(), 'approved_at' => now()]);
+
+ $this->loginAsModerator();
+
+ $this->put("/admin/articles/{$article->slug()}/pinned");
+
+ expect($article->fresh()->isPinned())->toBeTrue();
+});
+
+test('users cannot pin articles', function () {
+ $article = Article::factory()->create(['submitted_at' => now(), 'approved_at' => now()]);
+
+ $this->login();
+
+ $this->put("/admin/articles/{$article->slug()}/pinned");
+
+ expect($article->fresh()->isPinned())->toBeFalse();
+});
+
+test('guests cannot pin articles', function () {
+ $article = Article::factory()->create(['submitted_at' => now(), 'approved_at' => now()]);
+
+ $this->put("/admin/articles/{$article->slug()}/pinned");
+
+ expect($article->fresh()->isPinned())->toBeFalse();
+});
+
+test('admins can unpin articles', function () {
+ $article = Article::factory()->create([
+ 'submitted_at' => now(),
+ 'approved_at' => now(),
+ 'is_pinned' => true,
+ ]);
+
+ $this->loginAsAdmin();
+
+ $this->put("/admin/articles/{$article->slug()}/pinned");
+
+ expect($article->fresh()->isPinned())->toBeFalse();
+});
+
+test('moderators can unpin articles', function () {
+ $article = Article::factory()->create([
+ 'submitted_at' => now(),
+ 'approved_at' => now(),
+ 'is_pinned' => true,
+ ]);
+
+ $this->loginAsModerator();
+
+ $this->put("/admin/articles/{$article->slug()}/pinned");
+
+ expect($article->fresh()->isPinned())->toBeFalse();
+});
+
+test('users cannot unpin articles', function () {
+ $article = Article::factory()->create([
+ 'submitted_at' => now(),
+ 'approved_at' => now(),
+ 'is_pinned' => true,
+ ]);
+
+ $this->login();
+
+ $this->put("/admin/articles/{$article->slug()}/pinned");
+
+ expect($article->fresh()->isPinned())->toBeTrue();
+});
+
+test('guests cannot unpin articles', function () {
+ $article = Article::factory()->create([
+ 'submitted_at' => now(),
+ 'approved_at' => now(),
+ 'is_pinned' => true,
+ ]);
+
+ $this->put("/admin/articles/{$article->slug()}/pinned");
+
+ expect($article->fresh()->isPinned())->toBeTrue();
+});
+
+// Helpers
+function assertCanSeeTheUserOverview()
+{
+ User::factory()->create(['name' => 'Freek Murze']);
+ User::factory()->create(['name' => 'Frederick Vanbrabant']);
+
+ test()->get('/admin/users')
+ ->assertSee('Freek Murze')
+ ->assertSee('Frederick Vanbrabant');
+}
+
+function assertCanBanUsers()
+{
+ $user = User::factory()->create(['name' => 'Freek Murze']);
+
+ test()->put('/admin/users/'.$user->username().'/ban', ['reason' => 'A good reason', 'delete_threads' => false])
+ ->assertRedirect('/user/'.$user->username());
+
+ test()->assertDatabaseMissing('users', ['id' => $user->id(), 'banned_at' => null]);
+ test()->assertDatabaseHas('users', ['id' => $user->id(), 'banned_reason' => 'A good reason']);
+}
+
+function assertCanBanUsersAndDeleteThreads()
{
- use DatabaseMigrations;
-
- /** @test */
- public function requires_login()
- {
- $this->visit('/admin')
- ->seePageIs('/login');
- }
-
- /** @test */
- public function normal_users_cannot_visit_the_admin_section()
- {
- $this->login();
-
- $this->get('/admin')
- ->assertForbidden();
- }
-
- /** @test */
- public function admins_can_see_the_users_overview()
- {
- $this->loginAsAdmin();
- $this->assertCanSeeTheUserOverview();
- }
-
- /** @test */
- public function moderators_can_see_the_users_overview()
- {
- $this->loginAsModerator();
- $this->assertCanSeeTheUserOverview();
- }
-
- private function assertCanSeeTheUserOverview()
- {
- factory(User::class)->create(['name' => 'Freek Murze']);
- factory(User::class)->create(['name' => 'Frederick Vanbrabant']);
-
- $this->visit('/admin')
- ->see('Freek Murze')
- ->see('Frederick Vanbrabant');
- }
-
- /** @test */
- public function admins_can_ban_a_user()
- {
- $this->loginAsAdmin();
- $this->assertCanBanUsers();
- }
-
- /** @test */
- public function moderators_can_ban_a_user()
- {
- $this->loginAsModerator();
- $this->assertCanBanUsers();
- }
-
- private function assertCanBanUsers()
- {
- $user = factory(User::class)->create(['name' => 'Freek Murze']);
-
- $this->put('/admin/users/'.$user->username().'/ban')
- ->assertRedirectedTo('/user/'.$user->username());
-
- $this->notSeeInDatabase('users', ['id' => $user->id(), 'banned_at' => null]);
- }
-
- /** @test */
- public function admins_can_unban_a_user()
- {
- $this->loginAsAdmin();
- $this->assertCanUnbanUsers();
- }
-
- /** @test */
- public function moderators_can_unban_a_user()
- {
- $this->loginAsModerator();
- $this->assertCanUnbanUsers();
- }
-
- private function assertCanUnbanUsers()
- {
- $user = factory(User::class)->create(['name' => 'Freek Murze', 'banned_at' => Carbon::now()]);
-
- $this->put('/admin/users/'.$user->username().'/unban')
- ->assertRedirectedTo('/user/'.$user->username());
-
- $this->seeInDatabase('users', ['id' => $user->id(), 'banned_at' => null]);
- }
-
- /** @test */
- public function admins_cannot_ban_other_admins()
- {
- $this->loginAsAdmin();
- $this->assertCannotBanAdmins();
- }
-
- /** @test */
- public function moderators_cannot_ban_admins()
- {
- $this->loginAsModerator();
- $this->assertCannotBanAdmins();
- }
-
- /** @test */
- public function moderators_cannot_ban_other_moderators()
- {
- $this->loginAsModerator();
- $this->assertCannotBanModerators();
- }
-
- private function assertCannotBanAdmins()
- {
- $this->assertCannotBanUsersByType(User::ADMIN);
- }
-
- private function assertCannotBanModerators()
- {
- $this->assertCannotBanUsersByType(User::MODERATOR);
- }
-
- private function assertCannotBanUsersByType(int $type)
- {
- $user = factory(User::class)->create(['type' => $type]);
-
- $this->put('/admin/users/'.$user->username().'/ban')
- ->assertForbidden();
- }
-
- /** @test */
- public function admins_can_delete_a_user()
- {
- $user = factory(User::class)->create(['name' => 'Freek Murze']);
- $thread = factory(Thread::class)->create(['author_id' => $user->id()]);
- factory(Reply::class)->create(['replyable_id' => $thread->id()]);
- factory(Reply::class)->create(['author_id' => $user->id()]);
-
- $this->loginAsAdmin();
-
- $this->delete('/admin/users/'.$user->username())
- ->assertRedirectedTo('/admin');
-
- $this->notSeeInDatabase('users', ['name' => 'Freek Murze']);
-
- // Make sure associated content is deleted.
- $this->notSeeInDatabase('threads', ['author_id' => $user->id()]);
- $this->notSeeInDatabase('replies', ['replyable_id' => $thread->id()]);
- $this->notSeeInDatabase('replies', ['author_id' => $user->id()]);
- }
-
- /** @test */
- public function admins_cannot_delete_other_admins()
- {
- $user = factory(User::class)->create(['type' => User::ADMIN]);
-
- $this->loginAsAdmin();
-
- $this->delete('/admin/users/'.$user->username())
- ->assertForbidden();
- }
-
- /** @test */
- public function moderators_cannot_delete_users()
- {
- $user = factory(User::class)->create();
-
- $this->loginAsModerator();
-
- $this->delete('/admin/users/'.$user->username())
- ->assertForbidden();
- }
+ $user = User::factory()->create(['name' => 'Freek Murze']);
+
+ test()->put('/admin/users/'.$user->username().'/ban', ['reason' => 'A good reason', 'delete_threads' => true])
+ ->assertRedirect('/user/'.$user->username());
+
+ test()->assertDatabaseMissing('users', ['id' => $user->id(), 'banned_at' => null]);
+ test()->assertDatabaseHas('users', ['id' => $user->id(), 'banned_reason' => 'A good reason']);
+ test()->assertDatabaseMissing('threads', ['author_id' => $user->id()]);
+}
+
+function assertCanUnbanUsers()
+{
+ $user = User::factory()->create(['name' => 'Freek Murze', 'banned_at' => Carbon::now()]);
+
+ test()->put('/admin/users/'.$user->username().'/unban')
+ ->assertRedirect('/user/'.$user->username());
+
+ test()->assertDatabaseHas('users', ['id' => $user->id(), 'banned_at' => null, 'banned_reason' => null]);
+}
+
+function assertCannotBanAdmins()
+{
+ assertCannotBanUsersByType(User::ADMIN);
+}
+
+function assertCannotBanModerators()
+{
+ assertCannotBanUsersByType(User::MODERATOR);
+}
+
+function assertCannotBanUsersByType(int $type)
+{
+ $user = User::factory()->create(['type' => $type]);
+
+ test()->put('/admin/users/'.$user->username().'/ban', ['reason' => 'A good reason', 'delete_threads' => fake()->boolean()])
+ ->assertForbidden();
}
diff --git a/tests/Feature/ArticleTest.php b/tests/Feature/ArticleTest.php
new file mode 100644
index 000000000..0206b5754
--- /dev/null
+++ b/tests/Feature/ArticleTest.php
@@ -0,0 +1,621 @@
+get('/articles/create')
+ ->assertRedirect('/login');
+});
+
+test('users can create an article', function () {
+ $user = $this->createUser();
+ $tag = Tag::factory()->create(['name' => 'Test Tag']);
+
+ $this->loginAs($user);
+
+ $this->post('/articles', [
+ 'title' => 'Using database migrations',
+ 'body' => 'This article will go into depth on working with database migrations.',
+ 'tags' => [$tag->id()],
+ 'submitted' => '0',
+ ])
+ ->assertRedirect('/articles/using-database-migrations')
+ ->assertSessionHas('success', 'Article successfully created!');
+});
+
+test('user gets submitted message when submitting new article for approval', function () {
+ Event::fake();
+
+ $this->login();
+
+ $this->post('/articles', [
+ 'title' => 'Using database migrations',
+ 'body' => 'This article will go into depth on working with database migrations.',
+ 'tags' => [],
+ 'submitted' => '1',
+ ])
+ ->assertRedirect('/articles/using-database-migrations')
+ ->assertSessionHas('success', 'Thank you for submitting, unfortunately we can\'t accept every submission. You\'ll only hear back from us when we accept your article.');
+
+ Event::assertDispatched(ArticleWasSubmittedForApproval::class);
+});
+
+test('users can submit an article for approval', function () {
+ Event::fake();
+
+ $this->login();
+
+ $response = $this->post('/articles', [
+ 'title' => 'Using database migrations',
+ 'body' => 'This article will go into depth on working with database migrations.',
+ 'submitted' => '1',
+ ])
+ ->assertRedirect('/articles/using-database-migrations');
+
+ $this->followRedirects($response)
+ ->assertDontSee('Draft')
+ ->assertSee('Awaiting Approval');
+
+ Event::assertDispatched(ArticleWasSubmittedForApproval::class);
+});
+
+test('articles submitted for approval sends a telegram notification for review', function () {
+ Notification::fake();
+
+ $this->login();
+
+ $this->post('/articles', [
+ 'title' => 'Using database migrations',
+ 'body' => 'This article will go into depth on working with database migrations.',
+ 'submitted' => '1',
+ ]);
+
+ Notification::assertSentOnDemand(ArticleSubmitted::class);
+});
+
+test('users can create a draft article', function () {
+ $this->login();
+
+ $response = $this->post('/articles', [
+ 'title' => 'Using database migrations',
+ 'body' => 'This article will go into depth on working with database migrations.',
+ 'submitted' => '0',
+ ])
+ ->assertRedirect('/articles/using-database-migrations');
+
+ $this->followRedirects($response)
+ ->assertSee('Draft');
+});
+
+test('draft articles do not send telegram notification', function () {
+ Notification::fake();
+
+ $this->login();
+
+ $this->post('/articles', [
+ 'title' => 'Using database migrations',
+ 'body' => 'This article will go into depth on working with database migrations.',
+ 'submitted' => '0',
+ ]);
+
+ Notification::assertNothingSent();
+});
+
+test('users cannot create an article with a title that is too long', function () {
+ $this->login();
+
+ $response = $this->post('/articles', [
+ 'title' => 'Adding Notifications to make a really engaging UI for Laravel.io users using Livewire, Alpine.js and Tailwind UI',
+ 'body' => 'The title of this article is too long',
+ ]);
+
+ $response->assertSessionHas('error', 'Something went wrong. Please review the fields below.');
+ $response->assertSessionHasErrors(['title' => 'The title must not be greater than 100 characters.']);
+});
+
+test('an article may not contain an http image url', function () {
+ $this->login();
+
+ $response = $this->post('/articles', [
+ 'title' => 'My First Article',
+ 'body' => 'This is a really interesting article about images. Here is .',
+ ]);
+
+ $response->assertSessionHas('error', 'Something went wrong. Please review the fields below.');
+ $response->assertSessionHasErrors(['body' => 'The body field contains at least one image with an HTTP link.']);
+});
+
+test('guests can view an article', function () {
+ $article = Article::factory()->create(['slug' => 'my-first-article', 'submitted_at' => now(), 'approved_at' => now()]);
+
+ $this->get('/articles/my-first-article')
+ ->assertSee($article->title());
+});
+
+test('articles with links do not include a nofollow attributes', function () {
+ $article = Article::factory()->approved()->create([
+ 'slug' => 'my-first-article',
+ 'submitted_at' => now(),
+ 'body' => 'This article will go into depth on working with database migrations. Here is [a link](https://example.com).',
+ ]);
+
+ $this->get('/articles/my-first-article')
+ ->assertSee($article->title())
+ ->assertDontSee('nofollow');
+});
+
+test('logged in users can view an article', function () {
+ $article = Article::factory()->create([
+ 'slug' => 'my-first-article',
+ 'submitted_at' => now(),
+ 'approved_at' => now(),
+ ]);
+
+ $this->login();
+
+ $this->get('/articles/my-first-article')
+ ->assertSee($article->title());
+});
+
+test('users can edit an article', function () {
+ $user = $this->createUser();
+ $tag = Tag::factory()->create(['name' => 'Test Tag']);
+
+ Article::factory()->create([
+ 'author_id' => $user->id(),
+ 'slug' => 'my-first-article',
+ ]);
+
+ $this->loginAs($user);
+
+ $this->put('/articles/my-first-article', [
+ 'title' => 'Using database migrations',
+ 'body' => 'This article will go into depth on working with database migrations.',
+ 'tags' => [$tag->id()],
+ 'submitted' => '0',
+ ])
+ ->assertRedirect('/articles/using-database-migrations')
+ ->assertSessionHas('success', 'Article successfully updated!');
+});
+
+test('editing a draft article does not send telegram notification', function () {
+ Notification::fake();
+
+ $user = $this->createUser();
+ $tag = Tag::factory()->create(['name' => 'Test Tag']);
+
+ Article::factory()->create([
+ 'author_id' => $user->id(),
+ 'slug' => 'my-first-article',
+ ]);
+
+ $this->loginAs($user);
+
+ $this->put('/articles/my-first-article', [
+ 'title' => 'Using database migrations',
+ 'body' => 'This article will go into depth on working with database migrations.',
+ 'tags' => [$tag->id()],
+ 'submitted' => '0',
+ ]);
+
+ Notification::assertNothingSent();
+});
+
+test('user gets submitted message when submitting existing article for approval', function () {
+ Event::fake();
+
+ $user = $this->createUser();
+
+ Article::factory()->create([
+ 'author_id' => $user->id(),
+ 'slug' => 'my-first-article',
+ ]);
+
+ $this->loginAs($user);
+
+ $this->put('/articles/my-first-article', [
+ 'title' => 'Using database migrations',
+ 'body' => 'This article will go into depth on working with database migrations.',
+ 'tags' => [],
+ 'submitted' => '1',
+ ])
+ ->assertRedirect('/articles/using-database-migrations')
+ ->assertSessionHas('success', 'Thank you for submitting, unfortunately we can\'t accept every submission. You\'ll only hear back from us when we accept your article.');
+
+ Event::assertDispatched(ArticleWasSubmittedForApproval::class);
+});
+
+test('users can submit an existing article for approval', function () {
+ Event::fake();
+
+ $user = $this->createUser();
+
+ Article::factory()->create([
+ 'author_id' => $user->id(),
+ 'slug' => 'my-first-article',
+ 'submitted_at' => null,
+ ]);
+
+ $this->loginAs($user);
+
+ $response = $this->put('/articles/my-first-article', [
+ 'title' => 'Using database migrations',
+ 'body' => 'This article will go into depth on working with database migrations.',
+ 'submitted' => '1',
+ ])
+ ->assertRedirect('/articles/using-database-migrations');
+
+ $this->followRedirects($response)
+ ->assertDontSee('Draft');
+
+ Event::assertDispatched(ArticleWasSubmittedForApproval::class);
+});
+
+test('notification is sent to telegram when existing article is submitted for approval', function () {
+ Notification::fake();
+
+ $user = $this->createUser();
+
+ Article::factory()->create([
+ 'author_id' => $user->id(),
+ 'slug' => 'my-first-article',
+ ]);
+
+ $this->loginAs($user);
+
+ $this->put('/articles/my-first-article', [
+ 'title' => 'Using database migrations',
+ 'body' => 'This article will go into depth on working with database migrations.',
+ 'tags' => [],
+ 'submitted' => '1',
+ ]);
+
+ Notification::assertSentOnDemand(ArticleSubmitted::class);
+});
+
+test('users cannot edit an article with a title that is too long', function () {
+ $user = $this->createUser();
+ Article::factory()->create([
+ 'author_id' => $user->id(),
+ 'slug' => 'my-first-article',
+ ]);
+
+ $this->loginAs($user);
+
+ $response = $this->put('/articles/my-first-article', [
+ 'title' => 'Adding Notifications to make a really engaging UI for Laravel.io users using Livewire, Alpine.js and Tailwind UI',
+ 'body' => 'The title of this article is too long',
+ ]);
+
+ $response->assertSessionHas('error', 'Something went wrong. Please review the fields below.');
+ $response->assertSessionHasErrors(['title' => 'The title must not be greater than 100 characters.']);
+});
+
+test('an article may not updated to contain an http image url', function () {
+ $user = $this->createUser();
+ Article::factory()->create([
+ 'author_id' => $user->id(),
+ 'slug' => 'my-first-article',
+ ]);
+
+ $this->loginAs($user);
+
+ $response = $this->put('/articles/my-first-article', [
+ 'title' => 'My first article',
+ 'body' => 'This is a really interesting article about images. Here is .',
+ ]);
+
+ $response->assertSessionHas('error', 'Something went wrong. Please review the fields below.');
+ $response->assertSessionHasErrors(['body' => 'The body field contains at least one image with an HTTP link.']);
+});
+
+test('an already submitted article should not have timestamp updated on update', function () {
+ $user = $this->createUser();
+ $article = Article::factory()->create([
+ 'author_id' => $user->id(),
+ 'slug' => 'my-first-article',
+ 'submitted_at' => '2020-06-19 00:00:00',
+ ]);
+
+ $this->loginAs($user);
+
+ $this->put('/articles/my-first-article', [
+ 'title' => 'My first article',
+ 'body' => 'Just updating the body of the article',
+ 'submitted' => true,
+ ]);
+
+ expect($article->fresh()->submittedAt()->format('Y-m-d H:i:s'))->toBe('2020-06-19 00:00:00');
+});
+
+test('users can delete their own articles', function () {
+ $user = $this->createUser();
+ Article::factory()->create([
+ 'author_id' => $user->id(),
+ 'slug' => 'my-first-article',
+ 'is_sponsored' => false,
+ ]);
+
+ $this->loginAs($user);
+
+ $this->delete('/articles/my-first-article')
+ ->assertRedirect('/articles')
+ ->assertSessionHas('success', 'Article successfully deleted!');
+});
+
+test('users cannot delete an article they do not own', function () {
+ Article::factory()->create(['slug' => 'my-first-article']);
+
+ $this->login();
+
+ $this->delete('/articles/my-first-article')
+ ->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()]);
+
+ $expectedHtml = new HtmlString('
');
+
+ $this->get('/articles/my-first-article')
+ ->assertSee($expectedHtml);
+});
+
+test('custom canonical urls are rendered', function () {
+ Article::factory()->create([
+ 'slug' => 'my-first-article',
+ 'original_url' => 'https://joedixon.co.uk/my-first-article',
+ 'submitted_at' => now(),
+ 'approved_at' => now(),
+ ]);
+
+ $expectedHtml = new HtmlString('
');
+
+ $this->get('/articles/my-first-article')
+ ->assertSee($expectedHtml);
+});
+
+test('draft articles cannot be viewed by guests', function () {
+ Article::factory()->create(['slug' => 'my-first-article', 'submitted_at' => null]);
+
+ $this->get('/articles/my-first-article')
+ ->assertStatus(404);
+});
+
+test('draft articles can be viewed by the article owner', function () {
+ $user = $this->createUser();
+ Article::factory()->create([
+ 'author_id' => $user->id(),
+ 'slug' => 'my-first-article',
+ 'submitted_at' => null,
+ ]);
+
+ $this->loginAs($user);
+
+ $this->get('/articles/my-first-article')
+ ->assertStatus(200)
+ ->assertSee('Draft');
+});
+
+test('draft articles cannot be viewed by logged in users', function () {
+ Article::factory()->create([
+ 'slug' => 'my-first-article',
+ 'submitted_at' => null,
+ ]);
+
+ $this->login();
+
+ $this->get('/articles/my-first-article')
+ ->assertStatus(404);
+});
+
+test('a user can view their articles', function () {
+ $user = $this->createUser();
+
+ $articles = Article::factory()->count(3)->create([
+ 'author_id' => $user->id,
+ ]);
+
+ $this->loginAs($user);
+
+ $this->get('/articles/authored')
+ ->assertSee($articles[0]->title())
+ ->assertSee($articles[1]->title())
+ ->assertSee($articles[2]->title());
+});
+
+test("a user cannot view another user's articles", function () {
+ $articles = Article::factory()->count(3)->create();
+
+ $this->login();
+
+ $this->get('/articles/authored')
+ ->assertDontSee($articles[0]->title())
+ ->assertDontSee($articles[1]->title())
+ ->assertDontSee($articles[2]->title());
+});
+
+test('a guest cannot see articles', function () {
+ $this->get('/articles/authored')
+ ->assertRedirect('/login');
+});
+
+test('users get a mail notification when their article is approved', function () {
+ Notification::fake();
+
+ $user = $this->createUser([
+ 'name' => 'Joe Dixon',
+ 'username' => 'joedixon',
+ 'email' => 'hello@joedixon.co.uk',
+ ]);
+ $article = Article::factory()->create([
+ 'slug' => 'my-first-article',
+ 'submitted_at' => now(),
+ 'author_id' => $user->id,
+ ]);
+
+ $this->loginAsAdmin();
+ $this->put("/admin/articles/{$article->slug()}/approve");
+
+ Notification::assertSentTo($user, ArticleApprovedNotification::class);
+});
+
+test('tags are not rendered for unpublished articles', function () {
+ $tag = Tag::factory()->create(['name' => 'Test Tag']);
+ $article = Article::factory()->create([
+ 'slug' => 'my-first-article',
+ 'submitted_at' => now(),
+ ]);
+ $article->syncTags([$tag->id]);
+
+ $this->get('/articles')
+ ->assertDontSee('Test Tag');
+});
+
+test('share image url is rendered correctly', function () {
+ Article::factory()->create([
+ 'slug' => 'my-first-article',
+ 'submitted_at' => now(),
+ 'approved_at' => now(),
+ ]);
+
+ $this->get('/articles/my-first-article')
+ ->assertSee('articles/my-first-article/social.png')
+ ->assertDontSee('images/laravelio-share.png');
+});
+
+test('default share image is used on non article pages', function () {
+ $this->get('/')
+ ->assertSee('images/laravelio-share.png')
+ ->assertDontSee('articles/my-first-article/social.png');
+});
+
+test('user see a tip if they have not set the twitter handle', function () {
+ $this->login(['twitter' => null]);
+
+ $this->get('/articles/authored')
+ ->assertSeeText('X (Twitter) and/or Bluesky handles', '
')
+ ->assertSee('so we can link to your profiles when we tweet out your article.');
+});
+
+test('user see a tip if they have not set the bluesky handle', function () {
+ $this->login(['bluesky' => null]);
+
+ $this->get('/articles/authored')
+ ->assertSeeText('X (Twitter) and/or Bluesky handles', '')
+ ->assertSee('so we can link to your profiles when we tweet out your article.');
+});
+
+test('user do not see tip if they have set the twitter handle', function () {
+ $this->login();
+
+ $this->get('/articles/authored')
+ ->assertDontSeeText('X (Twitter) and/or Bluesky handles', '')
+ ->assertDontSee('so we can link to your profiles when we tweet out your article.');
+});
+
+test('loading page with invalid sort parameter defaults to recent', function () {
+ Article::factory()->create(['slug' => 'my-first-article', 'submitted_at' => now(), 'approved_at' => now()]);
+
+ $expectedHtml = new HtmlString('');
+
+ $this->get('/articles?filter=invalid')
+ ->assertSee($expectedHtml);
+});
+
+test('can filter articles by tag', function () {
+ $articleOne = Article::factory()->create(['title' => 'My First Article', 'slug' => 'my-first-article', 'submitted_at' => now(), 'approved_at' => now()]);
+ $tagOne = Tag::factory()->create(['slug' => 'one']);
+ $articleOne->syncTags([$tagOne->id]);
+
+ $articleTwo = Article::factory()->create(['title' => 'My Second Article', 'slug' => 'my-second-article', 'submitted_at' => now(), 'approved_at' => now()]);
+ $tagTwo = Tag::factory()->create(['slug' => 'two']);
+ $articleTwo->syncTags([$tagTwo->id]);
+
+ $this->get('/articles?tag=one')
+ ->assertSee('My First Article')
+ ->assertDontSee('My Second Article');
+});
+
+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,
+ ]);
+
+ $this->get("/articles/{$article->slug()}")
+ ->assertSee('My First Article')
+ ->assertDontSee('9 views');
+
+ $article->update(['view_count' => 10]);
+
+ $this->get("/articles/{$article->slug()}")
+ ->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 d86cdf4a3..bf0a42266 100644
--- a/tests/Feature/AuthTest.php
+++ b/tests/Feature/AuthTest.php
@@ -1,229 +1,251 @@
withSession(['githubData' => ['id' => 123, 'username' => 'johndoe']])
+ ->post('/register', [
+ 'name' => 'John Doe',
+ 'email' => 'john.doe@example.com',
+ 'username' => 'johndoe',
+ 'rules' => true,
+ 'terms' => true,
+ ]);
+
+ $this->followRedirects($response)
+ ->assertSee('John Doe');
+
+ assertLoggedIn();
+
+ $response->assertSessionMissing('githubData');
+
+ Notification::assertSentTo(Auth::user(), VerifyEmail::class);
+});
+
+test('registration fails when a required field is not filled in', function () {
+ $this->withSession(['githubData' => ['id' => 123]])
+ ->post('/register', [])
+ ->assertInvalid([
+ 'name' => 'The name field is required.',
+ 'email' => 'The email field is required.',
+ 'username' => 'The username field is required.',
+ 'rules' => 'The rules must be accepted.',
+ 'terms' => 'The terms must be accepted.',
+ ]);
+});
+
+test('registration fails with non alpha dash username', function () {
+ $this->withSession(['githubData' => ['id' => 123, 'username' => 'johndoe']])
+ ->post('/register', [
+ 'name' => 'Jogn Doe',
+ 'email' => 'john.doe@example.com',
+ 'username' => 'john foo',
+ 'rules' => true,
+ 'terms' => true,
+ ])
+ ->assertInvalid([
+ 'username' => 'The username must only contain letters, numbers, dashes and underscores.',
+ ]);
+});
+
+test('registration fails with a duplicate github id', function () {
+ User::factory()->create(['github_id' => 123, 'github_username' => 'johndoe']);
+
+ $response = $this->withSession(['githubData' => ['id' => 123, 'username' => 'johndoe']])
+ ->post('/register', [
+ 'name' => 'John Doe',
+ 'email' => 'john.doe@example.com',
+ 'username' => 'johndoe',
+ 'rules' => true,
+ 'terms' => true,
+ ]);
+
+ $this->followRedirects($response)
+ ->assertSee(new HtmlString(
+ 'We already found a user with the given GitHub account (@johndoe). Would you like to login instead?'
+ )
+ );
+});
+
+test('users can resend the email verification', function () {
+ $this->login(['email_verified_at' => null]);
+
+ $this->post('/email/resend')
+ ->assertSessionHas('success', 'Email verification sent to john@example.com. You can change your email address in your profile settings.');
+});
+
+test('users do not need to verify their email address twice', function () {
+ $this->login();
+
+ $response = $this->post('/email/resend');
+
+ $response->assertSessionHas('error', 'Your email address is already verified.');
+
+ $response->assertRedirect();
+});
+
+test('users can login with their username', function () {
+ $this->createUser();
+
+ $this->post('login', [
+ 'username' => 'johndoe',
+ 'password' => 'password',
+ ]);
+
+ $this->assertAuthenticated();
+});
+
+test('users can login with their email address', function () {
+ $this->createUser();
+
+ $this->post('login', [
+ 'username' => 'john@example.com',
+ 'password' => 'password',
+ ]);
+
+ $this->assertAuthenticated();
+});
+
+test('login fails when a required field is not filled in', function () {
+ $this->createUser();
+
+ $response = $this->post('login', []);
+
+ $response->assertInvalid([
+ 'username' => 'The username field is required.',
+ 'password' => 'The password field is required.',
+ ]);
+});
+
+test('login fails when password is incorrect', function () {
+ $this->createUser();
+
+ $response = $this->post('login', [
+ 'username' => 'johndoe',
+ 'password' => 'invalidpass',
+ ]);
+
+ $response->assertInvalid([
+ 'username' => 'These credentials do not match our records.',
+ ]);
+});
+
+test('login fails when user is banned', function () {
+ $user = $this->createUser(['banned_at' => Carbon::now()]);
+
+ $response = $this->actingAs($user)
+ ->post('/login', [
+ 'username' => 'johndoe',
+ 'password' => 'password',
+ ])
+ ->assertRedirect('/');
+
+ $this->followRedirects($response)
+ ->assertSee('This account is banned.');
+});
+
+test('users can logout', function () {
+ $user = $this->login();
+
+ assertLoggedIn();
+
+ $this->actingAs($user)
+ ->post('logout')
+ ->assertRedirect('/');
+
+ assertLoggedOut();
+});
+
+test('users can request a password reset link', function () {
+ $this->createUser();
+
+ $this->post('password/email', [
+ 'email' => 'john@example.com',
+ ])
+ ->assertSessionHas('status', 'We have emailed your password reset link.');
+});
+
+test('users can reset their password', function () {
+ $user = $this->createUser();
+
+ // Insert a password reset token into the database.
+ $token = $this->app[PasswordBroker::class]->getRepository()->create($user);
+
+ $this->post('/password/reset', [
+ 'token' => $token,
+ 'email' => 'john@example.com',
+ 'password' => 'QFq^$cz#P@MZa5z7',
+ 'password_confirmation' => 'QFq^$cz#P@MZa5z7',
+ ])
+ ->assertRedirect();
+
+ $this->actingAs($user)
+ ->post('logout');
+
+ assertLoggedOut();
+
+ $this->post('login', [
+ 'username' => 'johndoe',
+ 'password' => 'QFq^$cz#P@MZa5z7',
+ ]);
+
+ assertLoggedIn();
+});
+
+test('users cannot reset their password when it has been compromised in data leaks', function () {
+ $user = $this->createUser();
+
+ // Insert a password reset token into the database.
+ $token = $this->app[PasswordBroker::class]->getRepository()->create($user);
+
+ // Http::fake([
+ // 'api.pwnedpasswords.com/*' => Http::response('password:3600895'),
+ // ]);
+
+ $response = $this->post('/password/reset', [
+ 'token' => $token,
+ 'email' => 'john@example.com',
+ 'password' => 'password',
+ 'password_confirmation' => 'password',
+ ]);
+
+ $response->assertSessionHasErrors([
+ 'password' => 'The given password has appeared in a data leak. Please choose a different password.',
+ ]);
+});
+
+test('unverified users cannot create threads', function () {
+ $user = $this->login(['email_verified_at' => null]);
+
+ $response = $this->actingAs($user)
+ ->get('/forum/create-thread')
+ ->assertRedirect();
+
+ $this->followRedirects($response)
+ ->assertSee('Before proceeding, please check your email for a verification link.');
+});
+
+// Helpers
+function assertLoggedIn(): void
+{
+ expect(Auth::check())->toBeTrue();
+}
-class AuthTest extends BrowserKitTestCase
+function assertLoggedOut(): void
{
- use DatabaseMigrations;
-
- /** @test */
- public function users_can_register()
- {
- Mail::fake();
-
- session(['githubData' => ['id' => 123, 'username' => 'johndoe']]);
-
- $this->visit('/register')
- ->type('John Doe', 'name')
- ->type('john.doe@example.com', 'email')
- ->type('johndoe', 'username')
- ->type('123', 'github_id')
- ->type('johndoe', 'github_username')
- ->check('rules')
- ->check('terms')
- ->press('Register')
- ->seePageIs('/dashboard')
- ->see('@johndoe');
-
- $this->assertLoggedIn();
-
- Mail::assertSent(EmailConfirmationEmail::class);
- }
-
- /** @test */
- public function registration_fails_when_a_required_field_is_not_filled_in()
- {
- session(['githubData' => ['id' => 123]]);
-
- $this->visit('/register')
- ->press('Register')
- ->seePageIs('/register')
- ->see('The name field is required.')
- ->see('The email field is required.')
- ->see('The username field is required.')
- ->see('The rules must be accepted.');
- }
-
- /** @test */
- public function registration_fails_with_non_alpha_dash_username()
- {
- session(['githubData' => ['id' => 123, 'username' => 'johndoe']]);
-
- $this->visit('/register')
- ->type('John Doe', 'name')
- ->type('john.doe@example.com', 'email')
- ->type('john foo', 'username')
- ->type('123', 'github_id')
- ->type('johndoe', 'github_username')
- ->check('rules')
- ->check('terms')
- ->press('Register')
- ->seePageIs('/register')
- ->see('The username may only contain letters, numbers, dashes and underscores.');
- }
-
- /** @test */
- public function users_can_resend_the_email_confirmation()
- {
- $this->login(['confirmed' => false]);
-
- $this->visit('/email-confirmation')
- ->seePageIs('/dashboard')
- ->see('Email confirmation sent to john@example.com');
- }
-
- /** @test */
- public function users_do_not_need_to_confirm_their_email_address_twice()
- {
- $this->login();
-
- $this->visit('/email-confirmation')
- ->seePageIs('/dashboard')
- ->see('Your email address is already confirmed.');
- }
-
- /** @test */
- public function users_can_confirm_their_email_address()
- {
- $user = $this->createUser(['confirmed' => false, 'confirmation_code' => 'testcode']);
-
- $this->visit('/email-confirmation/john@example.com/testcode')
- ->seePageIs('/')
- ->see('Your email address was successfully confirmed.');
-
- $this->seeInDatabase('users', ['id' => $user->id(), 'confirmed' => true]);
- }
-
- /** @test */
- public function users_get_a_message_when_a_confirmation_code_was_not_found()
- {
- $this->createUser(['confirmed' => false]);
-
- $this->visit('/email-confirmation/john@example.com/testcode')
- ->seePageIs('/')
- ->see('We could not confirm your email address. The given email address and code did not match.');
- }
-
- /** @test */
- public function users_can_login()
- {
- $this->createUser();
-
- $this->visit('/login')
- ->type('johndoe', 'username')
- ->type('password', 'password')
- ->press('Login')
- ->seePageIs('/dashboard')
- ->see('@johndoe');
- }
-
- /** @test */
- public function login_fails_when_a_required_field_is_not_filled_in()
- {
- $this->createUser();
-
- $this->visit('/login')
- ->press('Login')
- ->seePageIs('/login')
- ->see('The username field is required.')
- ->see('The password field is required.');
- }
-
- /** @test */
- public function login_fails_when_password_is_incorrect()
- {
- $this->createUser();
-
- $this->visit('/login')
- ->type('johndoe', 'username')
- ->type('invalidpass', 'password')
- ->press('Login')
- ->seePageIs('/login')
- ->see('These credentials do not match our records.');
- }
-
- /** @test */
- public function login_fails_when_user_is_banned()
- {
- $this->createUser(['banned_at' => Carbon::now()]);
-
- $this->visit('/login')
- ->type('johndoe', 'username')
- ->type('password', 'password')
- ->press('Login')
- ->seePageIs('/')
- ->see('This account is banned.');
- }
-
- /** @test */
- public function users_can_logout()
- {
- $this->login();
-
- $this->assertLoggedIn();
-
- $this->visit('/logout')
- ->seePageIs('/');
-
- $this->assertLoggedOut();
- }
-
- /** @test */
- public function users_can_request_a_password_reset_link()
- {
- $this->createUser();
-
- $this->visit('/password/reset')
- ->type('john@example.com', 'email')
- ->press('Send Password Reset Link')
- ->see('We have e-mailed your password reset link!');
- }
-
- /** @test */
- public function users_can_reset_their_password()
- {
- $user = $this->createUser();
-
- // Insert a password reset token into the database.
- $token = $this->app[PasswordBroker::class]->getRepository()->create($user);
-
- $this->visit('/password/reset/'.$token)
- ->type('john@example.com', 'email')
- ->type('foopassword', 'password')
- ->type('foopassword', 'password_confirmation')
- ->press('Reset Password')
- ->seePageIs('/dashboard')
- ->visit('/logout')
- ->visit('/login')
- ->type('johndoe', 'username')
- ->type('foopassword', 'password')
- ->press('Login')
- ->seePageIs('/dashboard');
- }
-
- /** @test */
- public function unconfirmed_users_cannot_create_threads()
- {
- $this->login(['confirmed' => false]);
-
- $this->visit('/forum/create-thread')
- ->see('Please confirm your email address first.');
- }
-
- private function assertLoggedIn(): void
- {
- $this->assertTrue(Auth::check());
- }
-
- private function assertLoggedOut(): void
- {
- $this->assertFalse(Auth::check());
- }
+ expect(Auth::check())->toBeFalse();
}
diff --git a/tests/Feature/BlockUsersTest.php b/tests/Feature/BlockUsersTest.php
new file mode 100644
index 000000000..7a1ef1fa8
--- /dev/null
+++ b/tests/Feature/BlockUsersTest.php
@@ -0,0 +1,65 @@
+createUser();
+
+ $this->put("/users/{$user->username}/block")->assertRedirect('login');
+});
+
+test('cannot unblock user when not logged in', function () {
+ $user = $this->createUser();
+
+ $this->put("/users/{$user->username}/unblock")->assertRedirect('login');
+});
+
+test('cannot block self', function () {
+ $user = $this->createUser();
+
+ $this->loginAs($user);
+
+ $this->put("/users/{$user->username}/block")->assertForbidden();
+});
+
+test('cannot block moderator', function () {
+ $user = $this->createUser();
+ $moderator = $this->createUser([
+ 'username' => 'moderator',
+ 'email' => 'moderator@example.com',
+ 'type' => User::MODERATOR,
+ ]);
+
+ $this->loginAs($user);
+
+ $this->put("/users/{$moderator->username}/block")->assertForbidden();
+});
+
+test('can block other user', function () {
+ $blocker = $this->createUser();
+ $blocked = $this->createUser([
+ 'username' => 'blocked',
+ 'email' => 'blocked@example.com',
+ ]);
+
+ $this->loginAs($blocker);
+
+ $this->put("/users/{$blocked->username}/block")->assertSessionHas('success', trans('User successfully blocked.'));
+});
+
+test('can unblock other user', function () {
+ $unblocker = $this->createUser();
+ $unblocked = $this->createUser([
+ 'username' => 'unblocked',
+ 'email' => 'unblocked@example.com',
+ ]);
+
+ $this->loginAs($unblocker);
+
+ $this->put("/users/{$unblocked->username}/unblock")->assertSessionHas('success', __('User successfully unblocked.'));
+});
diff --git a/tests/Feature/BrowserKitTestCase.php b/tests/Feature/BrowserKitTestCase.php
deleted file mode 100644
index 4d11727e3..000000000
--- a/tests/Feature/BrowserKitTestCase.php
+++ /dev/null
@@ -1,32 +0,0 @@
-setUpFaker();
- }
-
- return $uses;
- }
-
- protected function dispatch($job)
- {
- return $job->handle();
- }
-}
diff --git a/tests/Feature/CanonicalUrlTest.php b/tests/Feature/CanonicalUrlTest.php
new file mode 100644
index 000000000..d7d8c6421
--- /dev/null
+++ b/tests/Feature/CanonicalUrlTest.php
@@ -0,0 +1,99 @@
+ 'production');
+}
+
+afterEach(fn () => App::detectEnvironment(fn () => 'testing'));
+
+test('pages without a canonical url explicitly set fall back to the current url', function () {
+ $expectedHtml = new HtmlString('
');
+
+ $this->get('/register')
+ ->assertSee($expectedHtml);
+});
+
+test('pages with a canonical url are rendered correctly', function () {
+ $thread = Thread::factory()->create(['subject' => 'The first thread']);
+
+ $expectedHtml = new HtmlString('
');
+
+ $this->get("forum/{$thread->slug()}")
+ ->assertSee($expectedHtml);
+});
+
+test('first page of paginated list removes page=1 from canonical url', function () {
+ $expectedHtml = new HtmlString('
');
+
+ $this->get('forum?page=1')
+ ->assertSee($expectedHtml);
+});
+
+test('subsequent pages of paginated list sets the full url as canonical', function () {
+ $expectedHtml = new HtmlString('
');
+
+ $this->get('forum?page=2')
+ ->assertSee($expectedHtml);
+});
+
+test('allowed params are included in the canonical url', function () {
+ $expectedHtml = new HtmlString('
');
+
+ $this->get('forum?filter=recent&page=1')
+ ->assertSee($expectedHtml);
+});
+
+test('non allowed params are not included in the canonical url', function () {
+ $expectedHtml = new HtmlString('
');
+
+ $this->get('forum?filter=recent&utm_source=twitter&utm_medium=social&utm_term=abc123&page=2')
+ ->assertSee($expectedHtml);
+});
+
+test('query_params_are_always_in_the_same_order', function () {
+ Tag::factory()->create(['name' => 'Laravel', 'slug' => 'laravel']);
+
+ $expectedHtml = new HtmlString('
');
+
+ $this->get('articles?utm_source=twitter&utm_medium=social&utm_term=abc123&filter=trending&page=2&tag=laravel')
+ ->assertSee($expectedHtml);
+});
+
+test('standard pages always remove query params from canonical url', function () {
+ $expectedHtml = new HtmlString('
');
+
+ $this->get('?utm_source=twitter&utm_medium=social&utm_term=abc123')
+ ->assertSee($expectedHtml);
+});
+
+test('canonical tracking is turned off when using external url', function () {
+ Article::factory()->create(['slug' => 'my-first-article', 'submitted_at' => now(), 'approved_at' => now(), 'original_url' => 'https://example.com/external-path']);
+
+ $expectedHtml = new HtmlString('data-canonical="false"');
+
+ $this->get('/articles/my-first-article')
+ ->assertSee($expectedHtml);
+})->inProduction();
+
+test('canonical tracking is turned on when using external url', function () {
+ App::detectEnvironment(fn () => 'production');
+
+ Article::factory()->create(['slug' => 'my-first-article', 'submitted_at' => now(), 'approved_at' => now()]);
+
+ $expectedHtml = new HtmlString('data-canonical="false"');
+
+ $this->get('/articles/my-first-article')
+ ->assertDontSee($expectedHtml);
+})->inProduction();
diff --git a/tests/Feature/DashboardTest.php b/tests/Feature/DashboardTest.php
deleted file mode 100644
index 181071074..000000000
--- a/tests/Feature/DashboardTest.php
+++ /dev/null
@@ -1,192 +0,0 @@
-visit('/dashboard')
- ->seePageIs('/login');
- }
-
- /** @test */
- public function users_can_see_some_statistics()
- {
- $user = $this->createUser();
- $thread = factory(Thread::class, 3)->create(['author_id' => $user->id()])->first();
- $reply = factory(Reply::class, 2)->create([
- 'author_id' => $user->id(),
- 'replyable_id' => $thread->id(),
- ])->first();
-
- $thread->markSolution($reply);
-
- $this->loginAs($user);
-
- $this->visit('/dashboard')
- ->see('3 threads')
- ->see('2 replies')
- ->see('1 solution');
- }
-
- /** @test */
- public function users_can_see_notifications()
- {
- $this->markTestSkipped('Skipped until Livewire v1.0.13 is released.');
-
- $userOne = $this->createUser();
-
- $thread = factory(Thread::class)->create(['author_id' => $userOne->id()]);
- $reply = factory(Reply::class)->create(['replyable_id' => $thread->id()]);
-
- $userOne->notifications()->create([
- 'id' => Str::random(),
- 'type' => NewReplyNotification::class,
- 'data' => [
- 'type' => 'new_reply',
- 'reply' => $reply->id(),
- 'replyable_id' => $reply->replyable_id,
- 'replyable_type' => $reply->replyable_type,
- 'replyable_subject' => $reply->replyAble()->replyAbleSubject(),
- ],
- ]);
-
- $replyAbleRoute = route('replyable', [$reply->replyable_id, $reply->replyable_type]);
-
- $this->loginAs($userOne);
-
- Livewire::test(Notifications::class)
- ->assertSee(new HtmlString(
- "A new reply was added to
\"{$thread->subject()}\"."
- ));
- }
-
- /** @test */
- public function users_can_mark_notifications_as_read()
- {
- $this->markTestSkipped('Skipped until Livewire v1.0.13 is released.');
-
- $userOne = $this->createUser();
-
- $thread = factory(Thread::class)->create(['author_id' => $userOne->id()]);
- $reply = factory(Reply::class)->create(['replyable_id' => $thread->id()]);
-
- $notification = $userOne->notifications()->create([
- 'id' => Str::random(),
- 'type' => NewReplyNotification::class,
- 'data' => [
- 'type' => 'new_reply',
- 'reply' => $reply->id(),
- 'replyable_id' => $reply->replyable_id,
- 'replyable_type' => $reply->replyable_type,
- 'replyable_subject' => $reply->replyAble()->replyAbleSubject(),
- ],
- ]);
-
- $replyAbleRoute = route('replyable', [$reply->replyable_id, $reply->replyable_type]);
-
- $this->loginAs($userOne);
-
- Livewire::test(Notifications::class)
- ->assertSee(new HtmlString(
- "A new reply was added to
\"{$thread->subject()}\"."
- ))
- ->call('markAsRead', $notification->id)
- ->assertDontSee(new HtmlString(
- "A new reply was added to
\"{$thread->subject()}\"."
- ))
- ->assertEmitted('NotificationMarkedAsRead');
- }
-
- /** @test */
- public function a_non_logged_in_user_cannot_access_notifications()
- {
- Livewire::test(Notifications::class)
- ->assertForbidden();
- }
-
- /** @test */
- public function a_user_cannot_mark_other_users_notifications_as_read()
- {
- $userOne = $this->createUser();
- $userTwo = $this->createUser([
- 'name' => 'Jane Doe',
- 'username' => 'janedoe',
- 'email' => 'jane@example.com',
- ]);
-
- $thread = factory(Thread::class)->create(['author_id' => $userOne->id()]);
- $reply = factory(Reply::class)->create([
- 'author_id' => $userTwo->id(),
- 'replyable_id' => $thread->id(),
- ]);
-
- $notification = $userOne->notifications()->create([
- 'id' => Str::random(),
- 'type' => NewReplyNotification::class,
- 'data' => [
- 'type' => 'new_reply',
- 'reply' => $reply->id(),
- 'replyable_id' => $reply->replyable_id,
- 'replyable_type' => $reply->replyable_type,
- 'replyable_subject' => $reply->replyAble()->replyAbleSubject(),
- ],
- ]);
-
- $this->loginAs($userTwo);
-
- Livewire::test(Notifications::class)
- ->call('markAsRead', $notification->id)
- ->assertForbidden();
- }
-
- /** @test */
- public function a_user_sees_the_correct_number_of_notifications()
- {
- $userOne = $this->createUser();
- $userTwo = $this->createUser([
- 'name' => 'Jane Doe',
- 'username' => 'janedoe',
- 'email' => 'jane@example.com',
- ]);
-
- $thread = factory(Thread::class)->create(['author_id' => $userOne->id()]);
- $reply = factory(Reply::class)->create([
- 'author_id' => $userTwo->id(),
- 'replyable_id' => $thread->id(),
- ]);
-
- for ($i = 0; $i < 10; $i++) {
- $userOne->notifications()->create([
- 'id' => Str::random(),
- 'type' => NewReplyNotification::class,
- 'data' => [
- 'type' => 'new_reply',
- 'reply' => $reply->id(),
- 'replyable_id' => $reply->replyable_id,
- 'replyable_type' => $reply->replyable_type,
- 'replyable_subject' => $reply->replyAble()->replyAbleSubject(),
- ],
- ]);
- }
-
- $this->loginAs($userOne);
-
- Livewire::test(NotificationCount::class)
- ->assertSee('10');
- }
-}
diff --git a/tests/Feature/EditorTest.php b/tests/Feature/EditorTest.php
new file mode 100644
index 000000000..5b6c16eab
--- /dev/null
+++ b/tests/Feature/EditorTest.php
@@ -0,0 +1,75 @@
+count(3)->create();
+
+ Livewire::test(Editor::class, ['participants' => $participants, 'hasMentions' => true])
+ ->call('getUsers', '')
+ ->assertSee($participants->first()->username())
+ ->assertSee($participants->get(1)->username())
+ ->assertSee($participants->get(2)->username());
+});
+
+test('users are returned when a query is made for mentions', function () {
+ $userOne = User::factory()->create(['username' => 'joedixon']);
+ $userTwo = User::factory()->create(['username' => 'driesvints']);
+
+ Livewire::test(Editor::class, ['hasMentions' => true])
+ ->call('getUsers', 'jo')
+ ->assertSee($userOne->username())
+ ->assertDontSee($userTwo->username());
+});
+
+test('participants are prioritised over users', function () {
+ $participants = User::factory()
+ ->count(2)
+ ->state(new Sequence(
+ ['username' => 'joedixon'],
+ ['username' => 'driesvints'],
+ ))
+ ->create();
+ User::factory()->create(['username' => 'janedoe']);
+
+ Livewire::test(Editor::class, ['participants' => $participants, 'hasMentions' => true])
+ ->call('getUsers', 'j')
+ ->assertSeeInOrder(['joedixon', 'janedoe']);
+});
+
+test('users are not queried when hasMentions is turned off', function () {
+ $users = User::factory()
+ ->count(2)
+ ->state(new Sequence(
+ ['username' => 'joedixon'],
+ ['username' => 'driesvints'],
+ ))
+ ->create();
+
+ Livewire::test(Editor::class)
+ ->call('getUsers', 'j')
+ ->assertDontSee($users->first()->username());
+});
+
+test('no users are returned when query returns no results', function () {
+ $users = User::factory()
+ ->count(2)
+ ->state(new Sequence(
+ ['username' => 'joedixon'],
+ ['username' => 'driesvints'],
+ ))
+ ->create();
+
+ Livewire::test(Editor::class, ['hasMentions' => true])
+ ->call('getUsers', 'b')
+ ->assertDontSee($users->first()->username())
+ ->assertDontSee($users->get(1)->username());
+});
diff --git a/tests/Feature/ForumTest.php b/tests/Feature/ForumTest.php
index c14243fa3..5e9c20aee 100644
--- a/tests/Feature/ForumTest.php
+++ b/tests/Feature/ForumTest.php
@@ -1,225 +1,368 @@
create(['subject' => 'The first thread']);
+ Thread::factory()->create(['subject' => 'The second thread']);
+
+ $this->get('/forum')
+ ->assertSee('The first thread')
+ ->assertSee('The second thread');
+});
+
+test('users can see when a thread is resolved', function () {
+ Thread::factory()->create(['subject' => 'The first thread']);
+ $thread = Thread::factory()->create(['subject' => 'The second thread']);
+ $reply = Reply::factory()->create();
+ $thread->solutionReplyRelation()->associate($reply)->save();
+
+ $this->get('/forum')
+ ->assertSee('The first thread')
+ ->assertSee('The second thread')
+ ->assertSee('Resolved')
+ ->assertSee(route('thread', $thread->slug()).'#'.$thread->solution_reply_id);
+});
+
+test('users can see a single thread', function () {
+ Thread::factory()->create([
+ 'subject' => 'The first thread',
+ 'slug' => 'the-first-thread',
+ ]);
+
+ $this->get('/forum/the-first-thread')
+ ->assertSee('The first thread');
+});
+
+test('users cannot create a thread when not logged in', function () {
+ $this->get('/forum/create-thread')
+ ->assertRedirect('/login');
+});
+
+test('the thread subject cannot be an url', function () {
+ $tag = Tag::factory()->create(['name' => 'Test Tag']);
+
+ $this->login();
-class ForumTest extends BrowserKitTestCase
-{
- use DatabaseMigrations;
-
- /** @test */
- public function users_can_see_a_list_of_latest_threads()
- {
- factory(Thread::class)->create(['subject' => 'The first thread']);
- factory(Thread::class)->create(['subject' => 'The second thread']);
-
- $this->visit('/forum')
- ->see('The first thread')
- ->see('The second thread');
- }
-
- /** @test */
- public function users_can_see_when_a_thread_is_resolved()
- {
- factory(Thread::class)->create(['subject' => 'The first thread']);
- $thread = factory(Thread::class)->create(['subject' => 'The second thread']);
- $reply = factory(Reply::class)->create();
- $thread->solutionReplyRelation()->associate($reply)->save();
-
- $this->visit('/forum')
- ->see('The first thread')
- ->see('The second thread')
- ->see('View solution')
- ->click('View solution')
- ->seeRouteIs('thread', ['thread' => $thread->slug()]);
- }
-
- /** @test */
- public function users_can_see_a_single_thread()
- {
- factory(Thread::class)->create([
- 'subject' => 'The first thread',
- 'slug' => 'the-first-thread',
- ]);
-
- $this->visit('/forum/the-first-thread')
- ->see('The first thread');
- }
-
- /** @test */
- public function users_cannot_create_a_thread_when_not_logged_in()
- {
- $this->visit('/forum/create-thread')
- ->seePageIs('/login');
- }
-
- /** @test */
- public function the_thread_subject_cannot_be_an_url()
- {
- $tag = factory(Tag::class)->create(['name' => 'Test Tag']);
-
- $this->login();
-
- $this->post('/forum/create-thread', [
- 'subject' => 'http://example.com Foo title',
- 'body' => 'This text explains how to work with Eloquent.',
- 'tags' => [$tag->id()],
- ])
- ->assertSessionHasErrors(['subject' => 'The subject field cannot contain an url.']);
- }
-
- /** @test */
- public function users_can_create_a_thread()
- {
- $tag = factory(Tag::class)->create(['name' => 'Test Tag']);
-
- $this->login();
-
- $this->post('/forum/create-thread', [
- 'subject' => 'How to work with Eloquent?',
- 'body' => 'This text explains how to work with Eloquent.',
- 'tags' => [$tag->id()],
- ])
- ->assertRedirectedTo('/forum/how-to-work-with-eloquent')
- ->assertSessionHas('success', 'Thread successfully created!');
- }
-
- /** @test */
- public function users_can_edit_a_thread()
- {
- $user = $this->createUser();
- $tag = factory(Tag::class)->create(['name' => 'Test Tag']);
- factory(Thread::class)->create([
- 'author_id' => $user->id(),
- 'slug' => 'my-first-thread',
- ]);
-
- $this->loginAs($user);
-
- $this->put('/forum/my-first-thread', [
- 'subject' => 'How to work with Eloquent?',
- 'body' => 'This text explains how to work with Eloquent.',
- 'tags' => [$tag->id()],
- ])
- ->assertRedirectedTo('/forum/how-to-work-with-eloquent')
- ->assertSessionHas('success', 'Thread successfully updated!');
- }
-
- /** @test */
- public function users_cannot_edit_a_thread_they_do_not_own()
- {
- factory(Thread::class)->create(['slug' => 'my-first-thread']);
+ $this->post('/forum/create-thread', [
+ 'subject' => 'http://example.com Foo title',
+ 'body' => 'This text explains how to work with Eloquent.',
+ 'tags' => [$tag->id()],
+ ])
+ ->assertSessionHasErrors(['subject' => 'The subject field cannot contain an url.']);
+});
- $this->login();
+test('users can create a thread', function () {
+ $tag = Tag::factory()->create(['name' => 'Test Tag']);
- $this->get('/forum/my-first-thread/edit')
- ->assertForbidden();
- }
+ $this->login();
+
+ $this->post('/forum/create-thread', [
+ 'subject' => 'How to work with Eloquent?',
+ 'body' => 'This text explains how to work with Eloquent.',
+ 'tags' => [$tag->id()],
+ ])
+ ->assertRedirect('/forum/how-to-work-with-eloquent')
+ ->assertSessionHas('success', 'Thread successfully created!');
+});
+
+test('users cannot create more than 5 threads per day', function () {
+ $tag = Tag::factory()->create(['name' => 'Test Tag']);
+
+ $user = $this->login();
+
+ Thread::factory()->count(5)->create(['author_id' => $user->id(), 'created_at' => now()]);
+
+ $this->post('/forum/create-thread', [
+ 'subject' => 'How to work with Eloquent?',
+ 'body' => 'This text explains how to work with Eloquent.',
+ 'tags' => [$tag->id()],
+ ])
+ ->assertRedirect('/forum')
+ ->assertSessionHas('error', 'You can only post a maximum of 5 threads per day.');
+});
+
+test('users can edit a thread', function () {
+ $user = $this->createUser();
+ $tag = Tag::factory()->create(['name' => 'Test Tag']);
+ Thread::factory()->create([
+ 'author_id' => $user->id(),
+ 'slug' => 'my-first-thread',
+ ]);
+
+ $this->loginAs($user);
+
+ $this->put('/forum/my-first-thread', [
+ 'subject' => 'How to work with Eloquent?',
+ 'body' => 'This text explains how to work with Eloquent.',
+ 'tags' => [$tag->id()],
+ ])
+ ->assertRedirect('/forum/how-to-work-with-eloquent')
+ ->assertSessionHas('success', 'Thread successfully updated!');
+});
+
+test('users cannot edit a thread they do not own', function () {
+ Thread::factory()->create(['slug' => 'my-first-thread']);
+
+ $this->login();
+
+ $this->get('/forum/my-first-thread/edit')
+ ->assertForbidden();
+});
+
+test('users can delete their own thread', function () {
+ $thread = Thread::factory()->create(['slug' => 'my-first-thread']);
+
+ $this->loginAs($thread->author());
+
+ $this->delete('/forum/my-first-thread')
+ ->assertRedirect('/forum')
+ ->assertSessionHas('success', 'Thread successfully deleted!');
+});
+
+test('users cannot delete a thread they do not own', function () {
+ Thread::factory()->create(['slug' => 'my-first-thread']);
+
+ $this->login();
+
+ $this->delete('/forum/my-first-thread')
+ ->assertForbidden();
+});
+
+test('moderators can give a reason when deleting threads', function () {
+ $thread = Thread::factory()->create(['slug' => 'my-first-thread']);
+ $moderator = User::factory()->moderator()->create();
+
+ $this->loginAs($moderator);
+
+ Notification::fake();
+
+ $this->delete('/forum/my-first-thread', ['reason' => 'Please do not spam.'])
+ ->assertRedirect('/forum')
+ ->assertSessionHas('success', 'Thread successfully deleted!');
+
+ Notification::assertSentTo($thread->author(), ThreadDeletedNotification::class);
+});
+
+test('users cannot create a thread with a subject that is too long', function () {
+ $tag = Tag::factory()->create(['name' => 'Test Tag']);
+
+ $this->login();
+
+ $response = $this->post('/forum/create-thread', [
+ 'subject' => 'How to make Eloquent, Doctrine, Entities and Annotations work together in Laravel?',
+ 'body' => 'This is a thread with 82 characters in the subject',
+ 'tags' => [$tag->id()],
+ ]);
+
+ $response->assertSessionHas('error', 'Something went wrong. Please review the fields below.');
+ $response->assertSessionHasErrors(['subject' => 'The subject must not be greater than 60 characters.']);
+});
+
+test('users cannot edit a thread with a subject that is too long', function () {
+ $user = $this->createUser();
+ $tag = Tag::factory()->create(['name' => 'Test Tag']);
+ Thread::factory()->create([
+ 'author_id' => $user->id(),
+ 'slug' => 'my-first-thread',
+ ]);
+
+ $this->loginAs($user);
+
+ $response = $this->put('/forum/my-first-thread', [
+ 'subject' => 'How to make Eloquent, Doctrine, Entities and Annotations work together in Laravel?',
+ 'body' => 'This is a thread with 82 characters in the subject',
+ 'tags' => [$tag->id()],
+ ]);
+
+ $response->assertSessionHas('error', 'Something went wrong. Please review the fields below.');
+ $response->assertSessionHasErrors(['subject' => 'The subject must not be greater than 60 characters.']);
+});
+
+test('a user can toggle a like on a thread', function () {
+ $this->login();
+
+ $thread = Thread::factory()->create();
+
+ Livewire::test(LikeThread::class, ['thread' => $thread])
+ ->assertSee("0\n")
+ ->call('toggleLike')
+ ->assertSee("1\n")
+ ->call('toggleLike')
+ ->assertSee("0\n");
+});
+
+test('a logged out user cannot toggle a like on a thread', function () {
+ $thread = Thread::factory()->create();
+
+ Livewire::test(LikeThread::class, ['thread' => $thread])
+ ->assertSee("0\n")
+ ->call('toggleLike')
+ ->assertSee("0\n");
+});
- /** @test */
- public function users_cannot_delete_a_thread_they_do_not_own()
- {
- factory(Thread::class)->create(['slug' => 'my-first-thread']);
-
- $this->login();
-
- $this->delete('/forum/my-first-thread')
- ->assertForbidden();
- }
-
- /** @test */
- public function users_cannot_create_a_thread_with_a_subject_that_is_too_long()
- {
- $tag = factory(Tag::class)->create(['name' => 'Test Tag']);
-
- $this->login();
-
- $response = $this->post('/forum/create-thread', [
- 'subject' => 'How to make Eloquent, Doctrine, Entities and Annotations work together in Laravel?',
- 'body' => 'This is a thread with 82 characters in the subject',
- 'tags' => [$tag->id()],
+test('a user can toggle a like on a reply', function () {
+ $this->login();
+
+ $reply = Reply::factory()->create();
+
+ Livewire::test(LikeReply::class, ['reply' => $reply])
+ ->assertSee("0\n")
+ ->call('toggleLike')
+ ->assertSee("1\n")
+ ->call('toggleLike')
+ ->assertSee("0\n");
+});
+
+test('a logged out user cannot toggle a like on a reply', function () {
+ $reply = Reply::factory()->create();
+
+ Livewire::test(LikeReply::class, ['reply' => $reply])
+ ->assertSee("0\n")
+ ->call('toggleLike')
+ ->assertSee("0\n");
+});
+
+test('user can see standalone links in reply', function () {
+ $thread = Thread::factory()->create(['slug' => 'the-first-thread']);
+ Reply::factory()->create([
+ 'body' => 'https://github.com/laravelio/laravel.io check this cool project',
+ 'replyable_id' => $thread->id(),
+ ]);
+
+ $this->get("/forum/{$thread->slug}")
+ ->assertSee(new HtmlString(
+ '
https://github.com/laravelio/laravel.io'
+ ));
+});
+
+test('user can see standalone links in thread', function () {
+ $thread = Thread::factory()->create([
+ 'slug' => 'the-first-thread',
+ 'body' => 'https://github.com/laravelio/laravel.io check this cool project',
+ ]);
+ Reply::factory()->create(['replyable_id' => $thread->id()]);
+
+ $this->get("/forum/{$thread->slug()}")
+ ->assertSee(new HtmlString('"<p><a rel=\"nofollow noopener noreferrer\" target=\"_blank\" href=\"https:\/\/github.com\/laravelio\/laravel.io\">https:\/\/github.com\/laravelio\/laravel.io<\/a>'));
+});
+
+test('an invalid filter defaults to the most recent threads', function () {
+ Thread::factory()->create(['subject' => 'The first thread']);
+ Thread::factory()->create(['subject' => 'The second thread']);
+
+ $this->get('/forum?filter=something-invalid')
+ ->assertSeeInOrder([
+ new HtmlString('href="http://localhost/forum?filter=recent"'),
+ new HtmlString('aria-current="page"'),
]);
- $response->assertSessionHas('error', 'Something went wrong. Please review the fields below.');
- $response->assertSessionHasErrors(['subject' => 'The subject may not be greater than 60 characters.']);
- }
-
- /** @test */
- public function users_cannot_edit_a_thread_with_a_subject_that_is_too_long()
- {
- $user = $this->createUser();
- $tag = factory(Tag::class)->create(['name' => 'Test Tag']);
- factory(Thread::class)->create([
- 'author_id' => $user->id(),
- 'slug' => 'my-first-thread',
- ]);
+});
- $this->loginAs($user);
+test('an invalid filter on tag view defaults to the most recent threads', function () {
+ $tag = Tag::factory()->create();
- $response = $this->put('/forum/my-first-thread', [
- 'subject' => 'How to make Eloquent, Doctrine, Entities and Annotations work together in Laravel?',
- 'body' => 'This is a thread with 82 characters in the subject',
- 'tags' => [$tag->id()],
+ $this->get("/forum/tags/{$tag->slug}?filter=something-invalid")
+ ->assertSeeInOrder([
+ new HtmlString('href="http://localhost/forum/tags/'.$tag->slug.'?filter=recent'),
+ new HtmlString('aria-current="page"'),
]);
- $response->assertSessionHas('error', 'Something went wrong. Please review the fields below.');
- $response->assertSessionHasErrors(['subject' => 'The subject may not be greater than 60 characters.']);
- }
-
- /** @test */
- public function a_user_can_toggle_a_like_on_a_thread()
- {
- $this->login();
- $thread = factory(Thread::class)->create();
-
- Livewire::test(LikeThread::class, ['thread' => $thread])
- ->assertSee("0\n")
- ->call('toggleLike')
- ->assertSee("1\n")
- ->call('toggleLike')
- ->assertSee("0\n");
- }
-
- /** @test */
- public function a_logged_out_user_cannot_toggle_a_like_on_a_thread()
- {
- $thread = factory(Thread::class)->create();
-
- Livewire::test(LikeThread::class, ['thread' => $thread])
- ->assertSee("0\n")
- ->call('toggleLike')
- ->assertSee("0\n");
- }
-
- /** @test */
- public function a_user_can_toggle_a_like_on_a_reply()
- {
- $this->login();
- $reply = factory(Reply::class)->create();
-
- Livewire::test(LikeReply::class, ['reply' => $reply])
- ->assertSee("0\n")
- ->call('toggleLike')
- ->assertSee("1\n")
- ->call('toggleLike')
- ->assertSee("0\n");
- }
-
- /** @test */
- public function a_logged_out_user_cannot_toggle_a_like_on_a_reply()
- {
- $reply = factory(Reply::class)->create();
-
- Livewire::test(LikeReply::class, ['reply' => $reply])
- ->assertSee("0\n")
- ->call('toggleLike')
- ->assertSee("0\n");
- }
-}
+});
+
+test('thread activity is set when a new thread is created', function () {
+ $this->login();
+
+ $this->post('/forum/create-thread', [
+ 'subject' => 'How to work with Eloquent?',
+ 'body' => 'This text explains how to work with Eloquent.',
+ 'tags' => [],
+ ]);
+
+ $this->assertNotNull(Thread::latest('id')->first()->last_activity_at);
+});
+
+test('users are notified by email when mentioned in a thread body', function () {
+ Notification::fake();
+ $user = User::factory()->create(['username' => 'janedoe', 'email' => 'janedoe@example.com']);
+
+ $this->login();
+
+ $this->post('/forum/create-thread', [
+ 'subject' => 'How to work with Eloquent?',
+ 'body' => 'Hey @janedoe',
+ 'tags' => [],
+ ]);
+
+ Notification::assertSentTo($user, MentionNotification::class, function ($notification) use ($user) {
+ return $notification->toMail($user) instanceof MentionEmail;
+ });
+});
+
+test('users provided with a UI notification when mentioned in a thread body', function () {
+ $user = User::factory()->create(['username' => 'janedoe']);
+
+ $this->login();
+
+ $this->post('/forum/create-thread', [
+ 'subject' => 'How to work with Eloquent?',
+ 'body' => 'Hey @janedoe',
+ 'tags' => [],
+ ]);
+
+ $notification = DatabaseNotification::first();
+ $this->assertSame($user->id, (int) $notification->notifiable_id);
+ $this->assertSame('users', $notification->notifiable_type);
+ $this->assertSame('mention', $notification->data['type']);
+ $this->assertSame('How to work with Eloquent?', $notification->data['replyable_subject']);
+});
+
+test('users are not notified when mentioned in and edited thread', function () {
+ Notification::fake();
+ $user = $this->createUser();
+ $tag = Tag::factory()->create(['name' => 'Test Tag']);
+ Thread::factory()->create([
+ 'author_id' => $user->id(),
+ 'slug' => 'my-first-thread',
+ ]);
+
+ $this->loginAs($user);
+
+ $this->put('/forum/my-first-thread', [
+ 'subject' => 'How to work with Eloquent?',
+ 'body' => 'This text explains how to work with Eloquent.',
+ 'tags' => [$tag->id()],
+ ]);
+
+ Notification::assertNothingSent();
+});
+
+test('cannot fake a mention', function () {
+ $this->login();
+
+ $response = $this->post('/forum/create-thread', [
+ 'subject' => 'How to work with Eloquent?',
+ 'body' => 'Hey [@joedixon](https://somethingnasty.com)',
+ 'tags' => [],
+ ]);
+
+ $response->assertSessionHas('error', 'Something went wrong. Please review the fields below.');
+ $response->assertSessionHasErrors(['body' => 'The body field contains an invalid mention.']);
+});
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 dd25a51e3..ddf0aedbd 100644
--- a/tests/Feature/HomeTest.php
+++ b/tests/Feature/HomeTest.php
@@ -1,39 +1,30 @@
get('/')
+ ->assertSee('Laravel.io')
+ ->assertSee('The Laravel Community Portal');
+});
- /** @test */
- public function users_can_see_the_homepage()
- {
- $this->visit('/')
- ->see('Laravel.io')
- ->see('The Laravel Community Portal');
- }
+test('users can see a login and registration link when logged out', function () {
+ $this->get('/')
+ ->assertSeeText('Login', '
')
+ ->assertSeeText('Register', '')
+ ->assertDontSee('Sign out');
+});
- /** @test */
- public function users_can_see_a_login_and_registration_link_when_logged_out()
- {
- $this->visit('/')
- ->seeLink('Login')
- ->seeLink('Register')
- ->dontSeeLink('Sign out');
- }
+test('users can see a logout button when logged in', function () {
+ $this->login();
- /** @test */
- public function users_can_see_a_logout_button_when_logged_in()
- {
- $this->login();
-
- $this->visit('/')
- ->seeLink('Sign out')
- ->dontSeeLink('Login')
- ->dontSeeLink('Register')
- ->seeLink('Dashboard', '/dashboard');
- }
-}
+ $this->get('/')
+ ->assertSee('Sign out')
+ ->assertDontSeeText('Login', '')
+ ->assertDontSeeText('Register', '')
+ ->assertSee('Profile', '/user');
+});
diff --git a/tests/Feature/ModeratorTest.php b/tests/Feature/ModeratorTest.php
index 985395da6..e175f5e0d 100644
--- a/tests/Feature/ModeratorTest.php
+++ b/tests/Feature/ModeratorTest.php
@@ -1,33 +1,26 @@
create();
+test('moderators can edit any thread', function () {
+ $thread = Thread::factory()->create();
- $this->loginAsModerator();
+ $this->loginAsModerator();
- $this->visit('/forum/'.$thread->slug().'/edit')
- ->assertResponseOk();
- }
+ $this->get('/forum/'.$thread->slug().'/edit')
+ ->assertSuccessful();
+});
- /** @test */
- public function moderators_can_delete_any_thread()
- {
- $thread = factory(Thread::class)->create();
+test('moderators can delete any thread', function () {
+ $thread = Thread::factory()->create();
- $this->loginAsModerator();
+ $this->loginAsModerator();
- $this->delete('/forum/'.$thread->slug())
- ->assertRedirectedTo('/forum');
- }
-}
+ $this->delete('/forum/'.$thread->slug())
+ ->assertRedirect('/forum');
+});
diff --git a/tests/Feature/NavigationTest.php b/tests/Feature/NavigationTest.php
index 87ff06b5f..1b1d2dee1 100644
--- a/tests/Feature/NavigationTest.php
+++ b/tests/Feature/NavigationTest.php
@@ -1,55 +1,50 @@
createUser();
- $userTwo = $this->createUser([
- 'name' => 'Jane Doe',
- 'username' => 'janedoe',
- 'email' => 'jane@example.com',
- ]);
-
- $thread = factory(Thread::class)->create(['author_id' => $userOne->id()]);
- $reply = factory(Reply::class)->create([
- 'author_id' => $userTwo->id(),
- 'replyable_id' => $thread->id(),
+use Tests\TestCase;
+
+uses(TestCase::class);
+uses(RefreshDatabase::class);
+
+test('a user sees the correct number of notifications', function () {
+ $userOne = $this->createUser();
+ $userTwo = $this->createUser([
+ 'name' => 'Jane Doe',
+ 'username' => 'janedoe',
+ 'email' => 'jane@example.com',
+ ]);
+
+ $thread = Thread::factory()->create(['author_id' => $userOne->id()]);
+ $reply = Reply::factory()->create([
+ 'author_id' => $userTwo->id(),
+ 'replyable_id' => $thread->id(),
+ ]);
+
+ $this->loginAs($userOne);
+
+ Livewire::test(NotificationIndicator::class)
+ ->assertSee('hidden');
+
+ for ($i = 0; $i < 10; $i++) {
+ $userOne->notifications()->create([
+ 'id' => Str::random(),
+ 'type' => NewReplyNotification::class,
+ 'data' => [
+ 'type' => 'new_reply',
+ 'reply' => $reply->id(),
+ 'replyable_id' => $reply->replyable_id,
+ 'replyable_type' => $reply->replyable_type,
+ 'replyable_subject' => $reply->replyAble()->replyAbleSubject(),
+ ],
]);
-
- $this->loginAs($userOne);
-
- Livewire::test(NotificationIndicator::class)
- ->assertSee('hidden');
-
- for ($i = 0; $i < 10; $i++) {
- $userOne->notifications()->create([
- 'id' => Str::random(),
- 'type' => NewReplyNotification::class,
- 'data' => [
- 'type' => 'new_reply',
- 'reply' => $reply->id(),
- 'replyable_id' => $reply->replyable_id,
- 'replyable_type' => $reply->replyable_type,
- 'replyable_subject' => $reply->replyAble()->replyAbleSubject(),
- ],
- ]);
- }
-
- Livewire::test(NotificationIndicator::class)
- ->assertSee('rounded-full');
}
-}
+
+ Livewire::test(NotificationIndicator::class)
+ ->assertSee('rounded-full');
+});
diff --git a/tests/Feature/NotificationsTest.php b/tests/Feature/NotificationsTest.php
new file mode 100644
index 000000000..792e9f219
--- /dev/null
+++ b/tests/Feature/NotificationsTest.php
@@ -0,0 +1,179 @@
+createUser();
+
+ $thread = Thread::factory()->create(['author_id' => $userOne->id()]);
+ $reply = Reply::factory()->create(['replyable_id' => $thread->id()]);
+
+ $userOne->notifications()->create([
+ 'id' => Str::random(),
+ 'type' => NewReplyNotification::class,
+ 'data' => [
+ 'type' => 'new_reply',
+ 'reply' => $reply->id(),
+ 'replyable_id' => $reply->replyable_id,
+ 'replyable_type' => $reply->replyable_type,
+ 'replyable_subject' => $reply->replyAble()->replyAbleSubject(),
+ ],
+ ]);
+
+ $replyAbleRoute = route('replyable', [$reply->replyable_id, $reply->replyable_type]);
+
+ $this->loginAs($userOne);
+
+ Livewire::test(UserNotifications::class)
+ ->assertSee(new HtmlString(
+ "A new reply was added to \"{$thread->subject()}\".",
+ ));
+});
+
+test('users_can_mark_notifications_as_read', function () {
+ $userOne = $this->createUser();
+
+ $thread = Thread::factory()->create(['author_id' => $userOne->id()]);
+ $reply = Reply::factory()->create(['replyable_id' => $thread->id()]);
+
+ $notification = $userOne->notifications()->create([
+ 'id' => Str::random(),
+ 'type' => NewReplyNotification::class,
+ 'data' => [
+ 'type' => 'new_reply',
+ 'reply' => $reply->id(),
+ 'replyable_id' => $reply->replyable_id,
+ 'replyable_type' => $reply->replyable_type,
+ 'replyable_subject' => $reply->replyAble()->replyAbleSubject(),
+ ],
+ ]);
+
+ $replyAbleRoute = route('replyable', [$reply->replyable_id, $reply->replyable_type]);
+
+ $this->loginAs($userOne);
+
+ Livewire::test(UserNotifications::class)
+ ->assertSee(new HtmlString(
+ "A new reply was added to
\"{$thread->subject()}\".",
+ ))
+ ->call('markAsRead', $notification->id)
+ ->assertDontSee(new HtmlString(
+ "A new reply was added to
\"{$thread->subject()}\".",
+ ))
+ ->assertDispatched('NotificationMarkedAsRead');
+});
+
+test('a_non_logged_in_user_cannot_access_notifications', function () {
+ Livewire::test(UserNotifications::class)->assertForbidden();
+});
+
+test('a_user_cannot_mark_other_users_notifications_as_read', function () {
+ $userOne = $this->createUser();
+ $userTwo = $this->createUser([
+ 'name' => 'Jane Doe',
+ 'username' => 'janedoe',
+ 'email' => 'jane@example.com',
+ ]);
+
+ $thread = Thread::factory()->create(['author_id' => $userOne->id()]);
+ $reply = Reply::factory()->create([
+ 'author_id' => $userTwo->id(),
+ 'replyable_id' => $thread->id(),
+ ]);
+
+ $notification = $userOne->notifications()->create([
+ 'id' => Str::random(),
+ 'type' => NewReplyNotification::class,
+ 'data' => [
+ 'type' => 'new_reply',
+ 'reply' => $reply->id(),
+ 'replyable_id' => $reply->replyable_id,
+ 'replyable_type' => $reply->replyable_type,
+ 'replyable_subject' => $reply->replyAble()->replyAbleSubject(),
+ ],
+ ]);
+
+ $this->loginAs($userTwo);
+
+ Livewire::test(UserNotifications::class)
+ ->call('markAsRead', $notification->id)
+ ->assertForbidden();
+});
+
+test('a_user_sees_the_correct_number_of_notifications', function () {
+ $userOne = $this->createUser();
+ $userTwo = $this->createUser([
+ 'name' => 'Jane Doe',
+ 'username' => 'janedoe',
+ 'email' => 'jane@example.com',
+ ]);
+
+ $thread = Thread::factory()->create(['author_id' => $userOne->id()]);
+ $reply = Reply::factory()->create([
+ 'author_id' => $userTwo->id(),
+ 'replyable_id' => $thread->id(),
+ ]);
+
+ for ($i = 0; $i < 10; $i++) {
+ $userOne->notifications()->create([
+ 'id' => Str::random(),
+ 'type' => NewReplyNotification::class,
+ 'data' => [
+ 'type' => 'new_reply',
+ 'reply' => $reply->id(),
+ 'replyable_id' => $reply->replyable_id,
+ 'replyable_type' => $reply->replyable_type,
+ 'replyable_subject' => $reply->replyAble()->replyAbleSubject(),
+ ],
+ ]);
+ }
+
+ $this->loginAs($userOne);
+
+ Livewire::test(UserNotifications::class)
+ ->assertSee('10');
+});
+
+test('users_can_clear_all_notifications', function () {
+ $userOne = $this->createUser();
+
+ $thread = Thread::factory()->create(['author_id' => $userOne->id()]);
+ $reply = Reply::factory()->create(['replyable_id' => $thread->id()]);
+
+ $userOne->notifications()->create([
+ 'id' => Str::random(),
+ 'type' => NewReplyNotification::class,
+ 'data' => [
+ 'type' => 'new_reply',
+ 'reply' => $reply->id(),
+ 'replyable_id' => $reply->replyable_id,
+ 'replyable_type' => $reply->replyable_type,
+ 'replyable_subject' => $reply->replyAble()->replyAbleSubject(),
+ ],
+ ]);
+
+ $this->loginAs($userOne);
+
+ Livewire::test(UserNotifications::class)
+ ->assertSee('Clear All')
+ ->assertViewHas('notificationCount', 1);
+
+ post('/notifications/mark-as-read');
+
+ Livewire::test(UserNotifications::class)
+ ->assertDontSee('Clear All')
+ ->assertViewHas('notificationCount', 0);
+});
diff --git a/tests/Feature/PastebinRedirectTest.php b/tests/Feature/PastebinRedirectTest.php
index 4af9e2e07..d98d588ff 100644
--- a/tests/Feature/PastebinRedirectTest.php
+++ b/tests/Feature/PastebinRedirectTest.php
@@ -1,22 +1,15 @@
get('/bin')
- ->assertRedirect('https://paste.laravel.io/');
- }
+uses(TestCase::class);
+
+it('redirects to the paste bin website when accessing the old url', function () {
+ $this->get('/bin')
+ ->assertRedirect('https://paste.laravel.io/');
+});
- /** @test */
- public function it_redirects_to_the_paste_bin_website_when_accessing_a_hash()
- {
- $this->get('/bin/some-hash')
- ->assertRedirect('https://paste.laravel.io/some-hash');
- }
-}
+it('redirects to the paste bin website when accessing a hash', function () {
+ $this->get('/bin/some-hash')
+ ->assertRedirect('https://paste.laravel.io/some-hash');
+});
diff --git a/tests/Feature/ProfileTest.php b/tests/Feature/ProfileTest.php
index 1ef423383..1474ae723 100644
--- a/tests/Feature/ProfileTest.php
+++ b/tests/Feature/ProfileTest.php
@@ -1,69 +1,41 @@
createUser();
- /** @test */
- public function anyone_can_see_a_user_profile()
- {
- $this->createUser();
+ $this->get('/user/johndoe')
+ ->assertSee('John Doe');
+});
- $this->visit('/user/johndoe')
- ->see('John Doe');
- }
+test('admin buttons are not shown to logged out users', function () {
+ $this->createUser();
- /** @test */
- public function admin_buttons_are_not_shown_to_logged_out_users()
- {
- $this->createUser();
+ $this->get('/user/johndoe')
+ ->assertDontSee('Ban user')
+ ->assertDontSee('Unban user');
+});
- $this->visit('/user/johndoe')
- ->dontSee('Ban user')
- ->dontSee('Unban user')
- ->dontSee('Delete user');
- }
+test('admin buttons are not shown to non admin users', function () {
+ $this->login();
- /** @test */
- public function admin_buttons_are_not_shown_to_non_admin_users()
- {
- $this->login();
+ $this->get('/user/johndoe')
+ ->assertDontSee('Ban user')
+ ->assertDontSee('Unban user');
+});
- $this->visit('/user/johndoe')
- ->dontSee('Ban user')
- ->dontSee('Unban user')
- ->dontSee('Delete user');
- }
+test('admin buttons are shown to admin users', function () {
+ $this->createUser([
+ 'username' => 'janedoe',
+ 'email' => 'jane@example.com',
+ ]);
+ $this->loginAsAdmin();
- /** @test */
- public function admin_buttons_are_shown_to_admin_users()
- {
- $this->createUser([
- 'username' => 'janedoe',
- 'email' => 'jane@example.com',
- ]);
- $this->loginAsAdmin();
-
- $this->visit('/user/janedoe')
- ->see('Ban user')
- ->see('Delete user');
- }
-
- /** @test */
- public function delete_button_is_not_shown_to_moderators()
- {
- $this->createUser([
- 'username' => 'janedoe',
- 'email' => 'jane@example.com',
- ]);
- $this->loginAsModerator();
-
- $this->visit('/user/janedoe')
- ->see('Ban user')
- ->dontSee('Delete user');
- }
-}
+ $this->get('/user/janedoe')
+ ->assertSee('Ban User');
+});
diff --git a/tests/Feature/ReplyTest.php b/tests/Feature/ReplyTest.php
index 5dbef93a9..075c3c04e 100644
--- a/tests/Feature/ReplyTest.php
+++ b/tests/Feature/ReplyTest.php
@@ -1,118 +1,261 @@
create(['subject' => 'The first thread', 'slug' => 'the-first-thread']);
-
- $this->login();
-
- $this->post('/replies', [
- 'body' => 'The first reply',
- 'replyable_id' => $thread->id,
- 'replyable_type' => Thread::TABLE,
- ])
- ->assertSessionHas('success', 'Reply successfully added!');
- }
+use App\Models\User;
+use App\Notifications\MentionNotification;
+use App\Rules\InvalidMentionRule;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Notifications\DatabaseNotification;
+use Illuminate\Support\Facades\Notification;
+use Illuminate\Support\HtmlString;
+use Livewire\Livewire;
+use Tests\TestCase;
- /** @test */
- public function users_can_edit_a_reply()
- {
- $user = $this->createUser();
- $thread = factory(Thread::class)->create(['slug' => 'the-first-thread']);
- factory(Reply::class)->create(['author_id' => $user->id(), 'replyable_id' => $thread->id()]);
+uses(TestCase::class);
+uses(RefreshDatabase::class);
- $this->loginAs($user);
+test('users can add a reply to a thread', function () {
+ $thread = Thread::factory()->create(['subject' => 'The first thread', 'slug' => 'the-first-thread']);
- $this->put('/replies/1', [
- 'body' => 'The edited reply',
- ])
- ->assertRedirectedTo('/forum/the-first-thread')
- ->assertSessionHas('success', 'Reply successfully updated!');
- }
+ $this->login();
- /** @test */
- public function users_cannot_edit_a_reply_they_do_not_own()
- {
- factory(Reply::class)->create();
+ $this->post('/replies', [
+ 'body' => 'The first reply',
+ 'replyable_id' => $thread->id,
+ 'replyable_type' => Thread::TABLE,
+ ])
+ ->assertSessionHas('success', 'Reply successfully added!');
+});
- $this->login();
+test('edit reply component is present on the page', function () {
+ $user = $this->createUser();
+ $thread = Thread::factory()->create(['slug' => 'the-first-thread']);
+ Reply::factory()->create(['author_id' => $user->id(), 'replyable_id' => $thread->id()]);
- $this->get('/replies/1/edit')
- ->assertForbidden();
- }
+ $this->loginAs($user);
- /** @test */
- public function users_cannot_delete_a_reply_they_do_not_own()
- {
- factory(Reply::class)->create();
+ $this->get("/forum/{$thread->slug()}")
+ ->assertSee('Update reply');
+});
- $this->login();
+test('edit reply component is not present on the page when not owned by user', function () {
+ $thread = Thread::factory()->create(['slug' => 'the-first-thread']);
+ Reply::factory()->create(['replyable_id' => $thread->id()]);
- $this->delete('/replies/1')
- ->assertForbidden();
- }
+ $this->login();
- /** @test */
- public function users_cannot_mark_a_reply_as_the_solution_of_the_thread_if_they_do_not_own_the_thread()
- {
- $user = factory(User::class)->create();
- $thread = factory(Thread::class)->create(['author_id' => $user->id(), 'slug' => 'the-first-thread']);
- $reply = factory(Reply::class)->create(['replyable_id' => $thread->id()]);
+ $this->get("/forum/{$thread->slug()}")
+ ->assertDontSee('Update reply');
+});
- $this->login();
+test('users can edit a reply', function () {
+ $user = $this->createUser();
+ $thread = Thread::factory()->create(['slug' => 'the-first-thread']);
+ $reply = Reply::factory()->create(['author_id' => $user->id(), 'replyable_id' => $thread->id()]);
- $this->put('/forum/the-first-thread/mark-solution/'.$reply->id())
- ->assertForbidden();
- }
+ $this->actingAs($user);
- /** @test */
- public function users_cannot_reply_to_a_thread_if_the_last_reply_is_older_than_six_months()
- {
- $thread = factory(Thread::class)->states('old')->create();
+ Livewire::test(EditReply::class, ['reply' => $reply])
+ ->call('updateReply', 'Hope this helps!');
- $this->login();
+ $this->assertSame('Hope this helps!', $reply->fresh()->body());
+});
- $this->visit("/forum/{$thread->slug}")
- ->dontSee('value="Reply"')
- ->seeText(
- 'The last reply to this thread was more than six months ago. Please consider opening a new thread if you have a similar question.'
- );
- }
+test('users cannot edit a reply they do not own', function () {
+ $reply = Reply::factory()->create();
- /** @test */
- public function confirmed_users_can_see_the_reply_input()
- {
- $thread = factory(Thread::class)->create();
+ $this->login();
- $this->login(['confirmed' => true]);
+ Livewire::test(EditReply::class, ['reply' => $reply])
+ ->call('updateReply', 'Hope this helps!')
+ ->assertForbidden();
+});
- $this->visit("/forum/{$thread->slug}")
- ->see('name="body"');
- }
+test('users cannot delete a reply they do not own', function () {
+ $reply = Reply::factory()->create();
+
+ $this->login();
+
+ $this->delete("/replies/{$reply->id}")
+ ->assertForbidden();
+});
+
+test('users cannot mark a reply as the solution of the thread if they do not own the thread', function () {
+ $user = User::factory()->create();
+ $thread = Thread::factory()->create(['author_id' => $user->id(), 'slug' => 'the-first-thread']);
+ $reply = Reply::factory()->create(['replyable_id' => $thread->id()]);
+
+ $this->login();
+
+ $this->put('/forum/the-first-thread/mark-solution/'.$reply->id())
+ ->assertForbidden();
+});
+
+test('users cannot see the option to reply if the latest activity is older than six months', function () {
+ $thread = Thread::factory()->old()->create();
+
+ $this->login();
+
+ $this->get("/forum/{$thread->slug}")
+ ->assertDontSee('value="Reply"')
+ ->assertSeeText(
+ 'The last reply to this thread was more than six months ago. Please consider opening a new thread if you have a similar question.',
+ );
+});
+
+test('users cannot reply to a thread if the latest activity is older than six months', function () {
+ $thread = Thread::factory()->old()->create();
+
+ $this->login();
+
+ $this->post('/replies', [
+ 'body' => 'The first reply',
+ 'replyable_id' => $thread->id,
+ 'replyable_type' => Thread::TABLE,
+ ])->assertForbidden();
+});
+
+test('verified users can see the reply input', function () {
+ $thread = Thread::factory()->create();
+
+ $this->login();
+
+ $this->get("/forum/{$thread->slug}")
+ ->assertSee(new HtmlString(
+ 'name="body"'
+ ));
+});
+
+test('unverified users cannot see the reply input', function () {
+ $thread = Thread::factory()->create();
+
+ $this->login(['email_verified_at' => null]);
+
+ $this->get("/forum/{$thread->slug}")
+ ->assertDontSee(new HtmlString(
+ 'name="body"'
+ ))
+ ->assertSeeText(new HtmlString(
+ 'You\'ll need to verify your account before participating in this thread.'
+ ));
+});
+
+test('replyable activity is updated when reply is created', function () {
+ $thread = Thread::factory()->create(['subject' => 'The first thread', 'slug' => 'the-first-thread']);
+
+ $this->login();
- /** @test */
- public function unconfirmed_users_cannot_see_the_reply_input()
- {
- $thread = factory(Thread::class)->create();
+ $this->post('/replies', [
+ 'body' => 'The first reply',
+ 'replyable_id' => $thread->id,
+ 'replyable_type' => Thread::TABLE,
+ ]);
- $this->login(['confirmed' => false]);
+ $this->assertNotNull($thread->fresh()->last_activity_at);
+});
- $this->visit("/forum/{$thread->slug}")
- ->dontSee('name="body"')
- ->seeText(
- 'You\'ll need to verify your account before participating in this thread.'
- );
+test('replyable updated_at timestamp is not touched when reply is created', function () {
+ $thread = Thread::factory()->create(['subject' => 'The first thread', 'slug' => 'the-first-thread', 'updated_at' => '1970-01-01']);
+
+ $this->login();
+
+ $this->post('/replies', [
+ 'body' => 'The first reply',
+ 'replyable_id' => $thread->id,
+ 'replyable_type' => Thread::TABLE,
+ ]);
+
+ $this->assertSame('1970-01-01', $thread->fresh()->updated_at->format('Y-m-d'));
+});
+
+test('users are notified by email when mentioned in a reply body', function () {
+ Notification::fake();
+ $user = User::factory()->create(['username' => 'janedoe']);
+ $thread = Thread::factory()->create(['subject' => 'The first thread', 'slug' => 'the-first-thread']);
+
+ $this->login();
+
+ $this->post('/replies', [
+ 'body' => 'Hey @janedoe',
+ 'replyable_id' => $thread->id,
+ 'replyable_type' => Thread::TABLE,
+ ]);
+
+ Notification::assertSentTo($user, MentionNotification::class, function ($notification) use ($user) {
+ return $notification->toMail($user) instanceof MentionEmail;
+ });
+});
+
+test('users provided with a UI notification when mentioned in a reply body', function () {
+ $user = User::factory()->create(['username' => 'janedoe']);
+ $thread = Thread::factory()->create(['subject' => 'The first thread', 'slug' => 'the-first-thread']);
+
+ $this->login();
+
+ $this->post('/replies', [
+ 'body' => 'Hey @janedoe',
+ 'replyable_id' => $thread->id,
+ 'replyable_type' => Thread::TABLE,
+ ]);
+
+ $tested = false;
+
+ foreach (DatabaseNotification::all() as $notification) {
+ if ($notification->type === MentionNotification::class) {
+ $this->assertSame($user->id, (int) $notification->notifiable_id);
+ $this->assertSame('users', $notification->notifiable_type);
+ $this->assertSame('mention', $notification->data['type']);
+ $this->assertSame('The first thread', $notification->data['replyable_subject']);
+
+ $tested = true;
+ }
}
-}
+
+ $this->assertTrue($tested);
+});
+
+test('users are not notified when mentioned in an edited reply', function () {
+ Notification::fake();
+
+ $user = $this->createUser();
+ $thread = Thread::factory()->create(['slug' => 'the-first-thread']);
+ Reply::factory()->create(['author_id' => $user->id(), 'replyable_id' => $thread->id()]);
+
+ $this->loginAs($user);
+
+ $this->put('/replies/1', [
+ 'body' => 'The updated reply',
+ ]);
+
+ Notification::assertNothingSent();
+});
+
+test('cannot fake a mention when creating a reply', function () {
+ $thread = Thread::factory()->create(['subject' => 'The first thread', 'slug' => 'the-first-thread']);
+
+ $this->login();
+
+ $response = $this->post('/replies', [
+ 'body' => 'Hey [@joedixon](https://somethingnasty.com)',
+ 'replyable_id' => $thread->id,
+ 'replyable_type' => Thread::TABLE,
+ ]);
+
+ $response->assertSessionHas('error', 'Something went wrong. Please review the fields below.');
+ $response->assertSessionHasErrors(['body' => 'The body field contains an invalid mention.']);
+});
+
+test('users cannot edit a reply with a fake mention', function () {
+ $user = $this->createUser();
+ $thread = Thread::factory()->create(['slug' => 'the-first-thread']);
+ $reply = Reply::factory()->create(['author_id' => $user->id(), 'replyable_id' => $thread->id()]);
+
+ $this->actingAs($user);
+
+ Livewire::test(EditReply::class, ['reply' => $reply])
+ ->call('updateReply', 'Hey [@joedixon](https://somethingnasty.com)')
+ ->assertHasErrors(['body' => InvalidMentionRule::class]);
+});
diff --git a/tests/Feature/SettingsTest.php b/tests/Feature/SettingsTest.php
index dc753d071..72130c384 100644
--- a/tests/Feature/SettingsTest.php
+++ b/tests/Feature/SettingsTest.php
@@ -1,117 +1,281 @@
get('/settings')
+ ->assertRedirect('/login');
+});
+
+test('users can update their profile', function () {
+ $user = $this->login();
+
+ $response = $this->actingAs($user)
+ ->put('/settings', [
+ 'name' => 'Freek Murze',
+ 'email' => 'freek@example.com',
+ 'username' => 'freekmurze',
+ 'twitter' => 'freektwitter',
+ 'bluesky' => 'driesbsky',
+ 'website' => 'https://laravel.io',
+ 'bio' => 'My bio',
+ ])
+ ->assertRedirect('/settings');
+
+ $this->followRedirects($response)
+ ->assertSee('Freek Murze')
+ ->assertSee('freekmurze')
+ ->assertSee('freektwitter')
+ ->assertSee('driesbsky')
+ ->assertSee('Settings successfully saved!')
+ ->assertSee('My bio');
+});
+
+test('users cannot choose duplicate usernames or email addresses', function () {
+ $this->createUser(['email' => 'freek@example.com', 'username' => 'freekmurze']);
+
+ $user = $this->login();
+
+ $response = $this->actingAs($user)
+ ->put('/settings', [
+ 'name' => 'Freek Murze',
+ 'email' => 'freek@example.com',
+ 'username' => 'freekmurze',
+ ])
+ ->assertInvalid([
+ 'username' => 'The username has already been taken.',
+ 'email' => 'The email has already been taken.',
+ ]);
+
+ $this->followRedirects($response)
+ ->assertSee('Something went wrong. Please review the fields below.');
+});
+
+test('users can delete their account', function () {
+ $this->login(['name' => 'Freek Murze']);
+
+ $this->delete('/settings')
+ ->assertRedirect('/');
+
+ $this->assertDatabaseMissing('users', ['name' => 'Freek Murze']);
+});
+
+test('users cannot delete their account', function () {
+ $this->loginAsAdmin();
+
+ $this->get('/settings')
+ ->assertDontSee('Delete Account');
+});
+
+test('users can update their password', function () {
+ $user = $this->login();
+
+ $response = $this->actingAs($user)
+ ->put('settings/password', [
+ 'current_password' => 'password',
+ 'password' => 'QFq^$cz#P@MZa5z7',
+ 'password_confirmation' => 'QFq^$cz#P@MZa5z7',
+ ])
+ ->assertRedirect('/settings');
+
+ $this->followRedirects($response)
+ ->assertSee('Password successfully changed!');
+
+ assertPasswordWasHashedAndSaved();
+});
+
+test('current password is required when updating your password', function () {
+ $user = $this->login();
+
+ $response = $this->actingAs($user)
+ ->put('settings/password', [
+ 'password' => 'QFq^$cz#P@MZa5z7',
+ 'password_confirmation' => 'QFq^$cz#P@MZa5z7',
+ ])
+ ->assertInvalid([
+ 'current_password' => 'The current password field is required.',
+ ]);
+
+ $this->followRedirects($response)
+ ->assertSee('Something went wrong. Please review the fields below.');
+});
+
+test('users cannot update their password when it has been compromised in data leaks', function () {
+ $user = $this->login();
+
+ // Http::fake([
+ // 'api.pwnedpasswords.com/*' => Http::response('newpassword:3600895'),
+ // ]);
+
+ $response = $this->actingAs($user)
+ ->put('settings/password', [
+ 'current_password' => 'password',
+ 'password' => 'newpassword',
+ 'password_confirmation' => 'newpassword',
+ ])
+ ->assertInvalid([
+ 'password' => 'The given password has appeared in a data leak. Please choose a different password.',
+ ]);
+
+ $this->followRedirects($response)
+ ->assertSee('Something went wrong. Please review the fields below.');
+});
+
+test('users can set their password when they have none set yet', function () {
+ $user = User::factory()->passwordless()->create();
+
+ $this->loginAs($user);
+
+ $response = $this->actingAs($user)
+ ->put('settings/password', [
+ 'password' => 'QFq^$cz#P@MZa5z7',
+ 'password_confirmation' => 'QFq^$cz#P@MZa5z7',
+ ])
+ ->assertRedirect('/settings');
+
+ $this->followRedirects($response)
+ ->assertSee('Password successfully changed!');
+
+ assertPasswordWasHashedAndSaved();
+});
+
+test('twitter is optional', function () {
+ $user = $this->createUser([
+ 'email' => 'freek@example.com',
+ 'username' => 'freekmurze',
+ 'twitter' => 'freektwitter',
+ ]);
+
+ $this->loginAs($user);
+
+ $response = $this->actingAs($user)
+ ->put('/settings', [
+ 'name' => 'Freek Murze',
+ 'email' => 'freek@example.com',
+ 'username' => 'freekmurze',
+ 'twitter' => '',
+ ])
+ ->assertRedirect('/settings');
+
+ $this->followRedirects($response)
+ ->assertDontSee('freektwitter');
+
+ expect($user->fresh()->twitter())->toBeEmpty();
+});
+
+test('bluesky is optional', function () {
+ $user = $this->createUser([
+ 'email' => 'freek@example.com',
+ 'username' => 'freekmurze',
+ 'bluesky' => 'driesbsky',
+ ]);
+
+ $this->loginAs($user);
+
+ $response = $this->actingAs($user)
+ ->put('/settings', [
+ 'name' => 'Freek Murze',
+ 'email' => 'freek@example.com',
+ 'username' => 'freekmurze',
+ 'bluesky' => '',
+ ])
+ ->assertRedirect('/settings');
+
+ $this->followRedirects($response)
+ ->assertDontSee('driesbsky');
+
+ expect($user->fresh()->bluesky())->toBeEmpty();
+});
+
+test('website is optional', function () {
+ $user = $this->createUser([
+ 'email' => 'freek@example.com',
+ 'username' => 'freekmurze',
+ 'twitter' => 'freektwitter',
+ 'website' => 'https://freek.dev',
+ ]);
+
+ $this->loginAs($user);
+
+ $response = $this->actingAs($user)
+ ->put('/settings', [
+ 'name' => 'Freek Murze',
+ 'email' => 'freek@example.com',
+ 'username' => 'freekmurze',
+ 'twitter' => 'freektwitter',
+ 'website' => '',
+ ])
+ ->assertRedirect('/settings');
+
+ $this->followRedirects($response)
+ ->assertDontSee('https://freek.dev');
+
+ expect($user->fresh()->website())->toBeEmpty();
+});
+
+test('users can generate API tokens', function () {
+ $user = $this->createUser();
+
+ $this->loginAs($user);
+
+ $response = $this->actingAs($user)
+ ->post('/settings/api-tokens', [
+ 'token_name' => 'My API Token',
+ ])
+ ->assertRedirect('/settings');
+
+ $this->followRedirects($response)
+ ->assertSee('API token created! Please copy the following token as it will not be shown again:');
+
+ expect($user->refresh()->tokens)->toHaveCount(1);
+});
+
+test('users can delete API tokens', function () {
+ $user = $this->createUser();
+ $token = $user->createToken('My API Token');
+
+ $this->loginAs($user);
+
+ $response = $this->actingAs($user)
+ ->delete('/settings/api-tokens', [
+ 'id' => $token->accessToken->getKey(),
+ ])
+ ->assertRedirect('/settings');
+
+ $this->followRedirects($response)
+ ->assertSee('API token successfully removed.');
+
+ expect($user->refresh()->tokens)->toBeEmpty();
+});
+
+test('a user cannot delete another user\'s API token', function () {
+ $joe = UserFactory::new()->create();
+ $token = $joe->createToken('Joe\'s API Token');
+
+ $adam = $this->createUser();
+ $adam->createToken('Adam\'s API Token');
+ $this->loginAs($adam);
+
+ $this->actingAs($adam)
+ ->delete('/settings/api-tokens', [
+ 'id' => $token->accessToken->getKey(),
+ ])
+ ->assertRedirect('/settings');
+
+ expect($joe->refresh()->tokens)->toHaveCount(1);
+});
-class SettingsTest extends BrowserKitTestCase
+// Helpers
+function assertPasswordWasHashedAndSaved(): void
{
- use DatabaseMigrations;
-
- /** @test */
- public function requires_login()
- {
- $this->visit('/settings')
- ->seePageIs('/login');
- }
-
- /** @test */
- public function users_can_update_their_profile()
- {
- $this->login();
-
- $this->visit('/settings')
- ->submitForm('Save', [
- 'name' => 'Freek Murze',
- 'email' => 'freek@example.com',
- 'username' => 'freekmurze',
- 'bio' => 'My bio',
- ])
- ->seePageIs('/settings')
- ->see('Freek Murze')
- ->see('freekmurze')
- ->see('Settings successfully saved!')
- ->see('My bio');
- }
-
- /** @test */
- public function users_cannot_choose_duplicate_usernames_or_email_addresses()
- {
- $this->createUser(['email' => 'freek@example.com', 'username' => 'freekmurze']);
-
- $this->login();
-
- $this->visit('/settings')
- ->submitForm('Save', [
- 'name' => 'Freek Murze',
- 'email' => 'freek@example.com',
- 'username' => 'freekmurze',
- ])
- ->seePageIs('/settings')
- ->see('Something went wrong. Please review the fields below.')
- ->see('The email has already been taken.')
- ->see('The username has already been taken.');
- }
-
- /** @test */
- public function users_can_delete_their_account()
- {
- $this->login(['name' => 'Freek Murze']);
-
- $this->delete('/settings')
- ->assertRedirectedTo('/');
-
- $this->notSeeInDatabase('users', ['name' => 'Freek Murze']);
- }
-
- /** @test */
- public function users_cannot_delete_their_account()
- {
- $this->loginAsAdmin();
-
- $this->visit('/settings')
- ->dontSee('Delete Account');
- }
-
- /** @test */
- public function users_can_update_their_password()
- {
- $this->login();
-
- $this->visit('/settings/password')
- ->submitForm('Save', [
- 'current_password' => 'password',
- 'password' => 'newpassword',
- 'password_confirmation' => 'newpassword',
- ])
- ->seePageIs('/settings/password')
- ->see('Password successfully changed!');
-
- $this->assertPasswordWasHashedAndSaved();
- }
-
- /** @test */
- public function users_can_set_their_password_when_they_have_none_set_yet()
- {
- $user = factory(User::class)->states('passwordless')->create();
-
- $this->loginAs($user);
-
- $this->visit('/settings/password')
- ->submitForm('Save', [
- 'password' => 'newpassword',
- 'password_confirmation' => 'newpassword',
- ])
- ->seePageIs('/settings/password')
- ->see('Password successfully changed!');
-
- $this->assertPasswordWasHashedAndSaved();
- }
-
- private function assertPasswordWasHashedAndSaved(): void
- {
- $this->assertTrue($this->app['hash']->check('newpassword', Auth::user()->getAuthPassword()));
- }
+ expect(Hash::check('QFq^$cz#P@MZa5z7', Auth::user()->getAuthPassword()))->toBeTrue();
}
diff --git a/tests/Feature/SubscriptionsTest.php b/tests/Feature/SubscriptionsTest.php
index 5ca8d7b0e..5708fb56f 100644
--- a/tests/Feature/SubscriptionsTest.php
+++ b/tests/Feature/SubscriptionsTest.php
@@ -1,122 +1,143 @@
create();
+ [$author, $userOne, $userTwo] = User::factory()->times(3)->create();
+ Subscription::factory()->create(['user_id' => $userOne->id(), 'subscriptionable_id' => $thread->id()]);
+ Subscription::factory()->create(['user_id' => $userTwo->id(), 'subscriptionable_id' => $thread->id()]);
+
+ $this->dispatch(new CreateReply(Str::uuid(), $this->faker->text(), $author, $thread));
+
+ Notification::assertNotSentTo($author, NewReplyNotification::class);
+ Notification::assertSentTo([$userOne, $userTwo], NewReplyNotification::class);
+});
+
+test('users are automatically subscribed to a thread after creating it', function () {
+ $user = $this->createUser();
+
+ $uuid = Str::uuid();
+
+ $this->dispatch(new CreateThread($uuid, $this->faker->sentence(), $this->faker->text(), $user));
+
+ $thread = Thread::findByUuidOrFail($uuid);
+
+ expect($thread->hasSubscriber($user))->toBeTrue();
+});
+
+test('thread authors do not receive a notification for a thread they create', function () {
+ Notification::fake();
+
+ $author = $this->createUser();
+
+ $this->dispatch(new CreateThread(Str::uuid(), $this->faker->sentence(), $this->faker->text(), $author));
-class SubscriptionsTest extends BrowserKitTestCase
-{
- use DatabaseMigrations, WithFaker;
+ Notification::assertNotSentTo($author, NewReplyNotification::class);
+});
- /** @test */
- public function users_receive_notifications_for_new_replies_to_threads_where_they_are_subscribed_to()
- {
- Notification::fake();
+test('reply authors do not receive a notification for a thread they are subscribed to', function () {
+ Notification::fake();
- $thread = factory(Thread::class)->create();
- [$author, $userOne, $userTwo] = factory(User::class)->times(3)->create();
- factory(Subscription::class)->create(['user_id' => $userOne->id(), 'subscriptionable_id' => $thread->id()]);
- factory(Subscription::class)->create(['user_id' => $userTwo->id(), 'subscriptionable_id' => $thread->id()]);
+ $thread = Thread::factory()->create();
+ $author = User::factory()->create();
+ Subscription::factory()->create(['user_id' => $author->id(), 'subscriptionable_id' => $thread->id()]);
- $this->dispatch(new CreateReply($this->faker->text, $author, $thread));
+ $this->dispatch(new CreateReply(Str::uuid(), $this->faker->text(), $author, $thread));
- Notification::assertNotSentTo($author, NewReplyNotification::class);
- Notification::assertSentTo([$userOne, $userTwo], NewReplyNotification::class);
- }
+ Notification::assertNotSentTo($author, NewReplyNotification::class);
+});
- /** @test */
- public function users_are_automatically_subscribed_to_a_thread_after_creating_it()
- {
- $user = $this->createUser();
+test('users are automatically subscribed to a thread after replying to it', function () {
+ $user = $this->createUser();
+ $thread = Thread::factory()->create();
- $thread = $this->dispatch(new CreateThread($this->faker->sentence, $this->faker->text, $user));
+ $this->dispatch(new CreateReply(Str::uuid(), $this->faker->text(), $user, $thread));
- $this->assertTrue($thread->hasSubscriber($user));
- }
+ expect($thread->hasSubscriber($user))->toBeTrue();
+});
- /** @test */
- public function thread_authors_do_not_receive_a_notification_for_a_thread_they_create()
- {
- Notification::fake();
+test('users can manually subscribe to threads', function () {
+ $thread = Thread::factory()->create();
- $author = $this->createUser();
+ $this->login();
- $this->dispatch(new CreateThread($this->faker->sentence, $this->faker->text, $author));
+ $response = $this->post("/forum/$thread->slug/subscribe")
+ ->assertRedirect("/forum/$thread->slug");
- Notification::assertNotSentTo($author, NewReplyNotification::class);
- }
+ $this->followRedirects($response)
+ ->assertSee(new HtmlString("You're now subscribed to this thread."));
+});
- /** @test */
- public function reply_authors_do_not_receive_a_notification_for_a_thread_they_are_subscribed_to()
- {
- Notification::fake();
+test('users can unsubscribe from threads', function () {
+ $user = $this->createUser();
+ $thread = Thread::factory()->create();
+ Subscription::factory()->create(['user_id' => $user->id(), 'subscriptionable_id' => $thread->id()]);
- $thread = factory(Thread::class)->create();
- $author = factory(User::class)->create();
- factory(Subscription::class)->create(['user_id' => $author->id(), 'subscriptionable_id' => $thread->id()]);
+ $this->loginAs($user);
- $this->dispatch(new CreateReply($this->faker->text, $author, $thread));
+ $response = $this->post("/forum/$thread->slug/unsubscribe")
+ ->assertRedirect("/forum/$thread->slug");
- Notification::assertNotSentTo($author, NewReplyNotification::class);
- }
+ $this->followRedirects($response)
+ ->assertSee(new HtmlString("You're now unsubscribed from this thread."));
+});
- /** @test */
- public function users_are_automatically_subscribed_to_a_thread_after_replying_to_it()
- {
- $user = $this->createUser();
- $thread = factory(Thread::class)->create();
+test('users can unsubscribe through a token link', function () {
+ $subscription = Subscription::factory()->create();
+ $thread = $subscription->subscriptionAble();
- $this->dispatch(new CreateReply($this->faker->text, $user, $thread));
+ $response = $this->get("/subscriptions/{$subscription->uuid()}/unsubscribe")
+ ->assertRedirect("/forum/{$thread->slug()}");
- $this->assertTrue($thread->hasSubscriber($user));
- }
+ $this->followRedirects($response)
+ ->assertDontSee("You're now unsubscribed from this thread.");
- /** @test */
- public function users_can_manually_subscribe_to_threads()
- {
- factory(Thread::class)->create(['slug' => $slug = $this->faker->slug]);
+ $this->assertDatabaseMissing('subscriptions', ['uuid' => $subscription->uuid()]);
+});
- $this->login();
+test('users are subscribed to a thread when mentioned', function () {
+ $user = User::factory()->create(['username' => 'janedoe', 'email' => 'janedoe@example.com']);
- $this->visit("/forum/$slug")
- ->click('Subscribe')
- ->seePageIs("/forum/$slug")
- ->see("You're now subscribed to this thread.");
- }
+ $this->login();
- /** @test */
- public function users_can_unsubscribe_from_threads()
- {
- $user = $this->createUser();
- $thread = factory(Thread::class)->create(['slug' => $slug = $this->faker->slug]);
- factory(Subscription::class)->create(['user_id' => $user->id(), 'subscriptionable_id' => $thread->id()]);
+ $this->post('/forum/create-thread', [
+ 'subject' => 'How to work with Eloquent?',
+ 'body' => 'Hey @janedoe',
+ 'tags' => [],
+ ]);
- $this->loginAs($user);
+ $this->assertDatabaseHas('subscriptions', ['user_id' => $user->id()]);
+});
- $this->visit("/forum/$slug")
- ->click('Unsubscribe')
- ->seePageIs("/forum/$slug")
- ->see("You're now unsubscribed from this thread.");
- }
+test('users are subscribed to a thread when mentioned in a reply', function () {
+ $user = User::factory()->create(['username' => 'janedoe', 'email' => 'janedoe@example.com']);
+ $thread = Thread::factory()->create(['subject' => 'The first thread', 'slug' => 'the-first-thread']);
- /** @test */
- public function users_can_unsubscribe_through_a_token_link()
- {
- $subscription = factory(Subscription::class)->create();
- $thread = $subscription->subscriptionAble();
+ $this->login();
- $this->visit("/subscriptions/{$subscription->uuid()}/unsubscribe")
- ->seePageIs("/forum/{$thread->slug()}")
- ->see("You're now unsubscribed from this thread.");
+ $this->post('/replies', [
+ 'body' => 'Hey @janedoe',
+ 'replyable_id' => $thread->id,
+ 'replyable_type' => Thread::TABLE,
+ ]);
- $this->notSeeInDatabase('subscriptions', ['uuid' => $subscription->uuid()]);
- }
-}
+ $this->assertDatabaseHas('subscriptions', ['user_id' => $user->id()]);
+});
diff --git a/tests/Feature/UserTest.php b/tests/Feature/UserTest.php
new file mode 100644
index 000000000..7d3de0cd1
--- /dev/null
+++ b/tests/Feature/UserTest.php
@@ -0,0 +1,12 @@
+ 'foo']);
+
+ expect($user->hasPassword())->toBeTrue();
+});
diff --git a/tests/Integration/Api/ArticleTest.php b/tests/Integration/Api/ArticleTest.php
new file mode 100644
index 000000000..5ff02ec19
--- /dev/null
+++ b/tests/Integration/Api/ArticleTest.php
@@ -0,0 +1,158 @@
+create();
+ $user = $this->createUser();
+
+ Sanctum::actingAs($user);
+
+ $this->postJson(route('api.articles.store'), array_merge([
+ 'title' => 'Integrating with an API',
+ 'body' => '# Hello World',
+ 'tags' => [$tag->getKey()],
+ 'original_url' => 'https://laravel.com/docs/master/sanctum',
+ 'submitted' => false,
+ ], $body))->assertJson(['data' => array_merge([
+ 'url' => route('articles.show', Article::query()->first()->slug()),
+ 'title' => 'Integrating with an API',
+ 'body' => '# Hello World',
+ 'original_url' => 'https://laravel.com/docs/master/sanctum',
+ 'author' => [
+ 'email' => $user->emailAddress(),
+ 'name' => $user->name(),
+ 'bio' => $user->bio(),
+ 'twitter_handle' => $user->twitter(),
+ 'bluesky_handle' => $user->bluesky(),
+ 'github_username' => $user->githubUsername(),
+ ],
+ 'tags' => [[
+ 'id' => $tag->getKey(),
+ 'name' => $tag->name(),
+ 'slug' => $tag->slug(),
+ ]],
+ 'is_submitted' => false,
+ ], $response)]);
+
+ expect(Article::query()->count())->toBe(1);
+
+ if ($body['submitted'] ?? false) {
+ Event::assertDispatched(ArticleWasSubmittedForApproval::class);
+ } else {
+ Event::assertNotDispatched(ArticleWasSubmittedForApproval::class);
+ }
+})->with('article API responses');
+
+it('can update an article over the API', function (array $body, array $response) {
+ Event::fake();
+
+ $tag = TagFactory::new()->create();
+ $user = $this->createUser();
+
+ Sanctum::actingAs($user);
+
+ $article = ArticleFactory::new()->for($user, 'authorRelation')->create();
+
+ $this->putJson(route('api.articles.update', $article->slug()), array_merge([
+ 'title' => 'Integrating with an API',
+ 'body' => '# Hello World',
+ 'tags' => [$tag->getKey()],
+ 'original_url' => 'https://laravel.com/docs/master/sanctum',
+ 'submitted' => false,
+ ], $body))->assertJson(['data' => array_merge([
+ 'url' => route('articles.show', Article::query()->first()->slug()),
+ 'title' => 'Integrating with an API',
+ 'body' => '# Hello World',
+ 'original_url' => 'https://laravel.com/docs/master/sanctum',
+ 'author' => [
+ 'email' => $user->emailAddress(),
+ 'name' => $user->name(),
+ 'bio' => $user->bio(),
+ 'twitter_handle' => $user->twitter(),
+ 'bluesky_handle' => $user->bluesky(),
+ 'github_username' => $user->githubUsername(),
+ ],
+ 'tags' => [[
+ 'id' => $tag->getKey(),
+ 'name' => $tag->name(),
+ 'slug' => $tag->slug(),
+ ]],
+ 'is_submitted' => false,
+ ], $response)]);
+
+ expect(Article::query()->count())->toBe(1);
+
+ if ($body['submitted'] ?? false) {
+ Event::assertDispatched(ArticleWasSubmittedForApproval::class);
+ } else {
+ Event::assertNotDispatched(ArticleWasSubmittedForApproval::class);
+ }
+})->with('article API responses');
+
+it('can delete an article over the API', function () {
+ $user = $this->createUser();
+ Sanctum::actingAs($user);
+
+ $article = ArticleFactory::new(['is_sponsored' => false])->for($user, 'authorRelation')->create();
+
+ $this->deleteJson(route('api.articles.delete', $article->slug()))
+ ->assertNoContent();
+
+ expect(Article::query()->count())->toBe(0);
+});
+
+it('does not allow a guest to create', function () {
+ $this->postJson(route('api.articles.store'))
+ ->assertUnauthorized();
+});
+
+it('does not allow a guest to update', function () {
+ $this->putJson(route('api.articles.update', ArticleFactory::new()->create()->slug()))
+ ->assertUnauthorized();
+});
+
+it('does not allow a user to update another user\'s article', function () {
+ $user = $this->createUser();
+ $article = ArticleFactory::new()->create();
+
+ Sanctum::actingAs($user);
+
+ $this->putJson(route('api.articles.update', $article->slug()), [
+ 'title' => 'Integrating with an API',
+ 'body' => '# Hello World',
+ 'submitted' => false,
+ ])->assertForbidden();
+});
+
+it('does not allow a guest to delete', function () {
+ $this->deleteJson(route('api.articles.delete', ArticleFactory::new()->create()->slug()))
+ ->assertUnauthorized();
+});
+
+it('does not allow a user to delete another user\'s article', function () {
+ $user = $this->createUser();
+ $article = ArticleFactory::new()->create();
+
+ Sanctum::actingAs($user);
+
+ $this->deleteJson(route('api.articles.delete', $article->slug()))
+ ->assertForbidden();
+});
+
+dataset('article API responses', [
+ 'default' => [[], []],
+ 'submitted for publishing' => [['submitted' => true], ['is_submitted' => true]],
+ 'no tags' => [['tags' => []], ['tags' => []]],
+]);
diff --git a/tests/Integration/Commands/PostArticleToSocialMediaTest.php b/tests/Integration/Commands/PostArticleToSocialMediaTest.php
new file mode 100644
index 000000000..bb793a4b9
--- /dev/null
+++ b/tests/Integration/Commands/PostArticleToSocialMediaTest.php
@@ -0,0 +1,145 @@
+create([
+ 'title' => 'My First Article',
+ 'submitted_at' => now(),
+ 'approved_at' => now(),
+ ]);
+
+ (new PostArticleToSocialMedia)->handle(new AnonymousNotifiable);
+
+ Notification::assertSentTo(
+ new AnonymousNotifiable,
+ PostArticleToBluesky::class,
+ function ($notification, $channels, $notifiable) use ($article) {
+ $post = $notification->generatePost();
+
+ return
+ Str::contains($post, 'My First Article') &&
+ Str::contains($post, route('articles.show', $article->slug()));
+ },
+ );
+
+ Notification::assertSentTo(
+ new AnonymousNotifiable,
+ PostArticleToTwitter::class,
+ function ($notification, $channels, $notifiable) use ($article) {
+ $tweet = $notification->generateTweet();
+
+ return
+ Str::contains($tweet, 'My First Article') &&
+ Str::contains($tweet, route('articles.show', $article->slug()));
+ },
+ );
+
+ expect($article->fresh()->isShared())->toBeTrue();
+});
+
+test('articles are shared with twitter and bluesky handles', function () {
+ $user = $this->createUser([
+ 'bluesky' => 'driesvints.com',
+ 'twitter' => '_joedixon',
+ ]);
+
+ Article::factory()->create([
+ 'author_id' => $user->id(),
+ 'submitted_at' => now(),
+ 'approved_at' => now(),
+ ]);
+
+ (new PostArticleToSocialMedia)->handle(new AnonymousNotifiable);
+
+ Notification::assertSentTo(
+ new AnonymousNotifiable,
+ PostArticleToBluesky::class,
+ function ($notification, $channels, $notifiable) {
+ return Str::contains($notification->generatePost(), '@driesvints.com');
+ },
+ );
+ Notification::assertSentTo(
+ new AnonymousNotifiable,
+ PostArticleToTwitter::class,
+ function ($notification, $channels, $notifiable) {
+ return Str::contains($notification->generateTweet(), '@_joedixon');
+ },
+ );
+});
+
+test('articles are shared with name when no twitter or bluesky handles', function () {
+ $user = $this->createUser([
+ 'name' => 'Joe Dixon',
+ 'bluesky' => null,
+ 'twitter' => null,
+ ]);
+
+ Article::factory()->create([
+ 'author_id' => $user->id(),
+ 'submitted_at' => now(),
+ 'approved_at' => now(),
+ ]);
+
+ (new PostArticleToSocialMedia)->handle(new AnonymousNotifiable);
+
+ Notification::assertSentTo(
+ new AnonymousNotifiable,
+ PostArticleToBluesky::class,
+ function ($notification, $channels, $notifiable) {
+ return Str::contains($notification->generatePost(), 'Joe Dixon');
+ },
+ );
+ Notification::assertSentTo(
+ new AnonymousNotifiable,
+ PostArticleToTwitter::class,
+ function ($notification, $channels, $notifiable) {
+ return Str::contains($notification->generateTweet(), 'Joe Dixon');
+ },
+ );
+});
+
+test('already shared articles are not shared again', function () {
+ Article::factory()->create([
+ 'submitted_at' => now(),
+ 'approved_at' => now(),
+ 'shared_at' => now(),
+ ]);
+
+ (new PostArticleToSocialMedia)->handle(new AnonymousNotifiable);
+
+ Notification::assertNothingSent();
+});
+
+test('unapproved articles are not shared', function () {
+ Article::factory()->create([
+ 'submitted_at' => now(),
+ ]);
+
+ (new PostArticleToSocialMedia)->handle(new AnonymousNotifiable);
+
+ Notification::assertNothingSent();
+});
+
+test('unsubmitted articles are not shared', function () {
+ Article::factory()->create();
+
+ (new PostArticleToSocialMedia)->handle(new AnonymousNotifiable);
+
+ Notification::assertNothingSent();
+});
diff --git a/tests/Integration/Commands/UpdateArticleViewCountsTest.php b/tests/Integration/Commands/UpdateArticleViewCountsTest.php
new file mode 100644
index 000000000..ea0c6f010
--- /dev/null
+++ b/tests/Integration/Commands/UpdateArticleViewCountsTest.php
@@ -0,0 +1,143 @@
+ 1234,
+ ]]);
+ });
+
+ $article = Article::factory()->create([
+ 'title' => 'My First Article',
+ 'slug' => 'my-first-article',
+ 'submitted_at' => now(),
+ 'approved_at' => now(),
+ ]);
+
+ (new UpdateArticleViewCounts)->handle();
+
+ expect($article->fresh()->view_count)->toBe(1234);
+});
+
+test('article updated timestamp is not touched when view counts are updated', function () {
+ Http::fake(function () {
+ return Http::response([[
+ 'pageviews' => 1234,
+ ]]);
+ });
+
+ $article = Article::factory()->create([
+ 'title' => 'My First Article',
+ 'slug' => 'my-first-article',
+ 'submitted_at' => now(),
+ 'approved_at' => now(),
+ 'created_at' => '2022-08-03 12:00:00',
+ 'updated_at' => '2022-08-03 12:00:00',
+ ]);
+
+ (new UpdateArticleViewCounts)->handle();
+
+ expect($article->fresh()->view_count)->toBe(1234);
+ expect($article->fresh()->updated_at->toDateTimeString())->toBe('2022-08-03 12:00:00');
+});
+
+test('article view counts are not updated when API returns null', function () {
+ Http::fake(function () {
+ return Http::response([[
+ 'pageviews' => null,
+ ]]);
+ });
+
+ $article = Article::factory()->create([
+ 'title' => 'My First Article',
+ 'slug' => 'my-first-article',
+ 'submitted_at' => now(),
+ 'approved_at' => now(),
+ ]);
+
+ (new UpdateArticleViewCounts)->handle();
+
+ expect($article->fresh()->view_count)->toBeNull();
+});
+
+test('article view counts can be merged with original url', function () {
+ Http::fake(function () {
+ return Http::response([[
+ 'pageviews' => 1234,
+ ]]);
+ });
+
+ $article = Article::factory()->create([
+ 'title' => 'My First Article',
+ 'slug' => 'my-first-article',
+ 'original_url' => 'https://example.com/my-first-article',
+ 'submitted_at' => now(),
+ 'approved_at' => now(),
+ ]);
+
+ (new UpdateArticleViewCounts)->handle();
+
+ expect($article->fresh()->view_count)->toBe(2468);
+});
+
+test('article view counts are not merged when url is invalid', function () {
+ Http::fake(function () {
+ return Http::response([[
+ 'pageviews' => 1234,
+ ]]);
+ });
+
+ $article = Article::factory()->create([
+ 'title' => 'My First Article',
+ 'slug' => 'my-first-article',
+ 'original_url' => 'erhwerhwerh',
+ 'submitted_at' => now(),
+ 'approved_at' => now(),
+ ]);
+
+ (new UpdateArticleViewCounts)->handle();
+
+ expect($article->fresh()->view_count)->toBe(1234);
+});
+
+test('article view counts are not updated if API call fails', function () {
+ Http::fake(function () {
+ return Http::response('Uh oh', 500);
+ });
+
+ $article = Article::factory()->create([
+ 'title' => 'My First Article',
+ 'slug' => 'my-first-article',
+ 'submitted_at' => now(),
+ 'approved_at' => now(),
+ ]);
+
+ (new UpdateArticleViewCounts)->handle();
+
+ Http::assertSentCount(3);
+
+ expect($article->fresh()->view_count)->toBeNull();
+});
+
+test('view counts are not updated for unpublished articles', function () {
+ Http::fake();
+
+ Article::factory()->create([
+ 'title' => 'My First Article',
+ 'slug' => 'my-first-article',
+ 'submitted_at' => now(),
+ ]);
+
+ (new UpdateArticleViewCounts)->handle();
+
+ Http::assertNothingSent();
+});
diff --git a/tests/Integration/Helpers/MdToSafeHtmlTest.php b/tests/Integration/Helpers/MdToSafeHtmlTest.php
new file mode 100644
index 000000000..a95ca2f96
--- /dev/null
+++ b/tests/Integration/Helpers/MdToSafeHtmlTest.php
@@ -0,0 +1,17 @@
+toBe('
Hello, World! 
.
'."\n");
+});
+
+test('prevents unsafe links', function () {
+ $body = "[Unsafe Link](javascript:alert('Hello'))";
+
+ expect(md_to_html($body))->toBe('
Unsafe Link
'."\n");
+});
diff --git a/tests/Integration/Jobs/BanUserTest.php b/tests/Integration/Jobs/BanUserTest.php
index 85ff1048e..bf14f9814 100644
--- a/tests/Integration/Jobs/BanUserTest.php
+++ b/tests/Integration/Jobs/BanUserTest.php
@@ -1,22 +1,21 @@
createUser(['banned_at' => null]);
+
+ $reason = 'A good reason';
- /** @test */
- public function it_can_ban_a_user()
- {
- $user = $this->createUser(['banned_at' => null]);
+ $this->dispatch(new BanUser($user, $reason));
- $bannedUser = $this->dispatch(new BanUser($user));
+ $bannedUser = $user->fresh();
- $this->assertTrue($bannedUser->isBanned());
- }
-}
+ expect($bannedUser->isBanned())->toBeTrue();
+ expect($bannedUser->bannedReason())->toBe('A good reason');
+});
diff --git a/tests/Integration/Jobs/BlockUserTest.php b/tests/Integration/Jobs/BlockUserTest.php
new file mode 100644
index 000000000..10b2a4dd2
--- /dev/null
+++ b/tests/Integration/Jobs/BlockUserTest.php
@@ -0,0 +1,22 @@
+createUser();
+ $blocked = $this->createUser([
+ 'username' => 'blocked',
+ 'email' => 'blocked@example.com',
+ ]);
+
+ $this->loginAs($blocker);
+
+ $this->dispatch(new BlockUser($blocker, $blocked));
+
+ expect($blocker->hasBlocked($blocked))->toBeTrue();
+});
diff --git a/tests/Integration/Jobs/ConfirmUserTest.php b/tests/Integration/Jobs/ConfirmUserTest.php
deleted file mode 100644
index f94468dc5..000000000
--- a/tests/Integration/Jobs/ConfirmUserTest.php
+++ /dev/null
@@ -1,22 +0,0 @@
-createUser(['confirmed' => false]);
-
- $confirmedUser = $this->dispatch(new ConfirmUser($user));
-
- $this->assertTrue($confirmedUser->isConfirmed());
- }
-}
diff --git a/tests/Integration/Jobs/CreateApiTokenTest.php b/tests/Integration/Jobs/CreateApiTokenTest.php
new file mode 100644
index 000000000..534fb7cb1
--- /dev/null
+++ b/tests/Integration/Jobs/CreateApiTokenTest.php
@@ -0,0 +1,18 @@
+createUser();
+
+ $this->dispatch(new CreateApiToken($user, 'Foo Bar'));
+
+ expect($user->refresh()->tokens)
+ ->toHaveCount(1)
+ ->first()->name->toBe('Foo Bar');
+});
diff --git a/tests/Integration/Jobs/CreateArticleTest.php b/tests/Integration/Jobs/CreateArticleTest.php
new file mode 100644
index 000000000..8796c6625
--- /dev/null
+++ b/tests/Integration/Jobs/CreateArticleTest.php
@@ -0,0 +1,47 @@
+createUser();
+
+ $uuid = Str::uuid();
+
+ $this->dispatch(new CreateArticle($uuid, 'Title', 'Body', $user, false, null, [
+ 'original_url' => 'https://laravel.io',
+ ]));
+
+ $article = Article::findByUuidOrFail($uuid);
+
+ expect($article->title())->toEqual('Title');
+ expect($article->body())->toEqual('Body');
+ expect($article->canonicalUrl())->toEqual('https://laravel.io');
+ expect($article->submittedAt())->toBeNull();
+ expect($article->isNotPublished())->toBeTrue();
+});
+
+test('we can create an article and submit it for approval', function () {
+ Event::fake();
+
+ $user = $this->createUser();
+
+ $uuid = Str::uuid();
+
+ $this->dispatch(new CreateArticle($uuid, 'Title', 'Body', $user, true, null, [
+ 'original_url' => 'https://laravel.io',
+ ]));
+
+ $article = Article::findByUuidOrFail($uuid);
+
+ $this->assertNotNull($article->submittedAt());
+
+ Event::assertDispatched(ArticleWasSubmittedForApproval::class);
+});
diff --git a/tests/Integration/Jobs/CreateReplyTest.php b/tests/Integration/Jobs/CreateReplyTest.php
index d10224c98..4a77e4a89 100644
--- a/tests/Integration/Jobs/CreateReplyTest.php
+++ b/tests/Integration/Jobs/CreateReplyTest.php
@@ -1,27 +1,30 @@
createUser();
+ $thread = Thread::factory()->create();
+
+ $uuid = Str::uuid();
- /** @test */
- public function we_can_create_a_reply()
- {
- $user = $this->createUser();
- $thread = factory(Thread::class)->create();
+ $this->dispatch(new CreateReply($uuid, 'Foo', $user, $thread));
- $this->expectsEvents(ReplyWasCreated::class);
+ $reply = Reply::findByUuidOrFail($uuid);
- $reply = $this->dispatch(new CreateReply('Foo', $user, $thread));
+ expect($reply->body())->toEqual('Foo');
- $this->assertEquals('Foo', $reply->body());
- }
-}
+ Event::assertDispatched(ReplyWasCreated::class);
+});
diff --git a/tests/Integration/Jobs/CreateThreadTest.php b/tests/Integration/Jobs/CreateThreadTest.php
index ce39480ce..7649ac13f 100644
--- a/tests/Integration/Jobs/CreateThreadTest.php
+++ b/tests/Integration/Jobs/CreateThreadTest.php
@@ -1,22 +1,22 @@
createUser();
+
+ $uuid = Str::uuid();
- /** @test */
- public function we_can_create_a_thread()
- {
- $user = $this->createUser();
+ $this->dispatch(new CreateThread($uuid, 'Subject', 'Body', $user));
- $thread = $this->dispatch(new CreateThread('Subject', 'Body', $user));
+ $thread = Thread::findByUuidOrFail($uuid);
- $this->assertEquals('Subject', $thread->subject());
- }
-}
+ expect($thread->subject())->toEqual('Subject');
+});
diff --git a/tests/Integration/Jobs/DeleteApiTokenTest.php b/tests/Integration/Jobs/DeleteApiTokenTest.php
new file mode 100644
index 000000000..1a911ddfc
--- /dev/null
+++ b/tests/Integration/Jobs/DeleteApiTokenTest.php
@@ -0,0 +1,32 @@
+createUser();
+
+ $user->createToken('foo');
+ $barToken = $user->createToken('bar');
+ $user->createToken('baz');
+
+ $this->dispatch(new DeleteApiToken($user, $barToken->accessToken->getKey()));
+
+ expect($user->refresh()->tokens)->toHaveCount(2);
+ expect($barToken->accessToken->fresh())->toBeNull();
+});
+
+it('will not delete anything if the given API token does not belong to the user', function () {
+ $user = $this->createUser();
+ $token = $user->createToken('foo');
+
+ $this->dispatch(new DeleteApiToken(UserFactory::new()->create(), $token->accessToken->getKey()));
+
+ expect($user->refresh()->tokens)->toHaveCount(1);
+ expect($token->accessToken->fresh())->not->toBeNull();
+});
diff --git a/tests/Integration/Jobs/DeleteArticleTest.php b/tests/Integration/Jobs/DeleteArticleTest.php
new file mode 100644
index 000000000..f8c2f436f
--- /dev/null
+++ b/tests/Integration/Jobs/DeleteArticleTest.php
@@ -0,0 +1,17 @@
+create();
+
+ $this->dispatch(new DeleteArticle($article));
+
+ $this->assertDatabaseMissing('articles', ['id' => $article->id()]);
+});
diff --git a/tests/Integration/Jobs/DeleteRepliesTest.php b/tests/Integration/Jobs/DeleteRepliesTest.php
new file mode 100644
index 000000000..6f771198f
--- /dev/null
+++ b/tests/Integration/Jobs/DeleteRepliesTest.php
@@ -0,0 +1,37 @@
+createUser();
+ $thread = Thread::factory()->create();
+ $reply = Reply::factory()->create(['author_id' => $user->id(), 'replyable_id' => $thread->id()]);
+
+ $this->loginAs($user);
+ $this->dispatch(new DeleteReply($reply));
+
+ $this->assertDatabaseMissing('replies', ['id' => $reply->id()]);
+});
+
+test('admins can soft delete replies', function () {
+ $thread = Thread::factory()->create();
+ $reply = Reply::factory()->create(['replyable_id' => $thread->id()]);
+ $reason = 'Reason';
+
+ $this->loginAsAdmin();
+ $this->dispatch(new DeleteReply($reply, $reason));
+
+ $this->assertSoftDeleted('replies', ['id' => $reply->id()]);
+
+ expect($reply->isDeletedBy(auth()->user()))->toBeTrue();
+ expect($reply->deleted_at)->not()->toBeNull();
+ expect($reply->deleted_reason)->not()->toBeNull();
+ expect($reply->deleted_reason)->toBe($reason);
+});
diff --git a/tests/Integration/Jobs/DeleteThreadTest.php b/tests/Integration/Jobs/DeleteThreadTest.php
index 4584f6ba5..c95410f27 100644
--- a/tests/Integration/Jobs/DeleteThreadTest.php
+++ b/tests/Integration/Jobs/DeleteThreadTest.php
@@ -1,31 +1,25 @@
create();
- $reply = factory(Reply::class)->create(['replyable_id' => $thread->id()]);
- factory(Like::class)->states('thread')->create(['likeable_id' => $thread->id()]);
- factory(Like::class)->states('reply')->create(['likeable_id' => $reply->id()]);
+test('we can delete a thread and its replies', function () {
+ $thread = Thread::factory()->create();
+ $reply = Reply::factory()->create(['replyable_id' => $thread->id()]);
+ Like::factory()->thread()->create(['likeable_id' => $thread->id()]);
+ Like::factory()->reply()->create(['likeable_id' => $reply->id()]);
- $this->dispatch(new DeleteThread($thread));
+ $this->dispatch(new DeleteThread($thread));
- $this->assertDatabaseMissing('threads', ['id' => $thread->id()]);
- $this->assertDatabaseMissing('replies', ['replyable_id' => $thread->id()]);
- $this->assertDatabaseMissing('likes', ['likeable_type' => 'threads', 'likeable_id' => $thread->id()]);
- $this->assertDatabaseMissing('likes', ['likeable_type' => 'replies', 'likeable_id' => $reply->id()]);
- }
-}
+ $this->assertDatabaseMissing('threads', ['id' => $thread->id()]);
+ $this->assertDatabaseMissing('replies', ['replyable_type' => 'threads', 'replyable_id' => $thread->id()]);
+ $this->assertDatabaseMissing('likes', ['likeable_type' => 'threads', 'likeable_id' => $thread->id()]);
+ $this->assertDatabaseMissing('likes', ['likeable_type' => 'replies', 'likeable_id' => $reply->id()]);
+});
diff --git a/tests/Integration/Jobs/DeleteUserTest.php b/tests/Integration/Jobs/DeleteUserTest.php
new file mode 100644
index 000000000..c830d3d8e
--- /dev/null
+++ b/tests/Integration/Jobs/DeleteUserTest.php
@@ -0,0 +1,26 @@
+create();
+ $thread = Thread::factory()->create(['author_id' => $user->id()]);
+ Reply::factory()->create(['replyable_id' => $thread->id()]);
+ Reply::factory()->create(['author_id' => $user->id()]);
+
+ $this->loginAsAdmin();
+ $this->dispatch(new DeleteUser($user));
+
+ $this->assertDatabaseMissing('users', ['id' => $user->id()]);
+ $this->assertDatabaseMissing('threads', ['author_id' => $user->id()]);
+ $this->assertDatabaseMissing('replies', ['replyable_id' => $thread->id()]);
+ $this->assertDatabaseMissing('replies', ['author_id' => $user->id()]);
+});
diff --git a/tests/Integration/Jobs/DeleteUserThreadsTest.php b/tests/Integration/Jobs/DeleteUserThreadsTest.php
new file mode 100644
index 000000000..e0c2c07ef
--- /dev/null
+++ b/tests/Integration/Jobs/DeleteUserThreadsTest.php
@@ -0,0 +1,21 @@
+create();
+
+ Thread::factory()->for($user, 'authorRelation')->count(5)->create();
+
+ $this->loginAsAdmin();
+ $this->dispatch(new DeleteUserThreads($user));
+
+ $this->assertDatabaseMissing('threads', ['author_id' => $user->id()]);
+});
diff --git a/tests/Integration/Jobs/GenerateSocialShareImageTest.php b/tests/Integration/Jobs/GenerateSocialShareImageTest.php
new file mode 100644
index 000000000..029bb5140
--- /dev/null
+++ b/tests/Integration/Jobs/GenerateSocialShareImageTest.php
@@ -0,0 +1,32 @@
+create([
+ 'title' => 'This is an article to test social share image generation',
+ ]);
+
+ $generatedSocialShareImagePath = sys_get_temp_dir().'/generated_social_share_temporary_image.png';
+
+ file_put_contents(
+ $generatedSocialShareImagePath,
+ ((new GenerateSocialShareImage($article))->handle())->content()
+ );
+
+ expect(
+ Pixelmatch::new(
+ $generatedSocialShareImagePath,
+ base_path('tests/stubs/generate_social_share_image.png')
+ )->matches()
+ )->toBeTrue();
+
+ unlink($generatedSocialShareImagePath);
+})->skip('Fails on GitHub Actions');
diff --git a/tests/Integration/Jobs/LikeArticleTest.php b/tests/Integration/Jobs/LikeArticleTest.php
new file mode 100644
index 000000000..8548125e8
--- /dev/null
+++ b/tests/Integration/Jobs/LikeArticleTest.php
@@ -0,0 +1,33 @@
+create();
+ $article = Article::factory()->create();
+
+ $this->dispatch(new LikeArticle($article, $user));
+
+ expect($article->fresh()->isLikedBy($user))->toBeTrue();
+});
+
+test('we cannot like an article twice', function () {
+ $user = User::factory()->create();
+ $article = Article::factory()->create();
+
+ $this->dispatch(new LikeArticle($article, $user));
+
+ expect($article->fresh()->isLikedBy($user))->toBeTrue();
+
+ $this->expectException(CannotLikeItem::class);
+
+ $this->dispatch(new LikeArticle($article, $user));
+});
diff --git a/tests/Integration/Jobs/LikeReplyTest.php b/tests/Integration/Jobs/LikeReplyTest.php
index 26dd5f98a..83ff7d133 100644
--- a/tests/Integration/Jobs/LikeReplyTest.php
+++ b/tests/Integration/Jobs/LikeReplyTest.php
@@ -1,41 +1,33 @@
create();
- $reply = factory(Reply::class)->create();
+test('we can like a reply', function () {
+ $user = User::factory()->create();
+ $reply = Reply::factory()->create();
- $this->dispatch(new LikeReply($reply, $user));
+ $this->dispatch(new LikeReply($reply, $user));
- $this->assertTrue($reply->fresh()->isLikedBy($user));
- }
+ expect($reply->fresh()->isLikedBy($user))->toBeTrue();
+});
- /** @test */
- public function we_cannot_like_a_reply_twice()
- {
- $user = factory(User::class)->create();
- $reply = factory(Reply::class)->create();
+test('we cannot like a reply twice', function () {
+ $user = User::factory()->create();
+ $reply = Reply::factory()->create();
- $this->dispatch(new LikeReply($reply, $user));
+ $this->dispatch(new LikeReply($reply, $user));
- $this->assertTrue($reply->fresh()->isLikedBy($user));
+ expect($reply->fresh()->isLikedBy($user))->toBeTrue();
- $this->expectException(CannotLikeItem::class);
+ $this->expectException(CannotLikeItem::class);
- $this->dispatch(new LikeReply($reply, $user));
- }
-}
+ $this->dispatch(new LikeReply($reply, $user));
+});
diff --git a/tests/Integration/Jobs/LikeThreadTest.php b/tests/Integration/Jobs/LikeThreadTest.php
index d7401075f..b2971d338 100644
--- a/tests/Integration/Jobs/LikeThreadTest.php
+++ b/tests/Integration/Jobs/LikeThreadTest.php
@@ -1,41 +1,33 @@
create();
- $thread = factory(Thread::class)->create();
+test('we can like a thread', function () {
+ $user = User::factory()->create();
+ $thread = Thread::factory()->create();
- $this->dispatch(new LikeThread($thread, $user));
+ $this->dispatch(new LikeThread($thread, $user));
- $this->assertTrue($thread->fresh()->isLikedBy($user));
- }
+ expect($thread->fresh()->isLikedBy($user))->toBeTrue();
+});
- /** @test */
- public function we_cannot_like_a_thread_twice()
- {
- $user = factory(User::class)->create();
- $thread = factory(Thread::class)->create();
+test('we cannot like a thread twice', function () {
+ $user = User::factory()->create();
+ $thread = Thread::factory()->create();
- $this->dispatch(new LikeThread($thread, $user));
+ $this->dispatch(new LikeThread($thread, $user));
- $this->assertTrue($thread->fresh()->isLikedBy($user));
+ expect($thread->fresh()->isLikedBy($user))->toBeTrue();
- $this->expectException(CannotLikeItem::class);
+ $this->expectException(CannotLikeItem::class);
- $this->dispatch(new LikeThread($thread, $user));
- }
-}
+ $this->dispatch(new LikeThread($thread, $user));
+});
diff --git a/tests/Integration/Jobs/LockThreadTest.php b/tests/Integration/Jobs/LockThreadTest.php
new file mode 100644
index 000000000..d87bb46a9
--- /dev/null
+++ b/tests/Integration/Jobs/LockThreadTest.php
@@ -0,0 +1,37 @@
+create();
+ $thread = Thread::factory()->create();
+
+ expect($thread->locked_at)->toBeNull();
+
+ $this->dispatch(new LockThread($user, $thread));
+
+ expect($thread->isLockedBy($user))->toBeTrue();
+ expect($thread->locked_at)->not()->toBeNull();
+});
+
+test('locking an already locked thread has no side effects', function () {
+ $user = User::factory()->create();
+ $thread = Thread::factory()->create();
+
+ $this->dispatch(new LockThread($user, $thread));
+
+ expect($thread->isLockedBy($user))->toBeTrue();
+
+ $lockedAt = $thread->locked_at;
+
+ $this->dispatch(new LockThread($user, $thread));
+
+ expect($thread->locked_at)->toEqual($lockedAt);
+});
diff --git a/tests/Integration/Jobs/MarkThreadSolutionTest.php b/tests/Integration/Jobs/MarkThreadSolutionTest.php
new file mode 100644
index 000000000..cd18af531
--- /dev/null
+++ b/tests/Integration/Jobs/MarkThreadSolutionTest.php
@@ -0,0 +1,21 @@
+login();
+ $thread = Thread::factory()->create();
+ $reply = Reply::factory()->create();
+
+ $this->dispatch(new MarkThreadSolution($thread, $reply, $user));
+
+ expect($thread->isSolutionReply($reply))->toBeTrue();
+ expect($thread->wasResolvedBy($user))->toBeTrue();
+});
diff --git a/tests/Integration/Jobs/RegisterUserTest.php b/tests/Integration/Jobs/RegisterUserTest.php
index 4207d43dc..1c2daaffe 100644
--- a/tests/Integration/Jobs/RegisterUserTest.php
+++ b/tests/Integration/Jobs/RegisterUserTest.php
@@ -1,41 +1,34 @@
dispatch(
- new RegisterUser('John Doe', 'john@example.com', 'johndoe', 'password', '123', 'johndoe')
- );
-
- $this->assertEquals('John Doe', $user->name());
- }
-
- /** @test */
- public function we_cannot_create_a_user_with_the_same_email_address()
- {
- $this->expectException(CannotCreateUser::class);
-
- $this->dispatch(new RegisterUser('John Doe', 'john@example.com', 'johndoe', '', 'password', '123', 'johndoe'));
- $this->dispatch(new RegisterUser('John Doe', 'john@example.com', 'john', '', 'password', '123', 'johndoe'));
- }
-
- /** @test */
- public function we_cannot_create_a_user_with_the_same_username()
- {
- $this->expectException(CannotCreateUser::class);
-
- $this->dispatch(new RegisterUser('John Doe', 'john@example.com', 'johndoe', '', 'password', '123', 'johndoe'));
- $this->dispatch(new RegisterUser('John Doe', 'doe@example.com', 'johndoe', '', 'password', '123', 'johndoe'));
- }
-}
+uses(TestCase::class);
+uses(RefreshDatabase::class);
+
+test('we can create a user', function () {
+ $this->dispatch(
+ new RegisterUser('John Doe', 'john@example.com', 'johndoe', 'password', '123', 'johndoe'),
+ );
+
+ $user = User::findByEmailAddress('john@example.com');
+
+ expect($user->name())->toEqual('John Doe');
+});
+
+test('we cannot create a user with the same email address', function () {
+ $this->expectException(CannotCreateUser::class);
+
+ $this->dispatch(new RegisterUser('John Doe', 'john@example.com', 'johndoe', '', 'password', '123', 'johndoe'));
+ $this->dispatch(new RegisterUser('John Doe', 'john@example.com', 'john', '', 'password', '123', 'johndoe'));
+});
+
+test('we cannot create a user with the same username', function () {
+ $this->expectException(CannotCreateUser::class);
+
+ $this->dispatch(new RegisterUser('John Doe', 'john@example.com', 'johndoe', '', 'password', '123', 'johndoe'));
+ $this->dispatch(new RegisterUser('John Doe', 'doe@example.com', 'johndoe', '', 'password', '123', 'johndoe'));
+});
diff --git a/tests/Integration/Jobs/ReportSpamTest.php b/tests/Integration/Jobs/ReportSpamTest.php
new file mode 100644
index 000000000..7023bc844
--- /dev/null
+++ b/tests/Integration/Jobs/ReportSpamTest.php
@@ -0,0 +1,51 @@
+login();
+ $thread = Thread::factory()->create();
+
+ $this->dispatch(new ReportSpam($user, $thread));
+
+ $thread->refresh();
+
+ expect($thread->spamReportersRelation()->count())->toBe(1);
+ expect($thread->spamReporters()->contains($user))->toBeTrue();
+});
+
+it('can mark a reply as spam', function () {
+ $user = $this->login();
+ $reply = Reply::factory()->create();
+
+ $this->dispatch(new ReportSpam($user, $reply));
+
+ $reply->refresh();
+
+ expect($reply->spamReportersRelation()->count())->toBe(1);
+ expect($reply->spamReporters()->contains($user))->toBeTrue();
+});
+
+it('can notify moderators if a thread is marked three times', function () {
+ Notification::fake();
+
+ $thread = Thread::factory()->create();
+ $users = User::factory(7)->create();
+ User::factory()->create(['type' => User::MODERATOR]);
+
+ $users->each(function ($user, $index) use ($thread) {
+ $this->dispatch(new ReportSpam($user, $thread));
+ });
+
+ Notification::assertSentOnDemandTimes(MarkedAsSpamNotification::class, 2);
+});
diff --git a/tests/Integration/Jobs/SubscribeToSubscriptionAbleTest.php b/tests/Integration/Jobs/SubscribeToSubscriptionAbleTest.php
index 72f4c4f58..ca0010358 100644
--- a/tests/Integration/Jobs/SubscribeToSubscriptionAbleTest.php
+++ b/tests/Integration/Jobs/SubscribeToSubscriptionAbleTest.php
@@ -1,26 +1,20 @@
createUser();
- $thread = factory(Thread::class)->create();
+it('can subscribe a user to a thread', function () {
+ $user = $this->createUser();
+ $thread = Thread::factory()->create();
- $this->assertFalse($thread->hasSubscriber($user));
+ expect($thread->hasSubscriber($user))->toBeFalse();
- $this->dispatch(new SubscribeToSubscriptionAble($user, $thread));
+ $this->dispatch(new SubscribeToSubscriptionAble($user, $thread));
- $this->assertTrue($thread->hasSubscriber($user));
- }
-}
+ expect($thread->hasSubscriber($user))->toBeTrue();
+});
diff --git a/tests/Integration/Jobs/SyncArticleImageTest.php b/tests/Integration/Jobs/SyncArticleImageTest.php
new file mode 100644
index 000000000..7096d104e
--- /dev/null
+++ b/tests/Integration/Jobs/SyncArticleImageTest.php
@@ -0,0 +1,63 @@
+ [
+ 'download_location' => 'https://example.com',
+ ],
+ 'urls' => [
+ 'raw' => 'https://images.unsplash.com/photo-1584824486509-112e4181ff6b?ixid=M3w2NTgwOTl8MHwxfGFsbHx8fHx8fHx8fDE3Mjc2ODMzMzZ8&ixlib=rb-4.0.3',
+ ],
+ 'user' => [
+ 'name' => 'Erik Mclean',
+ 'links' => [
+ 'html' => 'https://unsplash.com/@introspectivedsgn',
+ ],
+ ],
+ ];
+ });
+
+ $article = Article::factory()->create([
+ 'hero_image_id' => 'sxiSod0tyYQ',
+ 'submitted_at' => now(),
+ 'approved_at' => now(),
+ ]);
+
+ SyncArticleImage::dispatchSync($article);
+
+ $article->refresh();
+
+ expect($article->heroImage())->toContain('https://images.unsplash.com/photo-1584824486509-112e4181ff6b');
+ expect($article->hero_image_author_name)->toBe('Erik Mclean');
+ expect($article->hero_image_author_url)->toBe('https://unsplash.com/@introspectivedsgn');
+});
+
+test('hero image url and author information is not updated for published articles with no hero image', function () {
+ Config::set('services.unsplash.access_key', 'test');
+
+ $article = Article::factory()->create([
+ 'submitted_at' => now(),
+ 'approved_at' => now(),
+ ]);
+
+ SyncArticleImage::dispatchSync($article);
+
+ $article->refresh();
+
+ expect($article->hero_image_url)->toBe(null);
+ expect($article->hero_image_author_name)->toBe(null);
+ expect($article->hero_image_author_url)->toBe(null);
+});
diff --git a/tests/Integration/Jobs/UnbanUserTest.php b/tests/Integration/Jobs/UnbanUserTest.php
index 72862d433..a641bae7e 100644
--- a/tests/Integration/Jobs/UnbanUserTest.php
+++ b/tests/Integration/Jobs/UnbanUserTest.php
@@ -1,23 +1,20 @@
createUser(['banned_at' => Carbon::yesterday()]);
- /** @test */
- public function it_can_unban_a_user()
- {
- $user = $this->createUser(['banned_at' => Carbon::yesterday()]);
+ $this->dispatch(new UnbanUser($user));
- $unbannedUser = $this->dispatch(new UnbanUser($user));
+ $unbannedUser = $user->fresh();
- $this->assertFalse($unbannedUser->isBanned());
- }
-}
+ expect($unbannedUser->isBanned())->toBeFalse();
+ expect($unbannedUser->bannedReason())->toBeNull();
+});
diff --git a/tests/Integration/Jobs/UnblockUserTest.php b/tests/Integration/Jobs/UnblockUserTest.php
new file mode 100644
index 000000000..3506458ab
--- /dev/null
+++ b/tests/Integration/Jobs/UnblockUserTest.php
@@ -0,0 +1,22 @@
+createUser();
+ $unblocked = $this->createUser([
+ 'username' => 'unblocked',
+ 'email' => 'unblocked@example.com',
+ ]);
+
+ $this->loginAs($unblocker);
+
+ $this->dispatch(new UnblockUser($unblocker, $unblocked));
+
+ expect($unblocker->hasUnblocked($unblocked))->toBeTrue();
+});
diff --git a/tests/Integration/Jobs/UnlikeArticleTest.php b/tests/Integration/Jobs/UnlikeArticleTest.php
new file mode 100644
index 000000000..20a7bf007
--- /dev/null
+++ b/tests/Integration/Jobs/UnlikeArticleTest.php
@@ -0,0 +1,22 @@
+create();
+ $article = Article::factory()->create();
+
+ $article->likedBy($user);
+ expect($article->fresh()->isLikedBy($user))->toBeTrue();
+
+ $this->dispatch(new UnlikeArticle($article, $user));
+
+ expect($article->fresh()->isLikedBy($user))->toBeFalse();
+});
diff --git a/tests/Integration/Jobs/UnlikeReplyTest.php b/tests/Integration/Jobs/UnlikeReplyTest.php
index 1a7799bb9..3be3a0e42 100644
--- a/tests/Integration/Jobs/UnlikeReplyTest.php
+++ b/tests/Integration/Jobs/UnlikeReplyTest.php
@@ -1,28 +1,22 @@
create();
- $reply = factory(Reply::class)->create();
+test('we can unlike a reply', function () {
+ $user = User::factory()->create();
+ $reply = Reply::factory()->create();
- $reply->likedBy($user);
- $this->assertTrue($reply->fresh()->isLikedBy($user));
+ $reply->likedBy($user);
+ expect($reply->fresh()->isLikedBy($user))->toBeTrue();
- $this->dispatch(new UnlikeReply($reply, $user));
+ $this->dispatch(new UnlikeReply($reply, $user));
- $this->assertFalse($reply->fresh()->isLikedBy($user));
- }
-}
+ expect($reply->fresh()->isLikedBy($user))->toBeFalse();
+});
diff --git a/tests/Integration/Jobs/UnlikeThreadTest.php b/tests/Integration/Jobs/UnlikeThreadTest.php
index 4d55c47d8..2e5cb4208 100644
--- a/tests/Integration/Jobs/UnlikeThreadTest.php
+++ b/tests/Integration/Jobs/UnlikeThreadTest.php
@@ -1,28 +1,22 @@
create();
- $thread = factory(Thread::class)->create();
+test('we can unlike a thread', function () {
+ $user = User::factory()->create();
+ $thread = Thread::factory()->create();
- $thread->likedBy($user);
- $this->assertTrue($thread->fresh()->isLikedBy($user));
+ $thread->likedBy($user);
+ expect($thread->fresh()->isLikedBy($user))->toBeTrue();
- $this->dispatch(new UnlikeThread($thread, $user));
+ $this->dispatch(new UnlikeThread($thread, $user));
- $this->assertFalse($thread->fresh()->isLikedBy($user));
- }
-}
+ expect($thread->fresh()->isLikedBy($user))->toBeFalse();
+});
diff --git a/tests/Integration/Jobs/UnlockThreadTest.php b/tests/Integration/Jobs/UnlockThreadTest.php
new file mode 100644
index 000000000..18d2628a0
--- /dev/null
+++ b/tests/Integration/Jobs/UnlockThreadTest.php
@@ -0,0 +1,26 @@
+create();
+ $thread = Thread::factory()->create();
+
+ $this->dispatch(new LockThread($user, $thread));
+
+ expect($thread->isLockedBy($user))->toBeTrue();
+ expect($thread->locked_at)->not()->toBeNull();
+
+ $this->dispatch(new UnlockThread($thread));
+
+ expect($thread->isUnlocked())->toBeTrue();
+ expect($thread->locked_at)->toBeNull();
+});
diff --git a/tests/Integration/Jobs/UnmarkThreadSolutionTest.php b/tests/Integration/Jobs/UnmarkThreadSolutionTest.php
new file mode 100644
index 000000000..3e6341cf1
--- /dev/null
+++ b/tests/Integration/Jobs/UnmarkThreadSolutionTest.php
@@ -0,0 +1,25 @@
+login();
+ $thread = Thread::factory()->create();
+ $reply = Reply::factory()->create();
+
+ $thread->markSolution($reply, $user);
+ expect($thread->isSolutionReply($reply))->toBeTrue();
+ expect($thread->wasResolvedBy($user))->toBeTrue();
+
+ $this->dispatch(new UnmarkThreadSolution($thread));
+
+ expect($thread->isSolutionReply($reply))->toBeFalse();
+ expect($thread->fresh()->wasResolvedBy($user))->toBeFalse();
+});
diff --git a/tests/Integration/Jobs/UnsubscribeFromSubscriptionAbleTest.php b/tests/Integration/Jobs/UnsubscribeFromSubscriptionAbleTest.php
index e428ff2dc..202149f03 100644
--- a/tests/Integration/Jobs/UnsubscribeFromSubscriptionAbleTest.php
+++ b/tests/Integration/Jobs/UnsubscribeFromSubscriptionAbleTest.php
@@ -1,28 +1,22 @@
createUser();
- $thread = factory(Thread::class)->create();
- factory(Subscription::class)->create(['user_id' => $user->id(), 'subscriptionable_id' => $thread->id()]);
+it('can unsubscribe a user from a thread', function () {
+ $user = $this->createUser();
+ $thread = Thread::factory()->create();
+ Subscription::factory()->create(['user_id' => $user->id(), 'subscriptionable_id' => $thread->id()]);
- $this->assertTrue($thread->hasSubscriber($user));
+ expect($thread->hasSubscriber($user))->toBeTrue();
- $this->dispatch(new UnsubscribeFromSubscriptionAble($user, $thread));
+ $this->dispatch(new UnsubscribeFromSubscriptionAble($user, $thread));
- $this->assertFalse($thread->hasSubscriber($user));
- }
-}
+ expect($thread->hasSubscriber($user))->toBeFalse();
+});
diff --git a/tests/Integration/Jobs/UpdateArticleTest.php b/tests/Integration/Jobs/UpdateArticleTest.php
new file mode 100644
index 000000000..66dbb75d8
--- /dev/null
+++ b/tests/Integration/Jobs/UpdateArticleTest.php
@@ -0,0 +1,49 @@
+createUser();
+ $article = Article::factory()->create(['author_id' => $user->id()]);
+
+ $this->dispatch(new UpdateArticle($article, 'Title', 'Body', false));
+
+ $article = $article->fresh();
+
+ expect($article->title())->toEqual('Title');
+ expect($article->body())->toEqual('Body');
+});
+
+test('we can submit an existing article for approval', function () {
+ Event::fake();
+
+ $user = $this->createUser();
+ $article = Article::factory()->create(['author_id' => $user->id()]);
+
+ $this->dispatch(new UpdateArticle($article, 'Title', 'Body', true));
+
+ $article = $article->fresh();
+
+ $this->assertNotNull($article->submittedAt());
+
+ Event::assertDispatched(ArticleWasSubmittedForApproval::class);
+});
+
+test('we cannot update the submission time when saving changes', function () {
+ $user = $this->createUser();
+ $article = Article::factory()->create(['author_id' => $user->id(), 'submitted_at' => '2020-06-20 00:00:00']);
+
+ $this->dispatch(new UpdateArticle($article, 'Title', 'Body', false));
+
+ $article = $article->fresh();
+
+ expect($article->submittedAt()->format('Y-m-d H:i:s'))->toBe('2020-06-20 00:00:00');
+ expect($article->isNotPublished())->toBeTrue();
+});
diff --git a/tests/Integration/Jobs/UpdateProfileTest.php b/tests/Integration/Jobs/UpdateProfileTest.php
index 0bddd93b9..2eead3f97 100644
--- a/tests/Integration/Jobs/UpdateProfileTest.php
+++ b/tests/Integration/Jobs/UpdateProfileTest.php
@@ -1,23 +1,41 @@
createUser();
+
+ Event::fake();
+
+ $this->dispatch(new UpdateProfile($user, ['bio' => 'my bio', 'name' => 'John Doe Junior', 'website' => 'https://laravel.io']));
+
+ $updatedUser = $user->fresh();
+
+ expect($updatedUser->bio())->toEqual('my bio');
+ expect($updatedUser->name())->toEqual('John Doe Junior');
+ expect($updatedUser->website())->toEqual('https://laravel.io');
+ $this->assertDatabaseMissing('users', ['id' => $user->id, 'email_verified_at' => null]);
+
+ Event::assertNotDispatched(EmailAddressWasChanged::class);
+});
+
+test('changing the email address emits an event', function () {
+ $user = $this->createUser();
+
+ Event::fake();
- /** @test */
- public function we_can_update_a_user_profile()
- {
- $user = $this->createUser();
+ $this->dispatch(new UpdateProfile($user, ['email' => 'foo@example.com']));
- $updatedUser = $this->dispatch(new UpdateProfile($user, ['bio' => 'my bio', 'name' => 'John Doe Junior']));
+ $this->assertDatabaseHas('users', ['id' => $user->id, 'email_verified_at' => null]);
- $this->assertEquals('my bio', $updatedUser->bio());
- $this->assertEquals('John Doe Junior', $updatedUser->name());
- }
-}
+ Event::assertDispatched(EmailAddressWasChanged::class, function (EmailAddressWasChanged $event) {
+ return $event->user->email === 'foo@example.com';
+ });
+});
diff --git a/tests/Integration/Mail/NewReplyEmailTest.php b/tests/Integration/Mail/NewReplyEmailTest.php
new file mode 100644
index 000000000..eb23d5fce
--- /dev/null
+++ b/tests/Integration/Mail/NewReplyEmailTest.php
@@ -0,0 +1,34 @@
+create();
+ $thread = $reply->replyAble();
+ $subscription = Subscription::factory()->create(['subscriptionable_id' => $thread->id]);
+
+ $email = (new NewReplyEmail($reply, $subscription, $thread->author()))->render();
+
+ expect($email)
+ ->toContain('Please make sure to mark the correct reply as the solution when your question gets answered.');
+});
+
+it('misses the note about solutions when the receiver is not the thread author', function () {
+ $reply = Reply::factory()->create();
+ $thread = $reply->replyAble();
+ $user = User::factory()->create();
+ $subscription = Subscription::factory()->create(['subscriptionable_id' => $thread->id]);
+
+ $email = (new NewReplyEmail($reply, $subscription, $user))->render();
+
+ expect($email)->not
+ ->toContain('Please make sure to mark the correct reply as the solution when your question gets answered.');
+});
diff --git a/tests/Integration/Markdown/ConverterTest.php b/tests/Integration/Markdown/ConverterTest.php
new file mode 100644
index 000000000..a5156e994
--- /dev/null
+++ b/tests/Integration/Markdown/ConverterTest.php
@@ -0,0 +1,22 @@
+make(Converter::class);
+
+ $html = $converter->toHtml('Hello @johndoe');
+
+ expect($html)->toBe('
Hello @johndoe
'.PHP_EOL);
+});
+
+it('does not render mentions when the block starts with HTML', function () {
+ $converter = app()->make(Converter::class);
+
+ $html = $converter->toHtml('
Hello @johndoe');
+
+ expect($html)->toBe('<form></form> Hello @johndoe'.PHP_EOL);
+});
diff --git a/tests/Integration/Models/ArticleTest.php b/tests/Integration/Models/ArticleTest.php
new file mode 100644
index 000000000..5d0f23a87
--- /dev/null
+++ b/tests/Integration/Models/ArticleTest.php
@@ -0,0 +1,74 @@
+count(2)->create();
+ $articles = Article::factory()->count(3)->create();
+
+ // Like the second article twice.
+ $articles[1]->likedBy($users[0]);
+ $articles[1]->likedBy($users[1]);
+
+ // Like the first article once.
+ $articles[0]->likedBy($users[0]);
+
+ $popularArticles = Article::popular()->get();
+
+ expect($popularArticles[0]->title)->toEqual($articles[1]->title);
+ expect($popularArticles[1]->title)->toEqual($articles[0]->title);
+ expect($popularArticles[2]->title)->toEqual($articles[2]->title);
+});
+
+test('we can get trending articles', function () {
+ $users = User::factory()->count(3)->create();
+ $articles = Article::factory()->count(3)->create();
+
+ // Like the first article by two users.
+ $articles[0]->likedBy($users[0]);
+ $articles[0]->likedBy($users[1]);
+
+ // Update the like timestamp outside of the trending window.
+ $articles[0]->likesRelation()->update(['created_at' => now()->subWeeks(2)]);
+ $articles[0]->unsetRelation('likesRelation');
+
+ // Like the remaining articles once, but inside the trending window.
+ $articles[1]->likedBy($users[0]);
+ $articles[2]->likedBy($users[0]);
+
+ $trendingArticles = Article::trending()->get();
+
+ // The first article has more likes, but outside the trending window
+ // so should be returned last.
+ expect($trendingArticles[0]->title)->toEqual($articles[1]->title);
+ expect($trendingArticles[1]->title)->toEqual($articles[2]->title);
+ expect($trendingArticles[2]->title)->toEqual($articles[0]->title);
+});
+
+test('pinned articles are returned first', function () {
+ $articleOne = Article::factory()->create([
+ 'submitted_at' => now(),
+ 'approved_at' => now(),
+ ]);
+ $articleTwo = Article::factory()->create([
+ 'submitted_at' => now()->subDay(),
+ 'approved_at' => now(),
+ ]);
+ $articleThree = Article::factory()->create([
+ 'submitted_at' => now()->subDays(3),
+ 'approved_at' => now(),
+ 'is_pinned' => true,
+ ]);
+
+ $recentArticles = Article::recent()->get();
+
+ expect($recentArticles[0]->title)->toEqual($articleOne->title);
+ expect($recentArticles[1]->title)->toEqual($articleTwo->title);
+ expect($recentArticles[2]->title)->toEqual($articleThree->title);
+});
diff --git a/tests/Integration/Models/ReplyTest.php b/tests/Integration/Models/ReplyTest.php
index c0c16644b..cf240a2b2 100644
--- a/tests/Integration/Models/ReplyTest.php
+++ b/tests/Integration/Models/ReplyTest.php
@@ -1,30 +1,24 @@
createUser();
+test('we can like and unlike reply', function () {
+ $user = $this->createUser();
- $reply = factory(Reply::class)->create();
+ $reply = Reply::factory()->create();
- $this->assertFalse($reply->isLikedBy($user));
+ expect($reply->isLikedBy($user))->toBeFalse();
- $reply->likedBy($user);
+ $reply->likedBy($user);
- $this->assertTrue($reply->isLikedBy($user));
+ expect($reply->isLikedBy($user))->toBeTrue();
- $reply->dislikedBy($user);
+ $reply->dislikedBy($user);
- $this->assertFalse($reply->isLikedBy($user));
- }
-}
+ expect($reply->isLikedBy($user))->toBeFalse();
+});
diff --git a/tests/Integration/Models/SubscriptionTest.php b/tests/Integration/Models/SubscriptionTest.php
index 2c0576cef..733b34912 100644
--- a/tests/Integration/Models/SubscriptionTest.php
+++ b/tests/Integration/Models/SubscriptionTest.php
@@ -1,22 +1,16 @@
create()->uuid();
+it('can get a subscription by its uuid', function () {
+ $uuid = Subscription::factory()->create()->uuid();
- $subscription = Subscription::findByUuidOrFail($uuid);
+ $subscription = Subscription::findByUuidOrFail($uuid);
- $this->assertEquals($uuid, $subscription->uuid());
- }
-}
+ expect($subscription->uuid())->toEqual($uuid);
+});
diff --git a/tests/Integration/Models/ThreadTest.php b/tests/Integration/Models/ThreadTest.php
index 586a633d5..ee7dac109 100644
--- a/tests/Integration/Models/ThreadTest.php
+++ b/tests/Integration/Models/ThreadTest.php
@@ -1,134 +1,182 @@
create(['slug' => 'foo']);
+
+ expect(Thread::findBySlug('foo'))->toBeInstanceOf(Thread::class);
+});
+
+it('can give an excerpt of its body', function () {
+ $thread = Thread::factory()->make(['body' => 'This is a pretty long text.']);
+
+ expect($thread->excerpt(7))->toEqual('This is...');
+});
+
+test('html in excerpts is html encoded', function () {
+ $thread = Thread::factory()->make(['body' => '
Thread body
']);
+
+ expect($thread->excerpt())->toEqual("<p>Thread body</p>\n");
+});
+
+test('its conversation is old when the oldest reply was six months ago', function () {
+ $thread = Thread::factory()->create();
+ $thread->repliesRelation()->save(Reply::factory()->make(['created_at' => now()->subMonths(7)]));
+
+ expect($thread->isConversationOld())->toBeTrue();
+
+ $thread = Thread::factory()->create();
+ $thread->repliesRelation()->save(Reply::factory()->make());
+
+ expect($thread->isConversationOld())->toBeFalse();
+});
+
+test('its conversation is old when there are no replies but the creation date was six months ago', function () {
+ $thread = Thread::factory()->create(['created_at' => now()->subMonths(7)]);
+
+ expect($thread->isConversationOld())->toBeTrue();
- /** @test */
- public function it_can_find_by_slug()
- {
- factory(Thread::class)->create(['slug' => 'foo']);
+ $thread = Thread::factory()->create();
- $this->assertInstanceOf(Thread::class, Thread::findBySlug('foo'));
- }
+ expect($thread->isConversationOld())->toBeFalse();
+});
- /** @test */
- public function it_can_give_an_excerpt_of_its_body()
- {
- $thread = factory(Thread::class)->make(['body' => 'This is a pretty long text.']);
+test('we can mark and unmark a reply as the solution', function () {
+ $thread = Thread::factory()->create();
+ $reply = Reply::factory()->create(['replyable_id' => $thread->id()]);
+ $user = $this->createUser();
- $this->assertEquals('This is...', $thread->excerpt(7));
- }
+ expect($thread->isSolutionReply($reply))->toBeFalse();
+ expect($thread->fresh()->wasResolvedBy($user))->toBeFalse();
- /** @test */
- public function its_conversation_is_old_when_the_oldest_reply_was_six_months_ago()
- {
- $thread = factory(Thread::class)->create();
- $thread->repliesRelation()->save(factory(Reply::class)->make(['created_at' => now()->subMonths(7)]));
+ $thread->markSolution($reply, $user);
- $this->assertTrue($thread->isConversationOld());
+ expect($thread->isSolutionReply($reply))->toBeTrue();
+ expect($thread->wasResolvedBy($user))->toBeTrue();
- $thread = factory(Thread::class)->create();
- $thread->repliesRelation()->save(factory(Reply::class)->make());
+ $thread->unmarkSolution();
- $this->assertFalse($thread->isConversationOld());
- }
+ expect($thread->isSolutionReply($reply))->toBeFalse();
+ expect($thread->fresh()->wasResolvedBy($user))->toBeFalse();
+});
- /** @test */
- public function its_conversation_is_old_when_there_are_no_replies_but_the_creation_date_was_six_months_ago()
- {
- $thread = factory(Thread::class)->create(['created_at' => now()->subMonths(7)]);
+it('can retrieve the latest threads in a correct order', function () {
+ $threadUpdatedYesterday = createThreadFromYesterday();
+ $threadFromToday = createThreadFromToday();
+ $threadFromTwoDaysAgo = createThreadFromTwoDaysAgo();
- $this->assertTrue($thread->isConversationOld());
+ $threads = Thread::feed();
- $thread = factory(Thread::class)->create();
+ $this->assertTrue($threadFromToday->is($threads->first()), 'First thread is incorrect');
+ $this->assertTrue($threadUpdatedYesterday->is($threads->slice(1)->first()), 'Second thread is incorrect');
+ $this->assertTrue($threadFromTwoDaysAgo->is($threads->last()), 'Last thread is incorrect');
+});
- $this->assertFalse($thread->isConversationOld());
- }
+it('bumps threads when a reply is added', function () {
+ $threadUpdatedYesterday = createThreadFromYesterday();
+ $threadFromToday = createThreadFromToday();
+ $threadFromTwoDaysAgo = createThreadFromTwoDaysAgo();
- /** @test */
- public function we_can_mark_and_unmark_a_reply_as_the_solution()
- {
- $thread = factory(Thread::class)->create();
- $reply = factory(Reply::class)->create(['replyable_id' => $thread->id()]);
+ $this->travelTo(Carbon::now()->addSecond());
- $this->assertFalse($thread->isSolutionReply($reply));
+ dispatch_sync(new CreateReply(Str::uuid(), 'Hello world', User::factory()->create(), $threadFromTwoDaysAgo));
- $thread->markSolution($reply);
+ $threads = Thread::feed();
- $this->assertTrue($thread->isSolutionReply($reply));
+ $this->assertTrue($threadFromTwoDaysAgo->is($threads->first()), 'First thread is incorrect');
+ $this->assertTrue($threadFromToday->is($threads->slice(1)->first()), 'Second thread is incorrect');
+ $this->assertTrue($threadUpdatedYesterday->is($threads->last()), 'Last thread is incorrect');
+});
- $thread->unmarkSolution();
+it('can retrieve only resolved threads', function () {
+ createThreadFromToday();
+ $resolvedThread = createResolvedThread();
- $this->assertFalse($thread->isSolutionReply($reply));
- }
+ $threads = Thread::feedQuery()->resolved()->get();
- /** @test */
- public function it_can_retrieve_the_latest_threads_in_a_correct_order()
- {
- $threadUpdatedYesterday = $this->createThreadFromYesterday();
- $threadFromToday = $this->createThreadFromToday();
- $threadFromTwoDaysAgo = $this->createThreadFromTwoDaysAgo();
+ expect($threads)->toHaveCount(1);
+ expect($resolvedThread->is($threads->first()))->toBeTrue();
+});
- $threads = Thread::feed();
+it('can retrieve only active threads', function () {
+ createThreadFromToday();
+ $activeThread = createActiveThread();
- $this->assertTrue($threadFromToday->matches($threads->first()), 'First thread is incorrect');
- $this->assertTrue($threadUpdatedYesterday->matches($threads->slice(1)->first()), 'Second thread is incorrect');
- $this->assertTrue($threadFromTwoDaysAgo->matches($threads->last()), 'Last thread is incorrect');
- }
+ $threads = Thread::feedQuery()->active()->get();
- /** @test */
- public function it_generates_a_slug_when_valid_url_characters_provided()
- {
- $thread = factory(Thread::class)->make(['slug' => 'Help with eloquent']);
+ expect($threads)->toHaveCount(1);
+ expect($activeThread->is($threads->first()))->toBeTrue();
+});
- $this->assertEquals('help-with-eloquent', $thread->slug());
- }
+it('generates a slug when valid url characters provided', function () {
+ $thread = Thread::factory()->make(['slug' => 'Help with eloquent']);
- /** @test */
- public function it_generates_a_unique_slug_when_valid_url_characters_provided()
- {
- $threadOne = factory(Thread::class)->create(['slug' => 'Help with eloquent']);
- $threadTwo = factory(Thread::class)->create(['slug' => 'Help with eloquent']);
+ expect($thread->slug())->toEqual('help-with-eloquent');
+});
- $this->assertEquals('help-with-eloquent-1', $threadTwo->slug());
- }
+it('generates a unique slug when valid url characters provided', function () {
+ $threadOne = Thread::factory()->create(['slug' => 'Help with eloquent']);
+ $threadTwo = Thread::factory()->create(['slug' => 'Help with eloquent']);
- /** @test */
- public function it_generates_a_slug_when_invalid_url_characters_provided()
- {
- $thread = factory(Thread::class)->make(['slug' => '한글 테스트']);
+ expect($threadTwo->slug())->toEqual('help-with-eloquent-1');
+});
- // When providing a slug with invalid url characters, a random 5 character string is returned.
- $this->assertRegExp('/\w{5}/', $thread->slug());
- }
+it('generates a slug when invalid url characters provided', function () {
+ $thread = Thread::factory()->make(['slug' => '한글 테스트']);
- private function createThreadFromToday(): Thread
- {
- $today = Carbon::now();
+ // When providing a slug with invalid url characters, a random 5 character string is returned.
+ expect($thread->slug())->toMatch('/\w{5}/');
+});
- return factory(Thread::class)->create(['created_at' => $today]);
- }
+// Helpers
+function createThreadFromToday(): Thread
+{
+ $today = Carbon::now();
+
+ return Thread::factory()->create(['created_at' => $today, 'last_activity_at' => $today]);
+}
+
+function createThreadFromYesterday(): Thread
+{
+ $yesterday = Carbon::yesterday();
+
+ return Thread::factory()->create(['created_at' => $yesterday, 'last_activity_at' => $yesterday]);
+}
- private function createThreadFromYesterday(): Thread
- {
- $yesterday = Carbon::yesterday();
+function createThreadFromTwoDaysAgo(): Thread
+{
+ $twoDaysAgo = Carbon::now()->subDay(2);
+
+ return Thread::factory()->create(['created_at' => $twoDaysAgo, 'last_activity_at' => $twoDaysAgo]);
+}
- return factory(Thread::class)->create(['created_at' => $yesterday]);
- }
+function createResolvedThread()
+{
+ $thread = createThreadFromToday();
+ $reply = Reply::factory()->create();
+ $user = User::factory()->create();
+ $thread->markSolution($reply, $user);
- private function createThreadFromTwoDaysAgo(): Thread
- {
- $twoDaysAgo = Carbon::now()->subDay(2);
+ return $thread;
+}
+
+function createActiveThread()
+{
+ $thread = createThreadFromToday();
+ $reply = Reply::factory()->create();
+ $reply->to($thread);
+ $reply->save();
- return factory(Thread::class)->create(['created_at' => $twoDaysAgo]);
- }
+ return $thread;
}
diff --git a/tests/Integration/Models/UserTest.php b/tests/Integration/Models/UserTest.php
index 3783e59a1..eba990694 100644
--- a/tests/Integration/Models/UserTest.php
+++ b/tests/Integration/Models/UserTest.php
@@ -1,70 +1,117 @@
createUser(['username' => 'johndoe']);
+
+ expect(User::findByUsername('johndoe'))->toBeInstanceOf(User::class);
+});
+
+it('can find by email address', function () {
+ $this->createUser(['email' => 'john@example.com']);
+
+ expect(User::findByEmailAddress('john@example.com'))->toBeInstanceOf(User::class);
+});
+
+it('can return the amount of solutions that were given', function () {
+ $user = User::factory()->create();
+ createTwoSolutionReplies($user);
+
+ expect($user->countSolutions())->toEqual(2);
+});
+
+it('can determine if a given user is the logged in user', function () {
+ $user = $this->login();
+
+ expect($user->isLoggedInUser())->toBeTrue();
+});
+
+it('can determine if a given user is not the logged in user', function () {
+ $user = $this->createUser();
+
+ $this->login([
+ 'username' => 'janedoe',
+ 'email' => 'jane@example.com',
+ ]);
+
+ expect($user->isLoggedInUser())->toBeFalse();
+});
+
+it('only returns approved articles for a user', function () {
+ $user = $this->createUser();
+
+ Article::factory()->approved()->create(['author_id' => $user->id]);
+ Article::factory()->unapproved()->create(['author_id' => $user->id]);
+
+ expect($user->latestArticles())->toHaveCount(1);
+ expect($user->countArticles())->toBe(1);
+});
+
+it('excludes author solutions from mostSolutions count', function () {
+ $user = $this->login();
+ $thread = Thread::factory()->create([
+ 'author_id' => $user->id(),
+ ]);
+ $reply = Reply::factory()->create([
+ 'author_id' => $user->id(),
+ ]);
+
+ $this->dispatch(new MarkThreadSolution($thread, $reply, $user));
+
+ expect($user->mostSolutions()->find($user->id()))->toBeNull();
+
+ $otherThread = Thread::factory()->create();
+
+ $this->dispatch(new MarkThreadSolution($otherThread, $reply, $user));
+
+ expect($user->mostSolutions()->find($user->id())->solutions_count)->toBe(1);
+})->group('emeka');
+
+it('only shows users with solutions in the widget', function () {
+ $userWithSolution = User::factory()->create();
+ $userWithoutSolution = User::factory()->create();
+ $anotherUserWithSolution = User::factory()->create();
+
+ $thread1 = Thread::factory()->create();
+ $thread2 = Thread::factory()->create();
+
+ $reply1 = Reply::factory()->create([
+ 'author_id' => $userWithSolution->id,
+ ]);
+
+ $reply2 = Reply::factory()->create([
+ 'author_id' => $anotherUserWithSolution->id,
+ ]);
+
+ $this->dispatch(new MarkThreadSolution($thread1, $reply1, $userWithSolution));
+ $this->dispatch(new MarkThreadSolution($thread2, $reply2, $anotherUserWithSolution));
+
+ $topMembers = User::mostSolutions(365)->take(5)->get();
+
+ expect($topMembers)->toHaveCount(2)
+ ->and($topMembers->pluck('id'))->toContain($userWithSolution->id)
+ ->and($topMembers->pluck('id'))->toContain($anotherUserWithSolution->id)
+ ->and($topMembers->pluck('id'))->not->toContain($userWithoutSolution->id);
+})->group('widget');
+
+// Helpers
+function createTwoSolutionReplies(User $user)
{
- use DatabaseMigrations;
-
- /** @test */
- public function it_can_find_by_username()
- {
- $this->createUser(['username' => 'johndoe']);
-
- $this->assertInstanceOf(User::class, User::findByUsername('johndoe'));
- }
-
- /** @test */
- public function it_can_find_by_email_address()
- {
- $this->createUser(['email' => 'john@example.com']);
-
- $this->assertInstanceOf(User::class, User::findByEmailAddress('john@example.com'));
- }
-
- /** @test */
- public function it_can_return_the_amount_of_solutions_that_were_given()
- {
- $user = factory(User::class)->create();
- $this->createTwoSolutionReplies($user);
-
- $this->assertEquals(2, $user->countSolutions());
- }
-
- /** @test */
- public function it_can_determine_if_a_given_user_is_the_logged_in_user()
- {
- $user = $this->login();
-
- $this->assertTrue($user->isLoggedInUser());
- }
-
- /** @test */
- public function it_can_determine_if_a_given_user_is_not_the_logged_in_user()
- {
- $user = $this->createUser();
- $this->login([
- 'username' => 'janedoe',
- 'email' => 'jane@example.com',
- ]);
-
- $this->assertFalse($user->isLoggedInUser());
- }
-
- private function createTwoSolutionReplies(User $user)
- {
- $thread = factory(Thread::class)->create();
- $reply = factory(Reply::class)->create(['replyable_id' => $thread->id(), 'author_id' => $user->id()]);
- $thread->markSolution($reply);
-
- $thread = factory(Thread::class)->create();
- $reply = factory(Reply::class)->create(['replyable_id' => $thread->id(), 'author_id' => $user->id()]);
- $thread->markSolution($reply);
- }
+ $thread = Thread::factory()->create();
+ $reply = Reply::factory()->create(['replyable_id' => $thread->id(), 'author_id' => $user->id()]);
+ $thread->markSolution($reply, $user);
+
+ $thread = Thread::factory()->create();
+ $reply = Reply::factory()->create(['replyable_id' => $thread->id(), 'author_id' => $user->id()]);
+ $thread->markSolution($reply, $user);
}
diff --git a/tests/Integration/Queries/SearchThreadsTest.php b/tests/Integration/Queries/SearchThreadsTest.php
deleted file mode 100644
index 23b8dbc4e..000000000
--- a/tests/Integration/Queries/SearchThreadsTest.php
+++ /dev/null
@@ -1,23 +0,0 @@
-create(['subject' => 'Optimizing Eloquent']);
- factory(Thread::class)->create(['body' => 'What can we do to optimize the behavior or Eloquent?']);
-
- $this->assertCount(1, SearchThreads::get('optimizing'));
- $this->assertCount(1, SearchThreads::get('behavior'));
- }
-}
diff --git a/tests/Integration/Queries/SearchUsersTest.php b/tests/Integration/Queries/SearchUsersTest.php
index d7b6ac86f..c79296498 100644
--- a/tests/Integration/Queries/SearchUsersTest.php
+++ b/tests/Integration/Queries/SearchUsersTest.php
@@ -1,23 +1,17 @@
create(['name' => 'Freek Murze', 'email' => 'freek@freek.com']);
- factory(User::class)->create(['name' => 'Frederick Vanbrabant', 'email' => 'vanbra@vanbra.com']);
+it('can search by name or email or username', function () {
+ User::factory()->create(['name' => 'Freek Murze', 'email' => 'freek@freek.com']);
+ User::factory()->create(['name' => 'Frederick Vanbrabant', 'email' => 'vanbra@vanbra.com']);
- $this->assertCount(2, SearchUsers::get('fre'));
- $this->assertCount(1, SearchUsers::get('van'));
- }
-}
+ expect(SearchUsers::get('fre'))->toHaveCount(2);
+ expect(SearchUsers::get('van'))->toHaveCount(1);
+});
diff --git a/tests/Integration/Rules/PasscheckRuleTest.php b/tests/Integration/Rules/PasscheckRuleTest.php
index 475c147fe..ee3c11679 100644
--- a/tests/Integration/Rules/PasscheckRuleTest.php
+++ b/tests/Integration/Rules/PasscheckRuleTest.php
@@ -1,34 +1,22 @@
login(['password' => bcrypt('foo')]);
- $rule = new PasscheckRule;
-
- $result = $rule->passes('password', 'foo');
+uses(TestCase::class);
+uses(RefreshDatabase::class);
- $this->assertTrue($result);
- }
+it('passes when the password is correct', function () {
+ $this->login(['password' => bcrypt('foo')]);
+ $rule = new PasscheckRule;
- /** @test */
- public function it_fails_when_the_password_is_incorrect()
- {
- $this->login();
- $rule = new PasscheckRule;
+ $rule->validate('password', 'foo', fn () => throw new Exception);
+})->throwsNoExceptions();
- $result = $rule->passes('password', 'foo');
+it('fails when the password is incorrect', function () {
+ $this->login();
+ $rule = new PasscheckRule;
- $this->assertFalse($result);
- }
-}
+ $rule->validate('password', 'foo', fn () => throw new Exception);
+})->throws(Exception::class);
diff --git a/tests/Pest.php b/tests/Pest.php
new file mode 100644
index 000000000..1b67cf2d1
--- /dev/null
+++ b/tests/Pest.php
@@ -0,0 +1,46 @@
+beforeEach(function () {
+// Http::preventStrayRequests();
+// })->in('Feature', 'Integration');
+
+/*
+|--------------------------------------------------------------------------
+| Expectations
+|--------------------------------------------------------------------------
+|
+| When you're writing tests, you often need to check that values meet certain conditions. The
+| "expect()" function gives you access to a set of "expectations" methods that you can use
+| to assert different things. Of course, you may extend the Expectation API at any time.
+|
+*/
+
+/** @link https://pestphp.com/docs/expectations#custom-expectations */
+
+/*
+|--------------------------------------------------------------------------
+| Functions
+|--------------------------------------------------------------------------
+|
+| While Pest is very powerful out-of-the-box, you may have some testing code specific to your
+| project that you don't want to repeat in every file. Here you can also expose helpers as
+| global functions to help you to reduce the number of lines of code in your test files.
+|
+*/
+
+/** @link https://pestphp.com/docs/helpers */
diff --git a/tests/TestCase.php b/tests/TestCase.php
index d77f1880d..f14f9bd61 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -4,12 +4,13 @@
use Illuminate\Foundation\Testing\TestCase as IlluminateTestCase;
-abstract class TestCase extends IlluminateTestCase
+class TestCase extends IlluminateTestCase
{
- use CreatesApplication, CreatesUsers, HttpAssertions;
+ use CreatesUsers;
+ use HttpAssertions;
- protected function dispatch($job)
+ protected function dispatch($job): void
{
- return $job->handle();
+ $job->handle();
}
}
diff --git a/tests/Unit/Rules/DoesNotContainUrlRuleTest.php b/tests/Unit/Rules/DoesNotContainUrlRuleTest.php
index 582961ce6..0972a47ee 100644
--- a/tests/Unit/Rules/DoesNotContainUrlRuleTest.php
+++ b/tests/Unit/Rules/DoesNotContainUrlRuleTest.php
@@ -1,33 +1,15 @@
assertFalse(
- (new DoesNotContainUrlRule())->passes('foo', 'This is a string http://example.com with an url in it.')
- );
- }
+it('detects a url in a string', function () {
+ (new DoesNotContainUrlRule)->validate('foo', 'This is a string http://example.com with an url in it.', fn () => throw new Exception);
+})->throws(Exception::class);
- /** @test */
- public function it_passes_when_no_url_is_present()
- {
- $this->assertTrue(
- (new DoesNotContainUrlRule())->passes('foo', 'This is a string without an url in it.')
- );
- }
+it('passes when no url is present', function () {
+ (new DoesNotContainUrlRule)->validate('foo', 'This is a string without an url in it.', fn () => throw new Exception);
+})->throwsNoExceptions();
- /** @test */
- public function it_passes_when_extra_spaces_are_present()
- {
- $this->assertTrue(
- (new DoesNotContainUrlRule())->passes('foo', 'This is a string with extra spaces.')
- );
- }
-}
+it('passes when extra spaces are present', function () {
+ (new DoesNotContainUrlRule)->validate('foo', 'This is a string with extra spaces.', fn () => throw new Exception);
+})->throwsNoExceptions();
diff --git a/tests/Unit/Rules/HttpImageRuleTest.php b/tests/Unit/Rules/HttpImageRuleTest.php
index 2ceb225d6..82ab2a6ea 100644
--- a/tests/Unit/Rules/HttpImageRuleTest.php
+++ b/tests/Unit/Rules/HttpImageRuleTest.php
@@ -1,25 +1,11 @@
assertTrue(
- (new HttpImageRule())->passes('body', 'some text ')
- );
- }
+it('passes when no http links are detected', function () {
+ (new HttpImageRule)->validate('body', 'some text ', fn () => throw new Exception);
+})->throwsNoExceptions();
- /** @test */
- public function it_fails_when_http_links_are_detected()
- {
- $this->assertFalse(
- (new HttpImageRule())->passes('body', 'some text ')
- );
- }
-}
+it('fails when http links are detected', function () {
+ (new HttpImageRule)->validate('body', 'some text ', fn () => throw new Exception);
+})->throws(Exception::class);
diff --git a/tests/Unit/Rules/InvalidMentionRuleTest.php b/tests/Unit/Rules/InvalidMentionRuleTest.php
new file mode 100644
index 000000000..8bce0e929
--- /dev/null
+++ b/tests/Unit/Rules/InvalidMentionRuleTest.php
@@ -0,0 +1,51 @@
+validate('body', $body, fn () => throw new Exception));
+})->with([
+ 'Hello, I\'m looking for some help',
+ 'I\'ve seen [this link](https://example.com), is it legit?',
+ "### Help needed!
+ \n
+ Hello @joedixon I am hoping you can help.
+ \n
+ Here is some **bold** and _italic_ text
+ \n
+ > I'm quoting you now!
+ \n
+ `code goes here`
+ \n
+ ```javascript
+ const string = 'more code goes here'
+ ```
+ \n
+ [link](https://example.com)
+ \n
+ ",
+])->throwsNoExceptions();
+
+it('fails when invalid mentions are detected', function ($body) {
+ expect((new InvalidMentionRule)->validate('body', $body, fn () => throw new Exception));
+})->with([
+ '[@driesvints](https://somethingnasty.com)',
+ 'Hey [@joedixon](https://somethingnasty.com), is it legit?',
+ "### Help needed!
+ \n
+ Hello [@joedixon](https://somethingnasty.com) I am hoping you can help.
+ \n
+ Here is some **bold** and _italic_ text
+ \n
+ > I'm quoting you now!
+ \n
+ `code goes here`
+ \n
+ ```javascript
+ const string = 'more code goes here'
+ ```
+ \n
+ [link](https://example.com)
+ \n
+ ",
+])->throws(Exception::class);
diff --git a/tests/Unit/Social/GitHubUserTest.php b/tests/Unit/Social/GitHubUserTest.php
new file mode 100644
index 000000000..ffed64af6
--- /dev/null
+++ b/tests/Unit/Social/GitHubUserTest.php
@@ -0,0 +1,27 @@
+ Carbon::now()->subWeeks(3)]);
+
+ expect($user->isTooYoung())->toBeFalse();
+});
+
+it('can determine if the user is younger than two weeks', function () {
+ $user = new GitHubUser(['created_at' => Carbon::now()->subWeek()]);
+
+ expect($user->isTooYoung())->toBeTrue();
+});
+
+it('can determine if the user has public repositories', function (int $numberOfRepos, bool $expected) {
+ $user = new GitHubUser(['public_repos' => $numberOfRepos]);
+
+ expect($user->hasPublicRepositories())->toBe($expected);
+})->with([
+ [0, false],
+ [1, true],
+ [2, true],
+ [3, true],
+]);
diff --git a/tests/Unit/Social/GithubUserTest.php b/tests/Unit/Social/GithubUserTest.php
deleted file mode 100644
index 4f39e3aa3..000000000
--- a/tests/Unit/Social/GithubUserTest.php
+++ /dev/null
@@ -1,26 +0,0 @@
- Carbon::now()->subWeeks(3)]);
-
- $this->assertFalse($user->isTooYoung());
- }
-
- /** @test */
- public function it_can_determine_if_the_user_is_younger_than_two_weeks()
- {
- $user = new GithubUser(['created_at' => Carbon::now()->subWeek()]);
-
- $this->assertTrue($user->isTooYoung());
- }
-}
diff --git a/tests/Unit/UserTest.php b/tests/Unit/UserTest.php
deleted file mode 100644
index e3c9bd975..000000000
--- a/tests/Unit/UserTest.php
+++ /dev/null
@@ -1,17 +0,0 @@
- 'foo']);
-
- $this->assertTrue($user->hasPassword());
- }
-}
diff --git a/tests/stubs/generate_social_share_image.png b/tests/stubs/generate_social_share_image.png
new file mode 100644
index 000000000..6f46569d3
Binary files /dev/null and b/tests/stubs/generate_social_share_image.png differ
diff --git a/vite.config.js b/vite.config.js
new file mode 100644
index 000000000..772f6645b
--- /dev/null
+++ b/vite.config.js
@@ -0,0 +1,13 @@
+import { defineConfig } from 'vite';
+import laravel from 'laravel-vite-plugin';
+import tailwindcss from "@tailwindcss/vite";
+
+export default defineConfig({
+ plugins: [
+ tailwindcss(),
+ laravel({
+ input: ['resources/css/app.css', 'resources/js/app.js'],
+ refresh: true,
+ }),
+ ],
+});
diff --git a/webpack.mix.js b/webpack.mix.js
deleted file mode 100644
index 196876975..000000000
--- a/webpack.mix.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const mix = require('laravel-mix');
-const FlareWebpackPluginSourcemap = require("@flareapp/flare-webpack-plugin-sourcemap");
-
-mix.js('resources/js/app.js', 'public/js')
- .webpackConfig({
- plugins: [
- new FlareWebpackPluginSourcemap({ key: process.env.MIX_FLARE_KEY })
- ],
- })
- .sourceMaps(true, 'hidden-source-map')
- .postCss('resources/css/app.css', 'public/css', [
- require('postcss-import'),
- require('tailwindcss'),
- ])
- .version();
+ }}){kind=logo}
-
+ 
+