From 579faba57c3887166e7f641cadd5ff3b424b6ca6 Mon Sep 17 00:00:00 2001 From: dgtlmoon Date: Sat, 27 Jul 2024 19:00:19 +0200 Subject: [PATCH] Adding more tests --- .../tests/test_add_replace_remove_filter.py | 11 ++++++----- changedetectionio/tests/test_notification.py | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/changedetectionio/tests/test_add_replace_remove_filter.py b/changedetectionio/tests/test_add_replace_remove_filter.py index 4d47f43e..9ce2479c 100644 --- a/changedetectionio/tests/test_add_replace_remove_filter.py +++ b/changedetectionio/tests/test_add_replace_remove_filter.py @@ -104,7 +104,7 @@ def test_check_removed_line_contains_trigger(client, live_server, measure_memory def test_check_add_line_contains_trigger(client, live_server, measure_memory_usage): - #live_server_setup(live_server) + live_server_setup(live_server) # Give the endpoint time to spin up test_notification_url = url_for('test_notification_endpoint', _external=True).replace('http://', 'post://') + "?xxx={{ watch_url }}" @@ -112,7 +112,7 @@ def test_check_add_line_contains_trigger(client, live_server, measure_memory_usa res = client.post( url_for("settings_page"), data={"application-notification_title": "New ChangeDetection.io Notification - {{ watch_url }}", - "application-notification_body": 'triggered text was -{{triggered_text}}-', + "application-notification_body": 'triggered text was -{{triggered_text}}- 网站监测 内容更新了', # https://github.com/caronc/apprise/wiki/Notify_Custom_JSON#get-parameter-manipulation "application-notification_urls": test_notification_url, "application-minutes_between_check": 180, @@ -167,9 +167,10 @@ def test_check_add_line_contains_trigger(client, live_server, measure_memory_usa # Takes a moment for apprise to fire time.sleep(3) assert os.path.isfile("test-datastore/notification.txt"), "Notification fired because I can see the output file" - with open("test-datastore/notification.txt", 'r') as f: - response= f.read() - assert '-Oh yes please-' in response + with open("test-datastore/notification.txt", 'rb') as f: + response = f.read() + assert b'-Oh yes please-' in response + assert '网站监测 内容更新了'.encode('utf-8') in response res = client.get(url_for("form_delete", uuid="all"), follow_redirects=True) diff --git a/changedetectionio/tests/test_notification.py b/changedetectionio/tests/test_notification.py index 36c6c83f..9e9c1c6f 100644 --- a/changedetectionio/tests/test_notification.py +++ b/changedetectionio/tests/test_notification.py @@ -291,11 +291,11 @@ def test_notification_custom_endpoint_and_jinja2(client, live_server, measure_me data={ "application-fetch_backend": "html_requests", "application-minutes_between_check": 180, - "application-notification_body": '{ "url" : "{{ watch_url }}", "secret": 444 }', + "application-notification_body": '{ "url" : "{{ watch_url }}", "secret": 444, "somebug": "网站监测 内容更新了" }', "application-notification_format": default_notification_format, "application-notification_urls": test_notification_url, # https://github.com/caronc/apprise/wiki/Notify_Custom_JSON#get-parameter-manipulation - "application-notification_title": "New ChangeDetection.io Notification - {{ watch_url }}", + "application-notification_title": "New ChangeDetection.io Notification - {{ watch_url }} ", }, follow_redirects=True ) @@ -324,6 +324,7 @@ def test_notification_custom_endpoint_and_jinja2(client, live_server, measure_me j = json.loads(x) assert j['url'].startswith('http://localhost') assert j['secret'] == 444 + assert j['somebug'] == '网站监测 内容更新了' # URL check, this will always be converted to lowercase assert os.path.isfile("test-datastore/notification-url.txt")