cphipps/changedetection.io
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix - {diff} and {diff_full} notifications tokens were not always including the full output

Browse Source
This commit is contained in:
dgtlmoon
2022-03-29 19:18:26 +02:00
committed by GitHub
parent 334010025f
commit 082634f851
6 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changedetectionio/tests/test_notification.py
View File

@@ -125,7 +125,7 @@ def test_check_notification(client, live_server):
# Diff was correctly executed
assert "Diff Full: Some initial text" in notification_submission
assert "Diff: (changed) Which is across multiple lines" in notification_submission
assert "(-> into) which has this one new line" in notification_submission
assert "(into ) which has this one new line" in notification_submission
if env_base_url:

3
changedetectionio/tests/unit/test-content/after-2.txt Normal file
View File

@@ -0,0 +1,3 @@
After twenty years, as cursed as I may be
ok
and insure that I'm one of those computer nerds.

1
changedetectionio/tests/unit/test-content/after.txt
View File

@@ -2,5 +2,6 @@ After twenty years, as cursed as I may be
for having learned computerese,
I continue to examine bits, bytes and words
xok
next-x-ok
and insure that I'm one of those computer nerds.
and something new

17
changedetectionio/tests/unit/test_notification_diff.py
View File

@@ -12,12 +12,19 @@ from changedetectionio import diff
class TestDiffBuilder(unittest.TestCase):
def test_expected_diff_output(self):
base_dir=os.path.dirname(__file__)
output = diff.render_diff(base_dir+"/test-content/before.txt", base_dir+"/test-content/after.txt")
base_dir = os.path.dirname(__file__)
output = diff.render_diff(previous_file=base_dir + "/test-content/before.txt", newest_file=base_dir + "/test-content/after.txt")
output = output.split("\n")
self.assertIn("(changed) ok", output)
self.assertIn("(-> into) xok", output)
self.assertIn("(added) and something new", output)
self.assertIn('(changed) ok', output)
self.assertIn('(into ) xok', output)
self.assertIn('(into ) next-x-ok', output)
self.assertIn('(added ) and something new', output)
output = diff.render_diff(previous_file=base_dir + "/test-content/before.txt", newest_file=base_dir + "/test-content/after-2.txt")
output = output.split("\n")
self.assertIn('(removed) for having learned computerese,', output)
self.assertIn('(removed) I continue to examine bits, bytes and words', output)
# @todo test blocks of changed, blocks of added, blocks of removed