Skip to content

fix(presets): attribute core templates with overrides-prefixed names correctly #5129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mnriem merged 1 commit into from
Oct 26, 2026
+10 −1
Merged

fix(presets): attribute core templates with overrides-prefixed names correctly #5129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/specify_cli/presets/_resolver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ def resolve_with_source(
resolved_str = str(resolved)

# Determine source attribution
if str(self.overrides_dir) in resolved_str:
if resolved.is_relative_to(self.overrides_dir):
return {"path": resolved_str, "source": "project override"}

if str(self.presets_dir) in resolved_str and self.presets_dir.exists():
Expand Down
9 changes: 9 additions & 0 deletions tests/specify_cli/presets/test_resolver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,15 @@ def test_resolve_with_source_core(self, project_dir):
assert result["source"] == "core"
assert "spec-template.md" in result["path"]

def test_resolve_with_source_core_name_starting_with_overrides(self, project_dir):
"""A core filename sharing the overrides prefix is still core."""
core = project_dir / ".specify" / "templates" / "overrides-report.md"
core.write_text("# Core report\n")

result = PresetResolver(project_dir).resolve_with_source("overrides-report")

assert result == {"path": str(core), "source": "core"}

def test_resolve_with_source_override(self, project_dir):
"""Test resolve_with_source for override template."""
overrides_dir = project_dir / ".specify" / "templates" / "overrides"
Expand Down
Loading