diff --git a/routes/web.php b/routes/web.php
index ad4fb9067..223d97c66 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -207,10 +207,6 @@ Route::middleware('auth')->group(function () {
Route::get('/', [HomeController::class, 'index']);
Route::get('/home', [HomeController::class, 'index']);
- // Settings
- Route::get('/settings', [SettingController::class, 'index'])->name('settings');
- Route::post('/settings', [SettingController::class, 'update']);
-
// Maintenance
Route::get('/settings/maintenance', [MaintenanceController::class, 'index']);
Route::delete('/settings/maintenance/cleanup-images', [MaintenanceController::class, 'cleanupImages']);
@@ -267,6 +263,11 @@ Route::middleware('auth')->group(function () {
Route::put('/settings/webhooks/{id}', [WebhookController::class, 'update']);
Route::get('/settings/webhooks/{id}/delete', [WebhookController::class, 'delete']);
Route::delete('/settings/webhooks/{id}', [WebhookController::class, 'destroy']);
+
+ // Settings
+ Route::redirect('/settings', '/settings/features')->name('settings');
+ Route::get('/settings/{category}', [SettingController::class, 'index']);
+ Route::post('/settings/{category}', [SettingController::class, 'update']);
});
// MFA routes
diff --git a/tests/Auth/AuthTest.php b/tests/Auth/AuthTest.php
index fd953021d..0ab6d0e8c 100644
--- a/tests/Auth/AuthTest.php
+++ b/tests/Auth/AuthTest.php
@@ -202,7 +202,7 @@ class AuthTest extends TestCase
{
$this->assertFalse(setting('registration-role'));
- $resp = $this->asAdmin()->get('/settings');
+ $resp = $this->asAdmin()->get('/settings/registration');
$resp->assertElementContains('select[name="setting-registration-role"] option[value="0"][selected]', '-- None --');
}
diff --git a/tests/Permissions/RolesTest.php b/tests/Permissions/RolesTest.php
index f69b5603c..fe2139e59 100644
--- a/tests/Permissions/RolesTest.php
+++ b/tests/Permissions/RolesTest.php
@@ -27,7 +27,7 @@ class RolesTest extends TestCase
public function test_admin_can_see_settings()
{
- $this->asAdmin()->get('/settings')->assertSee('Settings');
+ $this->asAdmin()->get('/settings/features')->assertSee('Settings');
}
public function test_cannot_delete_admin_role()
@@ -58,7 +58,7 @@ class RolesTest extends TestCase
$testRoleUpdateName = 'An Super Updated role';
// Creation
- $resp = $this->asAdmin()->get('/settings');
+ $resp = $this->asAdmin()->get('/settings/features');
$resp->assertElementContains('a[href="' . url('/settings/roles') . '"]', 'Roles');
$resp = $this->get('/settings/roles');
@@ -247,13 +247,13 @@ class RolesTest extends TestCase
public function test_settings_manage_permission()
{
- $this->actingAs($this->user)->get('/settings')->assertRedirect('/');
+ $this->actingAs($this->user)->get('/settings/features')->assertRedirect('/');
$this->giveUserPermissions($this->user, ['settings-manage']);
- $this->get('/settings')->assertOk();
+ $this->get('/settings/features')->assertOk();
- $resp = $this->post('/settings', []);
- $resp->assertRedirect('/settings');
- $resp = $this->get('/settings');
+ $resp = $this->post('/settings/features', []);
+ $resp->assertRedirect('/settings/features');
+ $resp = $this->get('/settings/features');
$resp->assertSee('Settings saved');
}
@@ -762,7 +762,7 @@ class RolesTest extends TestCase
public function test_public_role_visible_in_default_role_setting()
{
- $this->asAdmin()->get('/settings')
+ $this->asAdmin()->get('/settings/registration')
->assertElementExists('[data-system-role-name="admin"]')
->assertElementExists('[data-system-role-name="public"]');
}
diff --git a/tests/Settings/FooterLinksTest.php b/tests/Settings/FooterLinksTest.php
index f1b5d4294..4b822ba4c 100644
--- a/tests/Settings/FooterLinksTest.php
+++ b/tests/Settings/FooterLinksTest.php
@@ -8,13 +8,13 @@ class FooterLinksTest extends TestCase
{
public function test_saving_setting()
{
- $resp = $this->asAdmin()->post('/settings', [
+ $resp = $this->asAdmin()->post('/settings/customization', [
'setting-app-footer-links' => [
['label' => 'My custom link 1', 'url' => 'https://example.com/1'],
['label' => 'My custom link 2', 'url' => 'https://example.com/2'],
],
]);
- $resp->assertRedirect('/settings');
+ $resp->assertRedirect('/settings/customization');
$result = setting('app-footer-links');
$this->assertIsArray($result);
@@ -30,7 +30,7 @@ class FooterLinksTest extends TestCase
['label' => 'Another Link', 'url' => 'https://example.com/link-b'],
]]);
- $resp = $this->asAdmin()->get('/settings');
+ $resp = $this->asAdmin()->get('/settings/customization');
$resp->assertSee('value="My custom link"', false);
$resp->assertSee('value="Another Link"', false);
$resp->assertSee('value="https://example.com/link-a"', false);
diff --git a/tests/Settings/SettingsTest.php b/tests/Settings/SettingsTest.php
new file mode 100644
index 000000000..5d8c36996
--- /dev/null
+++ b/tests/Settings/SettingsTest.php
@@ -0,0 +1,39 @@
+asAdmin()->get('/settings');
+
+ $resp->assertRedirect('/settings/features');
+ }
+
+ public function test_settings_category_links_work_as_expected()
+ {
+ $this->asAdmin();
+ $categories = [
+ 'features' => 'Features & Security',
+ 'customization' => 'Customization',
+ 'registration' => 'Registration',
+ ];
+
+ foreach ($categories as $category => $title) {
+ $resp = $this->get("/settings/{$category}");
+ $resp->assertElementContains('h1', $title);
+ $resp->assertElementExists("form[action$=\"/settings/{$category}\"]");
+ }
+ }
+
+ public function test_not_found_setting_category_throws_404()
+ {
+ $resp = $this->asAdmin()->get('/settings/biscuits');
+
+ $resp->assertStatus(404);
+ $resp->assertSee('Page Not Found');
+ }
+}
\ No newline at end of file
diff --git a/tests/Uploads/ImageTest.php b/tests/Uploads/ImageTest.php
index 32f79e9e0..01754d2de 100644
--- a/tests/Uploads/ImageTest.php
+++ b/tests/Uploads/ImageTest.php
@@ -314,8 +314,8 @@ class ImageTest extends TestCase
$galleryFile = $this->getTestImage('my-system-test-upload.png');
$expectedPath = public_path('uploads/images/system/' . date('Y-m') . '/my-system-test-upload.png');
- $upload = $this->call('POST', '/settings', [], [], ['app_logo' => $galleryFile], []);
- $upload->assertRedirect('/settings');
+ $upload = $this->call('POST', '/settings/customization', [], [], ['app_logo' => $galleryFile], []);
+ $upload->assertRedirect('/settings/customization');
$this->assertTrue(file_exists($expectedPath), 'Uploaded image not found at path: ' . $expectedPath);