-
Notifications
You must be signed in to change notification settings - Fork 2k
fix: safe-empty restock default so restock notification tokens work for any watch #4249
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.
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
dgtlmoon
merged 2 commits into
dgtlmoon:master
from
ebarkhordar:fix/3490-restock-token-safe-empty
Jul 13, 2026
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
changedetectionio/tests/test_notification_restock_token.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| """ | ||
| Regression tests for issue #3490 - "'restock' is undefined". | ||
|
|
||
| A `{{ restock.price }}` token is accepted in a per-watch notification body (restock | ||
| watches inject the value via processors/restock_diff extra_notification_token_values()), | ||
| but the same token in a system-wide / non-restock context had no default. That made it: | ||
|
|
||
| 1. crash rendering at send time for a non-restock watch (UndefinedError), and | ||
| 2. fail save-time validation of a system-wide notification body (ValidationError), | ||
|
|
||
| because `restock` was absent from NotificationContextData's default token set. | ||
|
|
||
| These tests exercise the real send-time (jinja2_custom.render) and save-time | ||
| (ValidateJinja2Template) code paths. They fail on a tree without the safe-empty | ||
| default and pass with it. | ||
| """ | ||
| from changedetectionio.notification_service import NotificationContextData | ||
|
|
||
|
|
||
| def test_restock_token_present_in_default_context(): | ||
| assert 'restock' in NotificationContextData() | ||
|
|
||
|
|
||
| def test_restock_token_renders_safely_for_non_restock_watch(): | ||
| """Send time: a non-restock watch must not crash on {{ restock.price }}.""" | ||
| from changedetectionio.jinja2_custom import render as jinja_render | ||
|
|
||
| ctx = NotificationContextData() # a plain, non-restock watch context | ||
| rendered = jinja_render(template_str="Price is {{ restock.price }}", **ctx) | ||
| # The undefined price renders as empty rather than raising UndefinedError. | ||
| assert rendered == "Price is " | ||
|
|
||
|
|
||
| def test_restock_token_validates_in_system_settings(): | ||
| """Save time: a system-wide body using {{ restock.price }} must validate.""" | ||
| from changedetectionio.forms import ValidateJinja2Template | ||
|
|
||
| class _Field: | ||
| def __init__(self, data): | ||
| self.data = data | ||
|
|
||
| # Raised ValidationError before the fix; must not raise now. | ||
| ValidateJinja2Template()(None, _Field("Price is {{ restock.price }}")) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.