Oh yes please
') @@ -177,7 +177,7 @@ def test_check_add_line_contains_trigger(client, live_server, measure_memory_usa wait_for_all_checks(client) res = client.get(url_for("watchlist.index")) - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data # Takes a moment for apprise to fire wait_for_notification_endpoint_output() diff --git a/changedetectionio/tests/test_backend.py b/changedetectionio/tests/test_backend.py index c250e32d8..7e2bc6391 100644 --- a/changedetectionio/tests/test_backend.py +++ b/changedetectionio/tests/test_backend.py @@ -38,9 +38,9 @@ def test_check_basic_change_detection_functionality(client, live_server, measure # Give the thread time to pick it up wait_for_all_checks(client) - # It should report nothing found (no new 'unviewed' class) + # It should report nothing found (no new 'has-unread-changes' class) res = client.get(url_for("watchlist.index")) - assert b'unviewed' not in res.data + assert b'has-unread-changes' not in res.data assert b'test-endpoint' in res.data # Default no password set, this stuff should be always available. @@ -74,9 +74,9 @@ def test_check_basic_change_detection_functionality(client, live_server, measure res = client.get(url_for("ui.ui_edit.watch_get_latest_html", uuid=uuid)) assert b'which has this one new line' in res.data - # Now something should be ready, indicated by having a 'unviewed' class + # Now something should be ready, indicated by having a 'has-unread-changes' class res = client.get(url_for("watchlist.index")) - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data # #75, and it should be in the RSS feed rss_token = extract_rss_token_from_UI(client) @@ -90,7 +90,7 @@ def test_check_basic_change_detection_functionality(client, live_server, measure assert expected_url.encode('utf-8') in res.data # - # Following the 'diff' link, it should no longer display as 'unviewed' even after we recheck it a few times + # Following the 'diff' link, it should no longer display as 'has-unread-changes' even after we recheck it a few times res = client.get(url_for("ui.ui_views.diff_history_page", uuid=uuid)) assert b'selected=""' in res.data, "Confirm diff history page loaded" @@ -111,12 +111,12 @@ def test_check_basic_change_detection_functionality(client, live_server, measure # Give the thread time to pick it up wait_for_all_checks(client) - # It should report nothing found (no new 'unviewed' class) + # It should report nothing found (no new 'has-unread-changes' class) res = client.get(url_for("watchlist.index")) - assert b'unviewed' not in res.data - assert b'class="has-unviewed' not in res.data + assert b'has-unread-changes' not in res.data + assert b'class="has-unread-changes' not in res.data assert b'head title' in res.data # Should be ON by default assert b'test-endpoint' in res.data @@ -140,8 +140,8 @@ def test_check_basic_change_detection_functionality(client, live_server, measure wait_for_all_checks(client) res = client.get(url_for("watchlist.index")) - assert b'unviewed' in res.data - assert b'class="has-unviewed' in res.data + assert b'has-unread-changes' in res.data + assert b'class="has-unread-changes' in res.data assert b'head title' not in res.data # should now be off @@ -151,8 +151,8 @@ def test_check_basic_change_detection_functionality(client, live_server, measure # hit the mark all viewed link res = client.get(url_for("ui.mark_all_viewed"), follow_redirects=True) - assert b'class="has-unviewed' not in res.data - assert b'unviewed' not in res.data + assert b'class="has-unread-changes' not in res.data + assert b'has-unread-changes' not in res.data # #2458 "clear history" should make the Watch object update its status correctly when the first snapshot lands again client.get(url_for("ui.clear_watch_history", uuid=uuid)) diff --git a/changedetectionio/tests/test_basic_socketio.py b/changedetectionio/tests/test_basic_socketio.py index 1c48e758b..10a4496c0 100644 --- a/changedetectionio/tests/test_basic_socketio.py +++ b/changedetectionio/tests/test_basic_socketio.py @@ -70,7 +70,7 @@ def run_socketio_watch_update_test(client, live_server, password_mode=""): for event in received: if event['name'] == 'watch_update': has_watch_update = True - if event['args'][0]['watch'].get('unviewed', False): + if event['args'][0]['watch'].get('has-unread-changes', False): has_unviewed_update = True logger.info("Found unviewed update event!") break diff --git a/changedetectionio/tests/test_block_while_text_present.py b/changedetectionio/tests/test_block_while_text_present.py index 6e97b826f..bf26a3de9 100644 --- a/changedetectionio/tests/test_block_while_text_present.py +++ b/changedetectionio/tests/test_block_while_text_present.py @@ -107,9 +107,9 @@ def test_check_block_changedetection_text_NOT_present(client, live_server, measu # Give the thread time to pick it up wait_for_all_checks(client) - # It should report nothing found (no new 'unviewed' class) + # It should report nothing found (no new 'has-unread-changes' class) res = client.get(url_for("watchlist.index")) - assert b'unviewed' not in res.data + assert b'has-unread-changes' not in res.data assert b'/test-endpoint' in res.data # The page changed, BUT the text is still there, just the rest of it changes, we should not see a change @@ -120,9 +120,9 @@ def test_check_block_changedetection_text_NOT_present(client, live_server, measu # Give the thread time to pick it up wait_for_all_checks(client) - # It should report nothing found (no new 'unviewed' class) + # It should report nothing found (no new 'has-unread-changes' class) res = client.get(url_for("watchlist.index")) - assert b'unviewed' not in res.data + assert b'has-unread-changes' not in res.data assert b'/test-endpoint' in res.data # 2548 @@ -131,7 +131,7 @@ def test_check_block_changedetection_text_NOT_present(client, live_server, measu client.get(url_for("ui.form_watch_checknow"), follow_redirects=True) wait_for_all_checks(client) res = client.get(url_for("watchlist.index")) - assert b'unviewed' not in res.data + assert b'has-unread-changes' not in res.data # Now we set a change where the text is gone AND its different content, it should now trigger @@ -139,7 +139,7 @@ def test_check_block_changedetection_text_NOT_present(client, live_server, measu client.get(url_for("ui.form_watch_checknow"), follow_redirects=True) wait_for_all_checks(client) res = client.get(url_for("watchlist.index")) - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data diff --git a/changedetectionio/tests/test_conditions.py b/changedetectionio/tests/test_conditions.py index e06f80448..2685ae75f 100644 --- a/changedetectionio/tests/test_conditions.py +++ b/changedetectionio/tests/test_conditions.py @@ -125,7 +125,7 @@ def test_conditions_with_text_and_number(client, live_server): time.sleep(2) # 75 is > 20 and < 100 and contains "5" res = client.get(url_for("watchlist.index")) - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data # Case 2: Change with one condition violated @@ -141,7 +141,7 @@ def test_conditions_with_text_and_number(client, live_server): # Should NOT be marked as having changes since not all conditions are met res = client.get(url_for("watchlist.index")) - assert b'unviewed' not in res.data + assert b'has-unread-changes' not in res.data res = client.get(url_for("ui.form_delete", uuid="all"), follow_redirects=True) assert b'Deleted' in res.data @@ -299,7 +299,7 @@ def test_lev_conditions_plugin(client, live_server, measure_memory_usage): wait_for_all_checks(client) res = client.get(url_for("watchlist.index")) - assert b'unviewed' not in res.data + assert b'has-unread-changes' not in res.data # Check the content saved initially, even tho a condition was set - this is the first snapshot so shouldnt be affected by conditions res = client.get( @@ -326,7 +326,7 @@ def test_lev_conditions_plugin(client, live_server, measure_memory_usage): wait_for_all_checks(client) res = client.get(url_for("watchlist.index")) - assert b'unviewed' not in res.data #because this will be like 0.90 not 0.8 threshold + assert b'has-unread-changes' not in res.data #because this will be like 0.90 not 0.8 threshold ############### Now change it a MORE THAN 50% test_return_data = """ @@ -345,7 +345,7 @@ def test_lev_conditions_plugin(client, live_server, measure_memory_usage): assert b'Queued 1 watch for rechecking.' in res.data wait_for_all_checks(client) res = client.get(url_for("watchlist.index")) - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data # cleanup for the next client.get( url_for("ui.form_delete", uuid="all"), diff --git a/changedetectionio/tests/test_css_selector.py b/changedetectionio/tests/test_css_selector.py index 1cbd6c436..b9c6a839e 100644 --- a/changedetectionio/tests/test_css_selector.py +++ b/changedetectionio/tests/test_css_selector.py @@ -116,10 +116,10 @@ def test_check_markup_include_filters_restriction(client, live_server, measure_m # Give the thread time to pick it up time.sleep(sleep_time_for_fetch_thread) - # It should have 'unviewed' still + # It should have 'has-unread-changes' still # Because it should be looking at only that 'sametext' id res = client.get(url_for("watchlist.index")) - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data # Tests the whole stack works with the CSS Filter diff --git a/changedetectionio/tests/test_element_removal.py b/changedetectionio/tests/test_element_removal.py index 9ce1d0fa7..3b6ad3d13 100644 --- a/changedetectionio/tests/test_element_removal.py +++ b/changedetectionio/tests/test_element_removal.py @@ -190,7 +190,7 @@ def test_element_removal_full(client, live_server, measure_memory_usage): wait_for_all_checks(client) - # so that we set the state to 'unviewed' after all the edits + # so that we set the state to 'has-unread-changes' after all the edits client.get(url_for("ui.ui_views.diff_history_page", uuid="first")) # Make a change to header/footer/nav diff --git a/changedetectionio/tests/test_errorhandling.py b/changedetectionio/tests/test_errorhandling.py index f79c4dda8..83b192b45 100644 --- a/changedetectionio/tests/test_errorhandling.py +++ b/changedetectionio/tests/test_errorhandling.py @@ -31,7 +31,7 @@ def _runner_test_http_errors(client, live_server, http_code, expected_text): res = client.get(url_for("watchlist.index")) # no change - assert b'unviewed' not in res.data + assert b'has-unread-changes' not in res.data assert bytes(expected_text.encode('utf-8')) in res.data diff --git a/changedetectionio/tests/test_extract_regex.py b/changedetectionio/tests/test_extract_regex.py index 82ef12c4c..8276296e8 100644 --- a/changedetectionio/tests/test_extract_regex.py +++ b/changedetectionio/tests/test_extract_regex.py @@ -174,10 +174,10 @@ def test_check_filter_and_regex_extract(client, live_server, measure_memory_usag # Give the thread time to pick it up wait_for_all_checks(client) - # It should have 'unviewed' still + # It should have 'has-unread-changes' still # Because it should be looking at only that 'sametext' id res = client.get(url_for("watchlist.index")) - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data # Check HTML conversion detected and workd res = client.get( diff --git a/changedetectionio/tests/test_ignore_text.py b/changedetectionio/tests/test_ignore_text.py index 1755e295a..0b76bf87a 100644 --- a/changedetectionio/tests/test_ignore_text.py +++ b/changedetectionio/tests/test_ignore_text.py @@ -128,9 +128,9 @@ def test_check_ignore_text_functionality(client, live_server, measure_memory_usa # Give the thread time to pick it up wait_for_all_checks(client) - # It should report nothing found (no new 'unviewed' class) + # It should report nothing found (no new 'has-unread-changes' class) res = client.get(url_for("watchlist.index")) - assert b'unviewed' not in res.data + assert b'has-unread-changes' not in res.data assert b'/test-endpoint' in res.data # Make a change @@ -141,9 +141,9 @@ def test_check_ignore_text_functionality(client, live_server, measure_memory_usa # Give the thread time to pick it up wait_for_all_checks(client) - # It should report nothing found (no new 'unviewed' class) + # It should report nothing found (no new 'has-unread-changes' class) res = client.get(url_for("watchlist.index")) - assert b'unviewed' not in res.data + assert b'has-unread-changes' not in res.data assert b'/test-endpoint' in res.data @@ -154,7 +154,7 @@ def test_check_ignore_text_functionality(client, live_server, measure_memory_usa wait_for_all_checks(client) res = client.get(url_for("watchlist.index")) - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data res = client.get(url_for("ui.ui_views.preview_page", uuid="first")) @@ -222,9 +222,9 @@ def _run_test_global_ignore(client, as_source=False, extra_ignore=""): # Trigger a check client.get(url_for("ui.form_watch_checknow"), follow_redirects=True) wait_for_all_checks(client) - # It should report nothing found (no new 'unviewed' class), adding random ignore text should not cause a change + # It should report nothing found (no new 'has-unread-changes' class), adding random ignore text should not cause a change res = client.get(url_for("watchlist.index")) - assert b'unviewed' not in res.data + assert b'has-unread-changes' not in res.data assert b'/test-endpoint' in res.data ##### @@ -238,10 +238,10 @@ def _run_test_global_ignore(client, as_source=False, extra_ignore=""): # Give the thread time to pick it up wait_for_all_checks(client) - # It should report nothing found (no new 'unviewed' class) + # It should report nothing found (no new 'has-unread-changes' class) res = client.get(url_for("watchlist.index")) - assert b'unviewed' not in res.data + assert b'has-unread-changes' not in res.data assert b'/test-endpoint' in res.data # Just to be sure.. set a regular modified change that will trigger it @@ -249,7 +249,7 @@ def _run_test_global_ignore(client, as_source=False, extra_ignore=""): client.get(url_for("ui.form_watch_checknow"), follow_redirects=True) wait_for_all_checks(client) res = client.get(url_for("watchlist.index")) - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data res = client.get(url_for("ui.form_delete", uuid="all"), follow_redirects=True) assert b'Deleted' in res.data diff --git a/changedetectionio/tests/test_ignorehyperlinks.py b/changedetectionio/tests/test_ignorehyperlinks.py index 5df8f9ae4..01ce2a3be 100644 --- a/changedetectionio/tests/test_ignorehyperlinks.py +++ b/changedetectionio/tests/test_ignorehyperlinks.py @@ -111,7 +111,7 @@ def test_render_anchor_tag_content_true(client, live_server, measure_memory_usag assert '(/modified_link)' in res.data.decode() # since the link has changed, and we chose to render anchor tag content, - # we should detect a change (new 'unviewed' class) + # we should detect a change (new 'has-unread-changes' class) res = client.get(url_for("watchlist.index")) assert b"unviewed" in res.data assert b"/test-endpoint" in res.data diff --git a/changedetectionio/tests/test_ignorestatuscode.py b/changedetectionio/tests/test_ignorestatuscode.py index 45bf9616c..1f4f26493 100644 --- a/changedetectionio/tests/test_ignorestatuscode.py +++ b/changedetectionio/tests/test_ignorestatuscode.py @@ -77,9 +77,9 @@ def test_normal_page_check_works_with_ignore_status_code(client, live_server, me # Give the thread time to pick it up wait_for_all_checks(client) - # It should report nothing found (no new 'unviewed' class) + # It should report nothing found (no new 'has-unread-changes' class) res = client.get(url_for("watchlist.index")) - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data assert b'/test-endpoint' in res.data @@ -124,8 +124,8 @@ def test_403_page_check_works_with_ignore_status_code(client, live_server, measu # Give the thread time to pick it up wait_for_all_checks(client) - # It should have 'unviewed' still + # It should have 'has-unread-changes' still # Because it should be looking at only that 'sametext' id res = client.get(url_for("watchlist.index")) - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data diff --git a/changedetectionio/tests/test_ignorewhitespace.py b/changedetectionio/tests/test_ignorewhitespace.py index 93fa94b2e..5a3f434c0 100644 --- a/changedetectionio/tests/test_ignorewhitespace.py +++ b/changedetectionio/tests/test_ignorewhitespace.py @@ -89,7 +89,7 @@ def test_check_ignore_whitespace(client, live_server, measure_memory_usage): # Give the thread time to pick it up time.sleep(sleep_time_for_fetch_thread) - # It should report nothing found (no new 'unviewed' class) + # It should report nothing found (no new 'has-unread-changes' class) res = client.get(url_for("watchlist.index")) - assert b'unviewed' not in res.data + assert b'has-unread-changes' not in res.data assert b'/test-endpoint' in res.data diff --git a/changedetectionio/tests/test_jinja2.py b/changedetectionio/tests/test_jinja2.py index 71152943f..ed60826ba 100644 --- a/changedetectionio/tests/test_jinja2.py +++ b/changedetectionio/tests/test_jinja2.py @@ -26,7 +26,7 @@ def test_jinja2_in_url_query(client, live_server, measure_memory_usage): assert b"Watch added" in res.data wait_for_all_checks(client) - # It should report nothing found (no new 'unviewed' class) + # It should report nothing found (no new 'has-unread-changes' class) res = client.get( url_for("ui.ui_views.preview_page", uuid="first"), follow_redirects=True @@ -51,7 +51,7 @@ def test_jinja2_security_url_query(client, live_server, measure_memory_usage): assert b"Watch added" in res.data wait_for_all_checks(client) - # It should report nothing found (no new 'unviewed' class) + # It should report nothing found (no new 'has-unread-changes' class) res = client.get(url_for("watchlist.index")) assert b'is invalid and cannot be used' in res.data # Some of the spewed output from the subclasses diff --git a/changedetectionio/tests/test_jsonpath_jq_selector.py b/changedetectionio/tests/test_jsonpath_jq_selector.py index b33da74d2..217e623db 100644 --- a/changedetectionio/tests/test_jsonpath_jq_selector.py +++ b/changedetectionio/tests/test_jsonpath_jq_selector.py @@ -280,9 +280,9 @@ def check_json_filter(json_filter, client, live_server): # Give the thread time to pick it up wait_for_all_checks(client) - # It should have 'unviewed' still + # It should have 'has-unread-changes' still res = client.get(url_for("watchlist.index")) - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data # Should not see this, because its not in the JSONPath we entered res = client.get(url_for("ui.ui_views.diff_history_page", uuid="first")) @@ -418,14 +418,14 @@ def check_json_ext_filter(json_filter, client, live_server): # Give the thread time to pick it up wait_for_all_checks(client) - # It should have 'unviewed' + # It should have 'has-unread-changes' res = client.get(url_for("watchlist.index")) - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data res = client.get(url_for("ui.ui_views.preview_page", uuid="first")) # We should never see 'ForSale' because we are selecting on 'Sold' in the rule, - # But we should know it triggered ('unviewed' assert above) + # But we should know it triggered ('has-unread-changes' assert above) assert b'ForSale' not in res.data assert b'Sold' in res.data @@ -465,7 +465,7 @@ def test_ignore_json_order(client, live_server, measure_memory_usage): wait_for_all_checks(client) res = client.get(url_for("watchlist.index")) - assert b'unviewed' not in res.data + assert b'has-unread-changes' not in res.data # Just to be sure it still works with open("test-datastore/endpoint-content.txt", "w") as f: @@ -476,7 +476,7 @@ def test_ignore_json_order(client, live_server, measure_memory_usage): wait_for_all_checks(client) res = client.get(url_for("watchlist.index")) - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data res = client.get(url_for("ui.form_delete", uuid="all"), follow_redirects=True) assert b'Deleted' in res.data diff --git a/changedetectionio/tests/test_nonrenderable_pages.py b/changedetectionio/tests/test_nonrenderable_pages.py index 2b3bd3055..70d0c2e93 100644 --- a/changedetectionio/tests/test_nonrenderable_pages.py +++ b/changedetectionio/tests/test_nonrenderable_pages.py @@ -40,9 +40,9 @@ def test_check_basic_change_detection_functionality(client, live_server, measure wait_for_all_checks(client) - # It should report nothing found (no new 'unviewed' class) + # It should report nothing found (no new 'has-unread-changes' class) res = client.get(url_for("watchlist.index")) - assert b'unviewed' not in res.data + assert b'has-unread-changes' not in res.data ##################### @@ -62,9 +62,9 @@ def test_check_basic_change_detection_functionality(client, live_server, measure # Give the thread time to pick it up wait_for_all_checks(client) - # It should report nothing found (no new 'unviewed' class) + # It should report nothing found (no new 'has-unread-changes' class) res = client.get(url_for("watchlist.index")) - assert b'unviewed' not in res.data + assert b'has-unread-changes' not in res.data uuid = next(iter(live_server.app.config['DATASTORE'].data['watching'])) watch = live_server.app.config['DATASTORE'].data['watching'][uuid] @@ -92,9 +92,9 @@ def test_check_basic_change_detection_functionality(client, live_server, measure # Give the thread time to pick it up wait_for_all_checks(client) - # It should report nothing found (no new 'unviewed' class) + # It should report nothing found (no new 'has-unread-changes' class) res = client.get(url_for("watchlist.index")) - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data client.get(url_for("ui.mark_all_viewed"), follow_redirects=True) time.sleep(0.2) @@ -108,7 +108,7 @@ def test_check_basic_change_detection_functionality(client, live_server, measure wait_for_all_checks(client) res = client.get(url_for("watchlist.index")) - assert b'unviewed' in res.data # A change should have registered because empty_pages_are_a_change is ON + assert b'has-unread-changes' in res.data # A change should have registered because empty_pages_are_a_change is ON assert b'fetch-error' not in res.data # diff --git a/changedetectionio/tests/test_pdf.py b/changedetectionio/tests/test_pdf.py index 5a8080b26..90da876aa 100644 --- a/changedetectionio/tests/test_pdf.py +++ b/changedetectionio/tests/test_pdf.py @@ -49,9 +49,9 @@ def test_fetch_pdf(client, live_server, measure_memory_usage): wait_for_all_checks(client) - # Now something should be ready, indicated by having a 'unviewed' class + # Now something should be ready, indicated by having a 'has-unread-changes' class res = client.get(url_for("watchlist.index")) - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data # The original checksum should be not be here anymore (cdio adds it to the bottom of the text) diff --git a/changedetectionio/tests/test_preview_endpoints.py b/changedetectionio/tests/test_preview_endpoints.py index ada52ed44..bc4d5412d 100644 --- a/changedetectionio/tests/test_preview_endpoints.py +++ b/changedetectionio/tests/test_preview_endpoints.py @@ -47,9 +47,9 @@ def test_fetch_pdf(client, live_server, measure_memory_usage): wait_for_all_checks(client) - # Now something should be ready, indicated by having a 'unviewed' class + # Now something should be ready, indicated by having a 'has-unread-changes' class res = client.get(url_for("watchlist.index")) - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data # The original checksum should be not be here anymore (cdio adds it to the bottom of the text) diff --git a/changedetectionio/tests/test_restock_itemprop.py b/changedetectionio/tests/test_restock_itemprop.py index 9efd6f1bb..6cc3a2b26 100644 --- a/changedetectionio/tests/test_restock_itemprop.py +++ b/changedetectionio/tests/test_restock_itemprop.py @@ -112,7 +112,7 @@ def test_itemprop_price_change(client, live_server): wait_for_all_checks(client) res = client.get(url_for("watchlist.index")) assert b'180.45' in res.data - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data client.get(url_for("ui.mark_all_viewed"), follow_redirects=True) time.sleep(0.2) @@ -129,7 +129,7 @@ def test_itemprop_price_change(client, live_server): wait_for_all_checks(client) res = client.get(url_for("watchlist.index")) assert b'120.45' in res.data - assert b'unviewed' not in res.data + assert b'has-unread-changes' not in res.data res = client.get(url_for("ui.form_delete", uuid="all"), follow_redirects=True) @@ -178,7 +178,7 @@ def _run_test_minmax_limit(client, extra_watch_edit_form): assert b'more than one price detected' not in res.data # BUT the new price should show, even tho its within limits assert b'1,000.45' or b'1000.45' in res.data #depending on locale - assert b'unviewed' not in res.data + assert b'has-unread-changes' not in res.data # price changed to something LESS than min (900), SHOULD be a change set_original_response(props_markup=instock_props[0], price='890.45') @@ -188,7 +188,7 @@ def _run_test_minmax_limit(client, extra_watch_edit_form): wait_for_all_checks(client) res = client.get(url_for("watchlist.index")) assert b'890.45' in res.data - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data client.get(url_for("ui.mark_all_viewed")) @@ -200,7 +200,7 @@ def _run_test_minmax_limit(client, extra_watch_edit_form): wait_for_all_checks(client) res = client.get(url_for("watchlist.index")) assert b'820.45' in res.data - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data client.get(url_for("ui.mark_all_viewed")) # price changed to something MORE than max (1100.10), SHOULD be a change @@ -210,7 +210,7 @@ def _run_test_minmax_limit(client, extra_watch_edit_form): res = client.get(url_for("watchlist.index")) # Depending on the LOCALE it may be either of these (generally for US/default/etc) assert b'1,890.45' in res.data or b'1890.45' in res.data - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data res = client.get(url_for("ui.form_delete", uuid="all"), follow_redirects=True) assert b'Deleted' in res.data @@ -294,7 +294,7 @@ def test_itemprop_percent_threshold(client, live_server): wait_for_all_checks(client) res = client.get(url_for("watchlist.index")) assert b'960.45' in res.data - assert b'unviewed' not in res.data + assert b'has-unread-changes' not in res.data # Bigger INCREASE change than the threshold should trigger set_original_response(props_markup=instock_props[0], price='1960.45') @@ -302,7 +302,7 @@ def test_itemprop_percent_threshold(client, live_server): wait_for_all_checks(client) res = client.get(url_for("watchlist.index")) assert b'1,960.45' or b'1960.45' in res.data #depending on locale - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data # Small decrease should NOT trigger @@ -312,7 +312,7 @@ def test_itemprop_percent_threshold(client, live_server): wait_for_all_checks(client) res = client.get(url_for("watchlist.index")) assert b'1,950.45' or b'1950.45' in res.data #depending on locale - assert b'unviewed' not in res.data + assert b'has-unread-changes' not in res.data diff --git a/changedetectionio/tests/test_source.py b/changedetectionio/tests/test_source.py index bea310b48..4aeb0f9e6 100644 --- a/changedetectionio/tests/test_source.py +++ b/changedetectionio/tests/test_source.py @@ -43,9 +43,9 @@ def test_check_basic_change_detection_functionality_source(client, live_server, wait_for_all_checks(client) - # Now something should be ready, indicated by having a 'unviewed' class + # Now something should be ready, indicated by having a 'has-unread-changes' class res = client.get(url_for("watchlist.index")) - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data res = client.get( url_for("ui.ui_views.diff_history_page", uuid="first"), diff --git a/changedetectionio/tests/test_trigger.py b/changedetectionio/tests/test_trigger.py index 6bccf812e..8d30b9bb0 100644 --- a/changedetectionio/tests/test_trigger.py +++ b/changedetectionio/tests/test_trigger.py @@ -96,7 +96,7 @@ def test_trigger_functionality(client, live_server, measure_memory_usage): - # so that we set the state to 'unviewed' after all the edits + # so that we set the state to 'has-unread-changes' after all the edits client.get(url_for("ui.ui_views.diff_history_page", uuid="first")) # Trigger a check @@ -104,9 +104,9 @@ def test_trigger_functionality(client, live_server, measure_memory_usage): wait_for_all_checks(client) - # It should report nothing found (no new 'unviewed' class) + # It should report nothing found (no new 'has-unread-changes' class) res = client.get(url_for("watchlist.index")) - assert b'unviewed' not in res.data + assert b'has-unread-changes' not in res.data assert b'/test-endpoint' in res.data # Make a change @@ -116,9 +116,9 @@ def test_trigger_functionality(client, live_server, measure_memory_usage): client.get(url_for("ui.form_watch_checknow"), follow_redirects=True) wait_for_all_checks(client) - # It should report nothing found (no new 'unviewed' class) + # It should report nothing found (no new 'has-unread-changes' class) res = client.get(url_for("watchlist.index")) - assert b'unviewed' not in res.data + assert b'has-unread-changes' not in res.data # Now set the content which contains the trigger text set_modified_with_trigger_text_response() @@ -126,7 +126,7 @@ def test_trigger_functionality(client, live_server, measure_memory_usage): client.get(url_for("ui.form_watch_checknow"), follow_redirects=True) wait_for_all_checks(client) res = client.get(url_for("watchlist.index")) - assert b'unviewed' in res.data + assert b'has-unread-changes' in res.data # https://github.com/dgtlmoon/changedetection.io/issues/616 # Apparently the actual snapshot that contains the trigger never shows diff --git a/changedetectionio/tests/test_trigger_regex.py b/changedetectionio/tests/test_trigger_regex.py index 987ef0630..aa22ac8ac 100644 --- a/changedetectionio/tests/test_trigger_regex.py +++ b/changedetectionio/tests/test_trigger_regex.py @@ -42,7 +42,7 @@ def test_trigger_regex_functionality(client, live_server, measure_memory_usage): # It should report nothing found (just a new one shouldnt have anything) res = client.get(url_for("watchlist.index")) - assert b'unviewed' not in res.data + assert b'has-unread-changes' not in res.data ### test regex res = client.post( @@ -54,7 +54,7 @@ def test_trigger_regex_functionality(client, live_server, measure_memory_usage): follow_redirects=True ) wait_for_all_checks(client) - # so that we set the state to 'unviewed' after all the edits + # so that we set the state to 'has-unread-changes' after all the edits client.get(url_for("ui.ui_views.diff_history_page", uuid="first")) with open("test-datastore/endpoint-content.txt", "w") as f: @@ -65,7 +65,7 @@ def test_trigger_regex_functionality(client, live_server, measure_memory_usage): # It should report nothing found (nothing should match the regex) res = client.get(url_for("watchlist.index")) - assert b'unviewed' not in res.data + assert b'has-unread-changes' not in res.data with open("test-datastore/endpoint-content.txt", "w") as f: f.write("regex test123