Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions file_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,17 +236,15 @@ def load_linked_resources(template_dirs: list[str], resources_list):
content = open_from(template_dirs, file_name)

if content is None:
raise FileNotFoundError(
f"""
raise FileNotFoundError(f"""
Resource file {file_name} not found. Resource files are searched in the following order (highest to lowest precedence):

1. The directory containing your .plain file
2. The directory specified by --template-dir (if provided)
3. The built-in 'standard_template_library' directory

Please ensure that the resource exists in one of these locations, or specify the correct --template-dir if using custom templates.
"""
)
""")

linked_resources[file_name] = content

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies = [
dev = [
"pytest==8.3.5",
"flake8==7.0.0",
"black==24.3.0",
"black==26.3.1",
"isort==5.13.2",
"mypy==1.11.2",
]
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ transitions==0.9.3

# Development dependencies
flake8==7.0.0
black==24.3.0
black==26.3.1
isort==5.13.2
mypy==1.11.2
66 changes: 22 additions & 44 deletions tests/test_git_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,15 @@ def test_single_file_change(temp_repo):
result = diff(temp_repo, "1.1")

assert "test.txt" in result
expected_diff = dedent(
"""
expected_diff = dedent("""
--- a/test.txt
+++ b/test.txt
@@ -1,3 +1,3 @@
-initial content
+modified content
line2
line3
"""
).strip()
""").strip()
assert result["test.txt"] == expected_diff


Expand All @@ -98,31 +96,27 @@ def test_multiple_file_changes(temp_repo):

# Check first file
assert "test.txt" in result
expected_diff1 = dedent(
"""
expected_diff1 = dedent("""
--- a/test.txt
+++ b/test.txt
@@ -1,3 +1,2 @@
-initial content
+file1 modified
line2
-line3
"""
).strip()
""").strip()
assert result["test.txt"] == expected_diff1

# Check second file
assert "file2.txt" in result
expected_diff2 = dedent(
"""
expected_diff2 = dedent("""
--- /dev/null
+++ b/file2.txt
@@ -0,0 +1,2 @@
+file2 modified
+line2
\\ No newline at end of file
"""
).strip()
""").strip()
assert result["file2.txt"] == expected_diff2


Expand Down Expand Up @@ -157,44 +151,38 @@ def test_multiple_commits_diff(temp_repo):

# Check first file
assert "test.txt" in result
expected_diff1 = dedent(
"""
expected_diff1 = dedent("""
--- a/test.txt
+++ b/test.txt
@@ -1,3 +1,2 @@
-initial content
+file1 frid1.2 refactored version
line2
-line3
"""
).strip()
""").strip()
assert result["test.txt"] == expected_diff1

# Check second file
assert "file2.txt" in result
expected_diff2 = dedent(
"""
expected_diff2 = dedent("""
--- a/file2.txt
+++ b/file2.txt
@@ -1,2 +1,2 @@
-file2 frid1.1 refactored version
+file2 frid1.2 version
line2
"""
).strip()
""").strip()
assert result["file2.txt"] == expected_diff2

# Check third file
assert "file3.txt" in result
expected_diff3 = dedent(
"""
expected_diff3 = dedent("""
--- /dev/null
+++ b/file3.txt
@@ -0,0 +1,2 @@
+file3 frid1.2 new file
+line2
"""
).strip()
""").strip()
assert result["file3.txt"] == expected_diff3


Expand All @@ -213,27 +201,23 @@ def test_diff_without_previous_frid_and_no_base_folder(empty_repo):
result = diff(empty_repo)

assert "new.txt" in result
expected_diff = dedent(
"""
expected_diff = dedent("""
--- /dev/null
+++ b/new.txt
@@ -0,0 +1,2 @@
+new file content
+line2
"""
).strip()
""").strip()
assert result["new.txt"] == expected_diff

assert "new2.txt" in result
expected_diff2 = dedent(
"""
expected_diff2 = dedent("""
--- /dev/null
+++ b/new2.txt
@@ -0,0 +1,2 @@
+new file content
+line2
"""
).strip()
""").strip()
assert result["new2.txt"] == expected_diff2


Expand All @@ -251,16 +235,14 @@ def test_diff_without_previous_frid_and_base_folder(temp_repo):
result = diff(temp_repo)

assert "new.txt" in result
expected_diff = dedent(
"""
expected_diff = dedent("""
--- a/new.txt
+++ b/new.txt
@@ -1,2 +1,2 @@
-base folder content
+updated base folder content
line2
"""
).strip()
""").strip()
assert result["new.txt"] == expected_diff


Expand All @@ -276,15 +258,13 @@ def test_new_file(temp_repo):
result = diff(temp_repo, "1.1")

assert "new.txt" in result
expected_diff = dedent(
"""
expected_diff = dedent("""
--- /dev/null
+++ b/new.txt
@@ -0,0 +1,2 @@
+new file content
+line2
"""
).strip()
""").strip()
assert result["new.txt"] == expected_diff


Expand All @@ -300,16 +280,14 @@ def test_deleted_file(temp_repo):
result = diff(temp_repo, "1.1")

assert "test.txt" in result
expected_diff = dedent(
"""
expected_diff = dedent("""
--- a/test.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-initial content
-line2
-line3
"""
).strip()
""").strip()
assert result["test.txt"] == expected_diff


Expand Down
Loading