fix: merge main branch and renumber migration 027→037
Resolve 3 merge conflicts and renumber the automation_hooks migration to follow main's migration chain (036_add_document_translation_fields). Conflicts resolved: - app/api/__init__.py: add automation_router alongside main's new routers - app/utils/settings_service.py: add automation_hooks_enabled alongside compliance_enabled - tests/conftest.py: add AutomationHook alongside AuditLog/ComplianceTemplate imports Migration renumbered: - 027_add_automation_hooks → 037_add_automation_hooks - down_revision: 026_add_scheduled_jobs → 036_add_document_translation_fields Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
This commit is contained in:
@@ -345,7 +345,7 @@ class TestSettingsPageWizardLink:
|
||||
template_path = Path(__file__).resolve().parent.parent / "frontend" / "templates" / "settings.html"
|
||||
content = template_path.read_text()
|
||||
assert "/database-wizard" in content
|
||||
assert "DB Wizard" in content
|
||||
assert "settings.db_wizard_btn" in content # i18n key (resolves to "DB Wizard")
|
||||
|
||||
def test_settings_template_has_help_link_rendering(self):
|
||||
"""Test that the settings template renders help_link metadata."""
|
||||
|
||||
Reference in New Issue
Block a user