WIP

2025-11-03 16:17:51 +00:00 · 2023-06-23 15:22:13 +02:00
46 changed files with 214 additions and 287 deletions
--- a/changedetectionio/init.py
+++ b/changedetectionio/init.py
@@ -38,7 +38,7 @@ from flask_paginate import Pagination, get_page_parameter
 from changedetectionio import html_tools
 from changedetectionio.api import api_v1

-__version__ = '0.43.1'
+__version__ = '0.43'

 datastore = None

--- a/changedetectionio/api/api_v1.py
+++ b/changedetectionio/api/api_v1.py
@@ -219,15 +219,13 @@ class CreateWatch(Resource):

        extras = copy.deepcopy(json_data)

-        # Because we renamed 'tag' to 'tags' but don't want to change the API (can do this in v2 of the API)
-        tags = None
+        # Because we renamed 'tag' to 'tags' but dont want to change the API (can do this in v2 of the API)
        if extras.get('tag'):
-            tags = extras.get('tag')
-            del extras['tag']
+            extras['tags'] = extras.get('tag')

        del extras['url']

-        new_uuid = self.datastore.add_watch(url=url, extras=extras, tag=tags)
+        new_uuid = self.datastore.add_watch(url=url, extras=extras)
        if new_uuid:
            self.update_q.put(queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': new_uuid, 'skip_when_checksum_same': True}))
            return {'uuid': new_uuid}, 201
--- a/changedetectionio/blueprint/tags/init.py
+++ b/changedetectionio/blueprint/tags/init.py
@@ -76,16 +76,6 @@ def construct_blueprint(datastore: ChangeDetectionStore):
        flash(f"Tag unlinked removed from {unlinked} watches")
        return redirect(url_for('tags.tags_overview_page'))

-    @tags_blueprint.route("/delete_all", methods=['GET'])
-    @login_optionally_required
-    def delete_all():
-        for watch_uuid, watch in datastore.data['watching'].items():
-            watch['tags'] = []
-        datastore.data['settings']['application']['tags'] = {}
-
-        flash(f"All tags deleted")
-        return redirect(url_for('tags.tags_overview_page'))
-
    @tags_blueprint.route("/edit/<string:uuid>", methods=['GET'])
    @login_optionally_required
    def form_tag_edit(uuid):
--- a/changedetectionio/forms.py
+++ b/changedetectionio/forms.py
@@ -316,10 +316,11 @@ class ValidateCSSJSONXPATHInput(object):
                if not self.allow_xpath:
                    raise ValidationError("XPath not permitted in this field!")
                from lxml import etree, html
+                import elementpath
                tree = html.fromstring("<html></html>")

                try:
-                    tree.xpath(line.strip())
+                    elementpath.select(tree, line)
                except etree.XPathEvalError as e:
                    message = field.gettext('\'%s\' is not a valid XPath expression. (%s)')
                    raise ValidationError(message % (line, str(e)))
--- a/changedetectionio/html_tools.py
+++ b/changedetectionio/html_tools.py
@@ -51,12 +51,13 @@ def element_removal(selectors: List[str], html_content):

 # Return str Utf-8 of matched rules
 def xpath_filter(xpath_filter, html_content, append_pretty_line_formatting=False):
+    import elementpath
    from lxml import etree, html

    tree = html.fromstring(bytes(html_content, encoding='utf-8'))
    html_block = ""

-    r = tree.xpath(xpath_filter.strip(), namespaces={'re': 'http://exslt.org/regular-expressions'})
+    r = elementpath.select(tree, xpath_filter.strip())
    #@note: //title/text() wont work where <title>CDATA..

    for element in r:
--- a/changedetectionio/importer.py
+++ b/changedetectionio/importer.py
@@ -85,8 +85,7 @@ class import_distill_io_json(Importer):
        now = time.time()
        self.new_uuids=[]

-        # @todo Use JSONSchema like in the API to validate here.
-        
+
        try:
            data = json.loads(data.strip())
        except json.decoder.JSONDecodeError:
@@ -121,8 +120,11 @@ class import_distill_io_json(Importer):
                except IndexError:
                    pass

+# Does this need to be here anymore?
+                if d.get('tags', False):
+                    extras['tags'] = ", ".join(d['tags'])
+
                new_uuid = datastore.add_watch(url=d['uri'].strip(),
-                                               tag=",".join(d.get('tags', [])),
                                               extras=extras,
                                               write_to_disk_now=False)

--- a/changedetectionio/notification.py
+++ b/changedetectionio/notification.py
@@ -92,12 +92,6 @@ def process_notification(n_object, datastore):
        n_object.get('notification_format', default_notification_format),
        valid_notification_formats[default_notification_format],
    )
-
-    # If we arrived with 'System default' then look it up
-    if n_format == default_notification_format_for_watch and datastore.data['settings']['application'].get('notification_format') != default_notification_format_for_watch:
-        # Initially text or whatever
-        n_format = datastore.data['settings']['application'].get('notification_format', valid_notification_formats[default_notification_format])
-
    
    # https://github.com/caronc/apprise/wiki/Development_LogCapture
    # Anything higher than or equal to WARNING (which covers things like Connection errors)
--- a/changedetectionio/store.py
+++ b/changedetectionio/store.py
@@ -205,9 +205,10 @@ class ChangeDetectionStore:

    # Clone a watch by UUID
    def clone(self, uuid):
-        url = self.data['watching'][uuid].get('url')
+        url = self.data['watching'][uuid]['url']
+        tag = self.data['watching'][uuid].get('tags',[])
        extras = self.data['watching'][uuid]
-        new_uuid = self.add_watch(url=url, extras=extras)
+        new_uuid = self.add_watch(url=url, tag_uuids=tag, extras=extras)
        return new_uuid

    def url_exists(self, url):
@@ -247,9 +248,12 @@ class ChangeDetectionStore:
        if extras is None:
            extras = {}

+        # should always be str
+        if tag is None or not tag:
+            tag = ''
+
        # Incase these are copied across, assume it's a reference and deepcopy()
        apply_extras = deepcopy(extras)
-        apply_extras['tags'] = [] if not apply_extras.get('tags') else apply_extras.get('tags')

        # Was it a share link? try to fetch the data
        if (url.startswith("https://changedetection.io/share/")):
@@ -299,22 +303,20 @@ class ChangeDetectionStore:
            flash('Watch protocol is not permitted by SAFE_PROTOCOL_REGEX', 'error')
            return None

-        if tag and type(tag) == str:
-            # Then it's probably a string of the actual tag by name, split and add it
-            for t in tag.split(','):
+
+        # #Re 569
+        # Could be in 'tags',  var or extras, smash them together and strip
+        apply_extras['tags'] = []
+        if tag or extras.get('tags'):
+            tags = list(filter(None, list(set().union(tag.split(','), extras.get('tags', '').split(',')))))
+            for t in list(map(str.strip, tags)):
                # for each stripped tag, add tag as UUID
-                for a_t in t.split(','):
-                    tag_uuid = self.add_tag(a_t)
-                    apply_extras['tags'].append(tag_uuid)
+                apply_extras['tags'].append(self.add_tag(t))

        # Or if UUIDs given directly
        if tag_uuids:
            apply_extras['tags'] = list(set(apply_extras['tags'] + tag_uuids))

-        # Make any uuids unique
-        if apply_extras.get('tags'):
-            apply_extras['tags'] = list(set(apply_extras.get('tags')))
-
        new_watch = Watch.model(datastore_path=self.datastore_path, url=url)

        new_uuid = new_watch.get('uuid')
@@ -566,7 +568,7 @@ class ChangeDetectionStore:
    def add_tag(self, name):
        # If name exists, return that
        n = name.strip().lower()
-        print (f">>> Adding new tag - '{n}'")
+        print (f">>> Adding new tag - '{n}")
        if not n:
            return False

--- a/changedetectionio/tests/fetchers/test_content.py
+++ b/changedetectionio/tests/fetchers/test_content.py
@@ -28,6 +28,8 @@ def test_fetch_webdriver_content(client, live_server):
    )

    assert b"1 Imported" in res.data
+    time.sleep(3)
+
    wait_for_all_checks(client)


--- a/changedetectionio/tests/proxy_list/test_multiple_proxy.py
+++ b/changedetectionio/tests/proxy_list/test_multiple_proxy.py
@@ -2,11 +2,10 @@

 import time
 from flask import url_for
-from ..util import live_server_setup, wait_for_all_checks
-
+from ..util import live_server_setup

 def test_preferred_proxy(client, live_server):
-
+    time.sleep(1)
    live_server_setup(live_server)
    time.sleep(1)
    url = "http://chosen.changedetection.io"
@@ -21,8 +20,7 @@ def test_preferred_proxy(client, live_server):

    assert b"1 Imported" in res.data

-    wait_for_all_checks(client)
-
+    time.sleep(2)
    res = client.post(
        url_for("edit_page", uuid="first"),
        data={
@@ -36,6 +34,5 @@ def test_preferred_proxy(client, live_server):
        follow_redirects=True
    )
    assert b"Updated watch." in res.data
-    wait_for_all_checks(client)
-
+    time.sleep(2)
    # Now the request should appear in the second-squid logs
--- a/changedetectionio/tests/proxy_list/test_proxy.py
+++ b/changedetectionio/tests/proxy_list/test_proxy.py
@@ -16,4 +16,4 @@ def test_check_basic_change_detection_functionality(client, live_server):
    )

    assert b"1 Imported" in res.data
-    wait_for_all_checks(client)
+    time.sleep(3)
--- a/changedetectionio/tests/restock/test_restock.py
+++ b/changedetectionio/tests/restock/test_restock.py
@@ -94,7 +94,7 @@ def test_restock_detection(client, live_server):
    assert b'not-in-stock' not in res.data

    # We should have a notification
-    wait_for_all_checks(client)
+    time.sleep(2)
    assert os.path.isfile("test-datastore/notification.txt")
    os.unlink("test-datastore/notification.txt")

--- a/changedetectionio/tests/test_access_control.py
+++ b/changedetectionio/tests/test_access_control.py
@@ -1,4 +1,4 @@
-from .util import live_server_setup, extract_UUID_from_client, wait_for_all_checks
+from . util import live_server_setup, extract_UUID_from_client
 from flask import url_for
 import time

@@ -19,10 +19,10 @@ def test_check_access_control(app, client, live_server):
        )

        assert b"1 Imported" in res.data
-        wait_for_all_checks(client)
+        time.sleep(2)
        res = client.get(url_for("form_watch_checknow"), follow_redirects=True)
        assert b'1 watches queued for rechecking.' in res.data
-        wait_for_all_checks(client)
+        time.sleep(2)

        # Enable password check and diff page access bypass
        res = c.post(
--- a/changedetectionio/tests/test_add_replace_remove_filter.py
+++ b/changedetectionio/tests/test_add_replace_remove_filter.py
@@ -41,6 +41,7 @@ def test_setup(client, live_server):
 def test_check_removed_line_contains_trigger(client, live_server):

    # Give the endpoint time to spin up
+    time.sleep(1)
    set_original()
    # Add our URL to the import page
    test_url = url_for('test_endpoint', _external=True)
--- a/changedetectionio/tests/test_api.py
+++ b/changedetectionio/tests/test_api.py
@@ -267,9 +267,7 @@ def test_api_watch_PUT_update(client, live_server):

    #live_server_setup(live_server)
    api_key = extract_api_key_from_UI(client)
-
-    wait_for_all_checks(client)
-
+    time.sleep(1)
    # Create a watch
    set_original_response()
    test_url = url_for('test_endpoint', _external=True,
@@ -285,9 +283,7 @@ def test_api_watch_PUT_update(client, live_server):

    assert res.status_code == 201

-
-    wait_for_all_checks(client)
-
+    time.sleep(1)

    # Get a listing, it will be the first one
    res = client.get(
--- a/changedetectionio/tests/test_auth.py
+++ b/changedetectionio/tests/test_auth.py
@@ -2,8 +2,7 @@

 import time
 from flask import url_for
-from .util import live_server_setup, wait_for_all_checks
-
+from . util import live_server_setup

 def test_basic_auth(client, live_server):

@@ -20,7 +19,7 @@ def test_basic_auth(client, live_server):
        follow_redirects=True
    )
    assert b"1 Imported" in res.data
-    wait_for_all_checks(client)
+    time.sleep(1)

    # Check form validation
    res = client.post(
@@ -30,7 +29,7 @@ def test_basic_auth(client, live_server):
    )
    assert b"Updated watch." in res.data

-    wait_for_all_checks(client)
+    time.sleep(1)
    res = client.get(
        url_for("preview_page", uuid="first"),
        follow_redirects=True
--- a/changedetectionio/tests/test_automatic_follow_ldjson_price.py
+++ b/changedetectionio/tests/test_automatic_follow_ldjson_price.py
@@ -2,8 +2,7 @@

 import time
 from flask import url_for
-from .util import live_server_setup, extract_UUID_from_client, extract_api_key_from_UI, wait_for_all_checks
-
+from .util import live_server_setup, extract_UUID_from_client, extract_api_key_from_UI

 def set_response_with_ldjson():
    test_return_data = """<html>
@@ -93,7 +92,7 @@ def test_check_ldjson_price_autodetect(client, live_server):
        follow_redirects=True
    )
    assert b"1 Imported" in res.data
-    wait_for_all_checks(client)
+    time.sleep(3)

    # Should get a notice that it's available
    res = client.get(url_for("index"))
@@ -103,11 +102,11 @@ def test_check_ldjson_price_autodetect(client, live_server):
    uuid = extract_UUID_from_client(client)

    client.get(url_for('price_data_follower.accept', uuid=uuid, follow_redirects=True))
-    wait_for_all_checks(client)
+    time.sleep(2)

    # Trigger a check
    client.get(url_for("form_watch_checknow"), follow_redirects=True)
-    wait_for_all_checks(client)
+    time.sleep(2)
    # Offer should be gone
    res = client.get(url_for("index"))
    assert b'Embedded price data' not in res.data
@@ -139,7 +138,7 @@ def test_check_ldjson_price_autodetect(client, live_server):
        follow_redirects=True
    )
    assert b"1 Imported" in res.data
-    wait_for_all_checks(client)
+    time.sleep(3)
    res = client.get(url_for("index"))
    assert b'ldjson-price-track-offer' not in res.data
    
--- a/changedetectionio/tests/test_backend.py
+++ b/changedetectionio/tests/test_backend.py
@@ -28,7 +28,8 @@ def test_check_basic_change_detection_functionality(client, live_server):
    )

    assert b"1 Imported" in res.data
-    wait_for_all_checks(client)
+
+    time.sleep(sleep_time_for_fetch_thread)

    # Do this a few times.. ensures we dont accidently set the status
    for n in range(3):
--- a/changedetectionio/tests/test_backup.py
+++ b/changedetectionio/tests/test_backup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python3

-from .util import set_original_response, set_modified_response, live_server_setup, wait_for_all_checks
+from .util import set_original_response, set_modified_response, live_server_setup
 from flask import url_for
 from urllib.request import urlopen
 from zipfile import ZipFile
@@ -24,7 +24,7 @@ def test_backup(client, live_server):
    )

    assert b"1 Imported" in res.data
-    wait_for_all_checks(client)
+    time.sleep(3)

    res = client.get(
        url_for("get_backup"),
--- a/changedetectionio/tests/test_css_selector.py
+++ b/changedetectionio/tests/test_css_selector.py
@@ -2,7 +2,7 @@

 import time
 from flask import url_for
-from .util import live_server_setup, wait_for_all_checks
+from . util import live_server_setup

 from ..html_tools import *

@@ -90,7 +90,7 @@ def test_check_markup_include_filters_restriction(client, live_server):
    assert b"1 Imported" in res.data

    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    # Goto the edit page, add our ignore text
    # Add our URL to the import page
@@ -100,7 +100,7 @@ def test_check_markup_include_filters_restriction(client, live_server):
        follow_redirects=True
    )
    assert b"Updated watch." in res.data
-    wait_for_all_checks(client)
+    time.sleep(1)
    # Check it saved
    res = client.get(
        url_for("edit_page", uuid="first"),
@@ -108,14 +108,14 @@ def test_check_markup_include_filters_restriction(client, live_server):
    assert bytes(include_filters.encode('utf-8')) in res.data

    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)
    #  Make a change
    set_modified_response()

    # Trigger a check
    client.get(url_for("form_watch_checknow"), follow_redirects=True)
    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    # It should have 'unviewed' still
    # Because it should be looking at only that 'sametext' id
@@ -139,7 +139,7 @@ def test_check_multiple_filters(client, live_server):
    """)

    # Give the endpoint time to spin up
-    wait_for_all_checks(client)
+    time.sleep(1)

    # Add our URL to the import page
    test_url = url_for('test_endpoint', _external=True)
@@ -149,7 +149,7 @@ def test_check_multiple_filters(client, live_server):
        follow_redirects=True
    )
    assert b"1 Imported" in res.data
-    wait_for_all_checks(client)
+    time.sleep(1)

    # Goto the edit page, add our ignore text
    # Add our URL to the import page
@@ -165,7 +165,7 @@ def test_check_multiple_filters(client, live_server):
    assert b"Updated watch." in res.data

    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    res = client.get(
        url_for("preview_page", uuid="first"),
--- a/changedetectionio/tests/test_element_removal.py
+++ b/changedetectionio/tests/test_element_removal.py
@@ -5,7 +5,7 @@ import time
 from flask import url_for

 from ..html_tools import *
-from .util import live_server_setup, wait_for_all_checks
+from .util import live_server_setup


 def test_setup(live_server):
@@ -120,7 +120,7 @@ def test_element_removal_full(client, live_server):
        url_for("import_page"), data={"urls": test_url}, follow_redirects=True
    )
    assert b"1 Imported" in res.data
-    wait_for_all_checks(client)
+    time.sleep(1)
    # Goto the edit page, add the filter data
    # Not sure why \r needs to be added - absent of the #changetext this is not necessary
    subtractive_selectors_data = "header\r\nfooter\r\nnav\r\n#changetext"
@@ -147,7 +147,7 @@ def test_element_removal_full(client, live_server):
    client.get(url_for("form_watch_checknow"), follow_redirects=True)

    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    # so that we set the state to 'unviewed' after all the edits
    client.get(url_for("diff_history_page", uuid="first"))
@@ -159,7 +159,7 @@ def test_element_removal_full(client, live_server):
    client.get(url_for("form_watch_checknow"), follow_redirects=True)

    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    # There should not be an unviewed change, as changes should be removed
    res = client.get(url_for("index"))
--- a/changedetectionio/tests/test_encoding.py
+++ b/changedetectionio/tests/test_encoding.py
@@ -3,7 +3,7 @@

 import time
 from flask import url_for
-from .util import live_server_setup, wait_for_all_checks
+from .util import live_server_setup
 import pytest


@@ -39,7 +39,7 @@ def test_check_encoding_detection(client, live_server):
    )

    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(2)

    res = client.get(
        url_for("preview_page", uuid="first"),
@@ -68,7 +68,7 @@ def test_check_encoding_detection_missing_content_type_header(client, live_serve
    )

    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(2)

    res = client.get(
        url_for("preview_page", uuid="first"),
--- a/changedetectionio/tests/test_errorhandling.py
+++ b/changedetectionio/tests/test_errorhandling.py
@@ -3,7 +3,7 @@
 import time

 from flask import url_for
-from .util import live_server_setup, wait_for_all_checks
+from . util import live_server_setup

 from ..html_tools import *

@@ -30,7 +30,7 @@ def _runner_test_http_errors(client, live_server, http_code, expected_text):
    assert b"1 Imported" in res.data

    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(2)

    res = client.get(url_for("index"))
    # no change
@@ -76,7 +76,7 @@ def test_DNS_errors(client, live_server):
    assert b"1 Imported" in res.data

    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(3)

    res = client.get(url_for("index"))
    found_name_resolution_error = b"Temporary failure in name resolution" in res.data or b"Name or service not known" in res.data
@@ -90,7 +90,7 @@ def test_DNS_errors(client, live_server):
 def test_low_level_errors_clear_correctly(client, live_server):
    #live_server_setup(live_server)
    # Give the endpoint time to spin up
-    #time.sleep(1)
+    time.sleep(1)

    with open("test-datastore/endpoint-content.txt", "w") as f:
        f.write("<html><body><div id=here>Hello world</div></body></html>")
@@ -104,7 +104,7 @@ def test_low_level_errors_clear_correctly(client, live_server):
        follow_redirects=True
    )
    assert b"1 Imported" in res.data
-    wait_for_all_checks(client)
+    time.sleep(2)

    # We should see the DNS error
    res = client.get(url_for("index"))
@@ -121,7 +121,7 @@ def test_low_level_errors_clear_correctly(client, live_server):
    )

    # Now the error should be gone
-    wait_for_all_checks(client)
+    time.sleep(2)
    res = client.get(url_for("index"))
    found_name_resolution_error = b"Temporary failure in name resolution" in res.data or b"Name or service not known" in res.data
    assert not found_name_resolution_error
--- a/changedetectionio/tests/test_extract_csv.py
+++ b/changedetectionio/tests/test_extract_csv.py
@@ -24,7 +24,7 @@ def test_check_extract_text_from_diff(client, live_server):
    )

    assert b"1 Imported" in res.data
-    wait_for_all_checks
+    time.sleep(1)

    # Load in 5 different numbers/changes
    last_date=""
--- a/changedetectionio/tests/test_extract_regex.py
+++ b/changedetectionio/tests/test_extract_regex.py
@@ -2,7 +2,7 @@

 import time
 from flask import url_for
-from .util import live_server_setup, wait_for_all_checks
+from .util import live_server_setup

 from ..html_tools import *

@@ -82,7 +82,7 @@ def test_check_filter_multiline(client, live_server):
    )
    assert b"1 Imported" in res.data

-    wait_for_all_checks(client)
+    time.sleep(3)

    # Goto the edit page, add our ignore text
    # Add our URL to the import page
@@ -99,7 +99,7 @@ def test_check_filter_multiline(client, live_server):
    )

    assert b"Updated watch." in res.data
-    wait_for_all_checks(client)
+    time.sleep(3)

    res = client.get(
        url_for("preview_page", uuid="first"),
@@ -132,12 +132,12 @@ def test_check_filter_and_regex_extract(client, live_server):
    )
    assert b"1 Imported" in res.data

-    wait_for_all_checks(client)
+    time.sleep(1)
    # Trigger a check
    client.get(url_for("form_watch_checknow"), follow_redirects=True)

    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    # Goto the edit page, add our ignore text
    # Add our URL to the import page
@@ -156,7 +156,7 @@ def test_check_filter_and_regex_extract(client, live_server):
    assert b"Updated watch." in res.data

    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    #  Make a change
    set_modified_response()
@@ -164,7 +164,7 @@ def test_check_filter_and_regex_extract(client, live_server):
    # Trigger a check
    client.get(url_for("form_watch_checknow"), follow_redirects=True)
    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    # It should have 'unviewed' still
    # Because it should be looking at only that 'sametext' id
--- a/changedetectionio/tests/test_filter_exist_changes.py
+++ b/changedetectionio/tests/test_filter_exist_changes.py
@@ -4,7 +4,7 @@
 import os
 import time
 from flask import url_for
-from .util import set_original_response, live_server_setup, wait_for_all_checks
+from .util import set_original_response, live_server_setup
 from changedetectionio.model import App


@@ -62,7 +62,7 @@ def test_filter_doesnt_exist_then_exists_should_get_notification(client, live_se
    assert b"Watch added" in res.data

    # Give the thread time to pick up the first version
-    wait_for_all_checks(client)
+    time.sleep(3)

    # Goto the edit page, add our ignore text
    # Add our URL to the import page
@@ -101,9 +101,6 @@ def test_filter_doesnt_exist_then_exists_should_get_notification(client, live_se
        follow_redirects=True
    )
    assert b"Updated watch." in res.data
-    wait_for_all_checks(client)
-
-    # apprise takes a moment to fire
    time.sleep(3)

    # Shouldn't exist, shouldn't have fired
@@ -111,11 +108,8 @@ def test_filter_doesnt_exist_then_exists_should_get_notification(client, live_se
    # Now the filter should exist
    set_response_with_filter()
    client.get(url_for("form_watch_checknow"), follow_redirects=True)
-    wait_for_all_checks(client)
-
-
-    # apprise takes a moment to fire
    time.sleep(3)
+
    assert os.path.isfile("test-datastore/notification.txt")

    with open("test-datastore/notification.txt", 'r') as f:
--- a/changedetectionio/tests/test_group.py
+++ b/changedetectionio/tests/test_group.py
@@ -2,7 +2,7 @@

 import time
 from flask import url_for
-from .util import live_server_setup, wait_for_all_checks, extract_rss_token_from_UI, get_UUID_for_tag_name, extract_UUID_from_client
+from .util import live_server_setup, wait_for_all_checks, extract_rss_token_from_UI, get_UUID_for_tag_name
 import os


@@ -154,10 +154,6 @@ def test_tag_add_in_ui(client, live_server):
    )
    assert b"Tag added" in res.data
    assert b"new-test-tag" in res.data
-
-    res = client.get(url_for("tags.delete_all"), follow_redirects=True)
-    assert b'All tags deleted' in res.data
-
    res = client.get(url_for("form_delete", uuid="all"), follow_redirects=True)
    assert b'Deleted' in res.data

@@ -223,11 +219,13 @@ def test_group_tag_notification(client, live_server):
    assert "test-tag" in notification_submission
    assert "other-tag" in notification_submission

-    #@todo Test that multiple notifications fired
-    #@todo Test that each of multiple notifications with different settings
    res = client.get(url_for("form_delete", uuid="all"), follow_redirects=True)
    assert b'Deleted' in res.data

+    #@todo Test that multiple notifications fired
+    #@todo Test that each of multiple notifications with different settings
+
+
 def test_limit_tag_ui(client, live_server):
    #live_server_setup(live_server)

@@ -262,61 +260,3 @@ def test_limit_tag_ui(client, live_server):
    assert b'test-tag' in res.data
    assert res.data.count(b'processor-text_json_diff') == 20
    assert b"object at" not in res.data
-    res = client.get(url_for("form_delete", uuid="all"), follow_redirects=True)
-    assert b'Deleted' in res.data
-    res = client.get(url_for("tags.delete_all"), follow_redirects=True)
-    assert b'All tags deleted' in res.data
-def test_clone_tag_on_import(client, live_server):
-    #live_server_setup(live_server)
-    test_url = url_for('test_endpoint', _external=True)
-    res = client.post(
-        url_for("import_page"),
-        data={"urls": test_url + " test-tag, another-tag\r\n"},
-        follow_redirects=True
-    )
-
-    assert b"1 Imported" in res.data
-
-    res = client.get(url_for("index"))
-    assert b'test-tag' in res.data
-    assert b'another-tag' in res.data
-
-    watch_uuid = extract_UUID_from_client(client)
-    res = client.get(url_for("form_clone", uuid=watch_uuid), follow_redirects=True)
-
-    assert b'Cloned' in res.data
-    # 2 times plus the top link to tag
-    assert res.data.count(b'test-tag') == 3
-    assert res.data.count(b'another-tag') == 3
-    res = client.get(url_for("form_delete", uuid="all"), follow_redirects=True)
-    assert b'Deleted' in res.data
-
-def test_clone_tag_on_quickwatchform_add(client, live_server):
-    #live_server_setup(live_server)
-
-    test_url = url_for('test_endpoint', _external=True)
-
-    res = client.post(
-        url_for("form_quick_watch_add"),
-        data={"url": test_url, "tags": ' test-tag, another-tag      '},
-        follow_redirects=True
-    )
-
-    assert b"Watch added" in res.data
-
-    res = client.get(url_for("index"))
-    assert b'test-tag' in res.data
-    assert b'another-tag' in res.data
-
-    watch_uuid = extract_UUID_from_client(client)
-    res = client.get(url_for("form_clone", uuid=watch_uuid), follow_redirects=True)
-
-    assert b'Cloned' in res.data
-    # 2 times plus the top link to tag
-    assert res.data.count(b'test-tag') == 3
-    assert res.data.count(b'another-tag') == 3
-    res = client.get(url_for("form_delete", uuid="all"), follow_redirects=True)
-    assert b'Deleted' in res.data
-
-    res = client.get(url_for("tags.delete_all"), follow_redirects=True)
-    assert b'All tags deleted' in res.data
--- a/changedetectionio/tests/test_ignorehyperlinks.py
+++ b/changedetectionio/tests/test_ignorehyperlinks.py
@@ -3,7 +3,7 @@

 import time
 from flask import url_for
-from .util import live_server_setup, wait_for_all_checks
+from .util import live_server_setup


 def test_setup(live_server):
@@ -70,19 +70,19 @@ def test_render_anchor_tag_content_true(client, live_server):
    )
    assert b"1 Imported" in res.data

-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)
    # Trigger a check
    client.get(url_for("form_watch_checknow"), follow_redirects=True)

    # set a new html text with a modified link
    set_modified_ignore_response()
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    # Trigger a check
    client.get(url_for("form_watch_checknow"), follow_redirects=True)

    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    # We should not see the rendered anchor tag
    res = client.get(url_for("preview_page", uuid="first"))
@@ -104,7 +104,7 @@ def test_render_anchor_tag_content_true(client, live_server):
    client.get(url_for("form_watch_checknow"), follow_redirects=True)

    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)



--- a/changedetectionio/tests/test_ignorewhitespace.py
+++ b/changedetectionio/tests/test_ignorewhitespace.py
@@ -2,8 +2,7 @@

 import time
 from flask import url_for
-from .util import live_server_setup, wait_for_all_checks
-
+from . util import live_server_setup

 def test_setup(live_server):
    live_server_setup(live_server)
@@ -51,6 +50,7 @@ def set_original_ignore_response():

 # If there was only a change in the whitespacing, then we shouldnt have a change detected
 def test_check_ignore_whitespace(client, live_server):
+    sleep_time_for_fetch_thread = 3

    # Give the endpoint time to spin up
    time.sleep(1)
@@ -78,17 +78,17 @@ def test_check_ignore_whitespace(client, live_server):
    )
    assert b"1 Imported" in res.data

-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)
    # Trigger a check
    client.get(url_for("form_watch_checknow"), follow_redirects=True)

    set_original_ignore_response_but_with_whitespace()
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)
    # Trigger a check
    client.get(url_for("form_watch_checknow"), follow_redirects=True)

    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    # It should report nothing found (no new 'unviewed' class)
    res = client.get(url_for("index"))
--- a/changedetectionio/tests/test_import.py
+++ b/changedetectionio/tests/test_import.py
@@ -112,7 +112,6 @@ def test_import_distillio(client, live_server):
    # did the tags work?
    res = client.get( url_for("index"))

-    # check tags
    assert b"nice stuff" in res.data
    assert b"nerd-news" in res.data

--- a/changedetectionio/tests/test_jinja2.py
+++ b/changedetectionio/tests/test_jinja2.py
@@ -2,7 +2,7 @@

 import time
 from flask import url_for
-from .util import live_server_setup, wait_for_all_checks
+from .util import live_server_setup


 # If there was only a change in the whitespacing, then we shouldnt have a change detected
@@ -24,7 +24,7 @@ def test_jinja2_in_url_query(client, live_server):
        follow_redirects=True
    )
    assert b"Watch added" in res.data
-    wait_for_all_checks(client)
+    time.sleep(3)
    # It should report nothing found (no new 'unviewed' class)
    res = client.get(
        url_for("preview_page", uuid="first"),
--- a/changedetectionio/tests/test_nonrenderable_pages.py
+++ b/changedetectionio/tests/test_nonrenderable_pages.py
@@ -3,7 +3,7 @@
 import time
 from flask import url_for
 from urllib.request import urlopen
-from .util import set_original_response, set_modified_response, live_server_setup, wait_for_all_checks
+from .util import set_original_response, set_modified_response, live_server_setup

 sleep_time_for_fetch_thread = 3

@@ -35,14 +35,14 @@ def test_check_basic_change_detection_functionality(client, live_server):

    assert b"1 Imported" in res.data

-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    # Do this a few times.. ensures we dont accidently set the status
    for n in range(3):
        client.get(url_for("form_watch_checknow"), follow_redirects=True)

        # Give the thread time to pick it up
-        wait_for_all_checks(client)
+        time.sleep(sleep_time_for_fetch_thread)

        # It should report nothing found (no new 'unviewed' class)
        res = client.get(url_for("index"))
@@ -64,7 +64,7 @@ def test_check_basic_change_detection_functionality(client, live_server):
    client.get(url_for("form_watch_checknow"), follow_redirects=True)

    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    # It should report nothing found (no new 'unviewed' class)
    res = client.get(url_for("index"))
@@ -86,7 +86,7 @@ def test_check_basic_change_detection_functionality(client, live_server):
    client.get(url_for("form_watch_checknow"), follow_redirects=True)

    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    # It should report nothing found (no new 'unviewed' class)
    res = client.get(url_for("index"))
--- a/changedetectionio/tests/test_notification.py
+++ b/changedetectionio/tests/test_notification.py
@@ -24,6 +24,9 @@ def test_check_notification(client, live_server):
    #live_server_setup(live_server)
    set_original_response()

+    # Give the endpoint time to spin up
+    time.sleep(1)
+
    # Re 360 - new install should have defaults set
    res = client.get(url_for("settings_page"))
    notification_url = url_for('test_notification_endpoint', _external=True).replace('http', 'json')
@@ -139,7 +142,8 @@ def test_check_notification(client, live_server):

    # Did we see the URL that had a change, in the notification?
    # Diff was correctly executed
-
+    assert test_url in notification_submission
+    assert ':-)' in notification_submission
    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
@@ -152,8 +156,7 @@ def test_check_notification(client, live_server):
    assert "preview/" in notification_submission
    assert ":-)" in notification_submission
    assert "New ChangeDetection.io Notification - {}".format(test_url) in notification_submission
-    assert test_url in notification_submission
-    assert ':-)' in notification_submission
+
    # Check the attachment was added, and that it is a JPEG from the original PNG
    notification_submission_object = json.loads(notification_submission)
    # We keep PNG screenshots for now
--- a/changedetectionio/tests/test_notification_errors.py
+++ b/changedetectionio/tests/test_notification_errors.py
@@ -2,7 +2,7 @@ import os
 import time
 import re
 from flask import url_for
-from .util import set_original_response, set_modified_response, live_server_setup, wait_for_all_checks
+from . util import set_original_response, set_modified_response, live_server_setup
 import logging

 def test_check_notification_error_handling(client, live_server):
@@ -11,7 +11,7 @@ def test_check_notification_error_handling(client, live_server):
    set_original_response()

    # Give the endpoint time to spin up
-    time.sleep(1)
+    time.sleep(2)

    # Set a URL and fetch it, then set a notification URL which is going to give errors
    test_url = url_for('test_endpoint', _external=True)
@@ -22,7 +22,7 @@ def test_check_notification_error_handling(client, live_server):
    )
    assert b"Watch added" in res.data

-    wait_for_all_checks(client)
+    time.sleep(2)
    set_modified_response()

    res = client.post(
--- a/changedetectionio/tests/test_obfuscations.py
+++ b/changedetectionio/tests/test_obfuscations.py
@@ -2,7 +2,7 @@

 import time
 from flask import url_for
-from .util import live_server_setup, wait_for_all_checks
+from .util import live_server_setup


 def set_original_ignore_response():
@@ -32,7 +32,8 @@ def test_obfuscations(client, live_server):
    assert b"1 Imported" in res.data

    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(3)
+
    # Check HTML conversion detected and workd
    res = client.get(
        url_for("preview_page", uuid="first"),
--- a/changedetectionio/tests/test_pdf.py
+++ b/changedetectionio/tests/test_pdf.py
@@ -2,7 +2,7 @@

 import time
 from flask import url_for
-from .util import set_original_response, set_modified_response, live_server_setup, wait_for_all_checks
+from .util import set_original_response, set_modified_response, live_server_setup

 sleep_time_for_fetch_thread = 3

@@ -22,7 +22,7 @@ def test_fetch_pdf(client, live_server):

    assert b"1 Imported" in res.data

-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)
    res = client.get(
        url_for("preview_page", uuid="first"),
        follow_redirects=True
--- a/changedetectionio/tests/test_rss.py
+++ b/changedetectionio/tests/test_rss.py
@@ -19,9 +19,9 @@ def test_rss_and_token(client, live_server):
    assert b"1 Imported" in res.data
    rss_token = extract_rss_token_from_UI(client)

-    wait_for_all_checks(client)
+    time.sleep(2)
    client.get(url_for("form_watch_checknow"), follow_redirects=True)
-    wait_for_all_checks(client)
+    time.sleep(2)

    # Add our URL to the import page
    res = client.get(
--- a/changedetectionio/tests/test_security.py
+++ b/changedetectionio/tests/test_security.py
@@ -1,5 +1,5 @@
 from flask import url_for
-from .util import set_original_response, set_modified_response, live_server_setup, wait_for_all_checks
+from . util import set_original_response, set_modified_response, live_server_setup
 import time


@@ -59,7 +59,7 @@ def test_bad_access(client, live_server):
        data={"url": 'file:///tasty/disk/drive', "tags": ''},
        follow_redirects=True
    )
-    wait_for_all_checks(client)
+    time.sleep(1)
    res = client.get(url_for("index"))

    assert b'file:// type access is denied for security reasons.' in res.data
--- a/changedetectionio/tests/test_source.py
+++ b/changedetectionio/tests/test_source.py
@@ -22,7 +22,7 @@ def test_check_basic_change_detection_functionality_source(client, live_server):

    assert b"1 Imported" in res.data

-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    #####################

@@ -82,7 +82,7 @@ def test_check_ignore_elements(client, live_server):
        follow_redirects=True
    )

-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    res = client.get(
        url_for("preview_page", uuid="first"),
--- a/changedetectionio/tests/test_trigger.py
+++ b/changedetectionio/tests/test_trigger.py
@@ -2,7 +2,7 @@

 import time
 from flask import url_for
-from .util import live_server_setup, wait_for_all_checks
+from . util import live_server_setup


 def set_original_ignore_response():
@@ -64,7 +64,7 @@ def test_trigger_functionality(client, live_server):
    set_original_ignore_response()

    # Give the endpoint time to spin up
-    wait_for_all_checks(client)
+    time.sleep(1)

    # Add our URL to the import page
    test_url = url_for('test_endpoint', _external=True)
@@ -96,7 +96,7 @@ def test_trigger_functionality(client, live_server):
    assert bytes(trigger_text.encode('utf-8')) in res.data

    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)
    
    # so that we set the state to 'unviewed' after all the edits
    client.get(url_for("diff_history_page", uuid="first"))
@@ -105,7 +105,7 @@ def test_trigger_functionality(client, live_server):
    client.get(url_for("form_watch_checknow"), follow_redirects=True)

    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    # It should report nothing found (no new 'unviewed' class)
    res = client.get(url_for("index"))
@@ -118,19 +118,18 @@ def test_trigger_functionality(client, live_server):
    # Trigger a check
    client.get(url_for("form_watch_checknow"), follow_redirects=True)
    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    # It should report nothing found (no new 'unviewed' class)
    res = client.get(url_for("index"))
    assert b'unviewed' not in res.data

    # Now set the content which contains the trigger text
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)
    set_modified_with_trigger_text_response()

    client.get(url_for("form_watch_checknow"), follow_redirects=True)
-    wait_for_all_checks(client)
-
+    time.sleep(sleep_time_for_fetch_thread)
    res = client.get(url_for("index"))
    assert b'unviewed' in res.data
    
--- a/changedetectionio/tests/test_trigger_regex.py
+++ b/changedetectionio/tests/test_trigger_regex.py
@@ -2,7 +2,7 @@

 import time
 from flask import url_for
-from .util import live_server_setup, wait_for_all_checks
+from . util import live_server_setup


 def set_original_ignore_response():
@@ -43,7 +43,7 @@ def test_trigger_regex_functionality(client, live_server):
    assert b"1 Imported" in res.data

    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    # It should report nothing found (just a new one shouldnt have anything)
    res = client.get(url_for("index"))
@@ -57,8 +57,7 @@ def test_trigger_regex_functionality(client, live_server):
              "fetch_backend": "html_requests"},
        follow_redirects=True
    )
-    wait_for_all_checks(client)
-
+    time.sleep(sleep_time_for_fetch_thread)
    # so that we set the state to 'unviewed' after all the edits
    client.get(url_for("diff_history_page", uuid="first"))

@@ -66,7 +65,7 @@ def test_trigger_regex_functionality(client, live_server):
        f.write("some new noise")

    client.get(url_for("form_watch_checknow"), follow_redirects=True)
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    # It should report nothing found (nothing should match the regex)
    res = client.get(url_for("index"))
@@ -76,8 +75,7 @@ def test_trigger_regex_functionality(client, live_server):
        f.write("regex test123<br>\nsomething 123")

    client.get(url_for("form_watch_checknow"), follow_redirects=True)
-    wait_for_all_checks(client)
-
+    time.sleep(sleep_time_for_fetch_thread)
    res = client.get(url_for("index"))
    assert b'unviewed' in res.data

--- a/changedetectionio/tests/test_trigger_regex_with_filter.py
+++ b/changedetectionio/tests/test_trigger_regex_with_filter.py
@@ -2,7 +2,7 @@

 import time
 from flask import url_for
-from .util import live_server_setup, wait_for_all_checks
+from . util import live_server_setup


 def set_original_ignore_response():
@@ -42,7 +42,7 @@ def test_trigger_regex_functionality_with_filter(client, live_server):
    assert b"1 Imported" in res.data

    # it needs time to save the original version
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    ### test regex with filter
    res = client.post(
@@ -55,7 +55,7 @@ def test_trigger_regex_functionality_with_filter(client, live_server):
    )

    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    client.get(url_for("diff_history_page", uuid="first"))

@@ -64,7 +64,7 @@ def test_trigger_regex_functionality_with_filter(client, live_server):
        f.write("<html>some new noise with cool stuff2 ok</html>")

    client.get(url_for("form_watch_checknow"), follow_redirects=True)
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    # It should report nothing found (nothing should match the regex and filter)
    res = client.get(url_for("index"))
@@ -75,8 +75,7 @@ def test_trigger_regex_functionality_with_filter(client, live_server):
        f.write("<html>some new noise with <span id=in-here>cool stuff6</span> ok</html>")

    client.get(url_for("form_watch_checknow"), follow_redirects=True)
-    wait_for_all_checks(client)
-
+    time.sleep(sleep_time_for_fetch_thread)
    res = client.get(url_for("index"))
    assert b'unviewed' in res.data

--- a/changedetectionio/tests/test_unique_lines.py
+++ b/changedetectionio/tests/test_unique_lines.py
@@ -2,7 +2,7 @@

 import time
 from flask import url_for
-from .util import live_server_setup, wait_for_all_checks
+from .util import live_server_setup


 def set_original_ignore_response():
@@ -67,7 +67,7 @@ def test_unique_lines_functionality(client, live_server):
        follow_redirects=True
    )
    assert b"1 Imported" in res.data
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    # Add our URL to the import page
    res = client.post(
@@ -83,13 +83,12 @@ def test_unique_lines_functionality(client, live_server):
    #  Make a change
    set_modified_swapped_lines()

-    wait_for_all_checks(client)
-
+    time.sleep(sleep_time_for_fetch_thread)
    # Trigger a check
    client.get(url_for("form_watch_checknow"), follow_redirects=True)

    # Give the thread time to pick it up
-    wait_for_all_checks(client)
+    time.sleep(sleep_time_for_fetch_thread)

    # It should report nothing found (no new 'unviewed' class)
    res = client.get(url_for("index"))
--- a/changedetectionio/tests/test_xpath_selector.py
+++ b/changedetectionio/tests/test_xpath_selector.py
@@ -86,15 +86,14 @@ def test_check_xpath_filter_utf8(client, live_server):
        follow_redirects=True
    )
    assert b"1 Imported" in res.data
-    wait_for_all_checks(client)
+    time.sleep(1)
    res = client.post(
        url_for("edit_page", uuid="first"),
        data={"include_filters": filter, "url": test_url, "tags": "", "headers": "", 'fetch_backend': "html_requests"},
        follow_redirects=True
    )
    assert b"Updated watch." in res.data
-    wait_for_all_checks(client)
-
+    time.sleep(3)
    res = client.get(url_for("index"))
    assert b'Unicode strings with encoding declaration are not supported.' not in res.data
    res = client.get(url_for("form_delete", uuid="all"), follow_redirects=True)
@@ -141,14 +140,14 @@ def test_check_xpath_text_function_utf8(client, live_server):
        follow_redirects=True
    )
    assert b"1 Imported" in res.data
-    wait_for_all_checks(client)
+    time.sleep(1)
    res = client.post(
        url_for("edit_page", uuid="first"),
        data={"include_filters": filter, "url": test_url, "tags": "", "headers": "", 'fetch_backend': "html_requests"},
        follow_redirects=True
    )
    assert b"Updated watch." in res.data
-    wait_for_all_checks(client)
+    time.sleep(3)
    res = client.get(url_for("index"))
    assert b'Unicode strings with encoding declaration are not supported.' not in res.data

@@ -165,6 +164,7 @@ def test_check_xpath_text_function_utf8(client, live_server):
    assert b'Deleted' in res.data

 def test_check_markup_xpath_filter_restriction(client, live_server):
+    live_server_setup(live_server)
    sleep_time_for_fetch_thread = 3

    xpath_filter = "//*[contains(@class, 'sametext')]"
@@ -217,6 +217,9 @@ def test_check_markup_xpath_filter_restriction(client, live_server):

 def test_xpath_validation(client, live_server):

+    # Give the endpoint time to spin up
+    time.sleep(1)
+
    # Add our URL to the import page
    test_url = url_for('test_endpoint', _external=True)
    res = client.post(
@@ -225,7 +228,7 @@ def test_xpath_validation(client, live_server):
        follow_redirects=True
    )
    assert b"1 Imported" in res.data
-    wait_for_all_checks(client)
+    time.sleep(2)

    res = client.post(
        url_for("edit_page", uuid="first"),
@@ -255,7 +258,7 @@ def test_check_with_prefix_include_filters(client, live_server):
        follow_redirects=True
    )
    assert b"1 Imported" in res.data
-    wait_for_all_checks(client)
+    time.sleep(3)

    res = client.post(
        url_for("edit_page", uuid="first"),
@@ -264,7 +267,7 @@ def test_check_with_prefix_include_filters(client, live_server):
    )

    assert b"Updated watch." in res.data
-    wait_for_all_checks(client)
+    time.sleep(3)

    res = client.get(
        url_for("preview_page", uuid="first"),
--- a/changedetectionio/update_worker.py
+++ b/changedetectionio/update_worker.py
@@ -65,45 +65,15 @@ class update_worker(threading.Thread):
        logging.info (">> SENDING NOTIFICATION")
        self.notification_q.put(n_object)

-    # Prefer - Individual watch settings > Tag settings >  Global settings (in that order)
-    def _check_cascading_vars(self, var_name, watch):
-
-        from changedetectionio.notification import (
-            default_notification_format_for_watch,
-            default_notification_body,
-            default_notification_title
-        )
-
-
-        # Would be better if this was some kind of Object where Watch can reference the parent datastore etc
-        v = watch.get(var_name)
-        if v and not watch.get('notification_muted'):
-            return v
-
-        tags = self.datastore.get_all_tags_for_watch(uuid=watch.get('uuid'))
-        if tags:
-            for tag_uuid, tag in tags.items():
-                v = tag.get(var_name)
-                if v and not tag.get('notification_muted'):
-                    return v
-
-        if self.datastore.data['settings']['application'].get(var_name):
-            return self.datastore.data['settings']['application'].get(var_name)
-
-        # Otherwise could be defaults
-        if var_name == 'notification_format':
-            return default_notification_format_for_watch
-        if var_name == 'notification_body':
-            return default_notification_body
-        if var_name == 'notification_title':
-            return default_notification_title
-
-        return None

    def send_content_changed_notification(self, watch_uuid):

+        from changedetectionio.notification import (
+            default_notification_format_for_watch
+        )
+
        n_object = {}
-        watch = self.datastore.data['watching'].get(watch_uuid)
+        watch = self.datastore.data['watching'].get(watch_uuid, False)
        if not watch:
            return

@@ -117,20 +87,57 @@ class update_worker(threading.Thread):
            )

        # Should be a better parent getter in the model object
-
        # Prefer - Individual watch settings > Tag settings >  Global settings (in that order)
-        n_object['notification_urls'] = self._check_cascading_vars('notification_urls', watch)
-        n_object['notification_title'] = self._check_cascading_vars('notification_title', watch)
-        n_object['notification_body'] = self._check_cascading_vars('notification_body', watch)
-        n_object['notification_format'] = self._check_cascading_vars('notification_format', watch)
+        n_object['notification_urls'] = watch.get('notification_urls')
+
+        n_object['notification_title'] = watch['notification_title'] if watch['notification_title'] else \
+            self.datastore.data['settings']['application']['notification_title']
+
+        n_object['notification_body'] = watch['notification_body'] if watch['notification_body'] else \
+            self.datastore.data['settings']['application']['notification_body']
+
+        n_object['notification_format'] = watch['notification_format'] if watch['notification_format'] != default_notification_format_for_watch else \
+            self.datastore.data['settings']['application']['notification_format']

        # (Individual watch) Only prepare to notify if the rules above matched
-        queued = False
-        if n_object and n_object.get('notification_urls'):
-            queued = True
+        sent = False
+        if 'notification_urls' in n_object and n_object['notification_urls']:
+            sent = True
            self.queue_notification_for_watch(n_object, watch)

-        return queued
+        # (Group tags) try by group tag
+        if not sent:
+            # Else, Try by tag, and use system default vars for format, body etc as fallback
+            tags = self.datastore.get_all_tags_for_watch(uuid=watch_uuid)
+            for tag_uuid, tag in tags.items():
+                n_object = {}
+                n_object['notification_urls'] = tag.get('notification_urls')
+
+                n_object['notification_title'] = tag.get('notification_title') if tag.get('notification_title') else \
+                    self.datastore.data['settings']['application']['notification_title']
+
+                n_object['notification_body'] = tag.get('notification_body') if tag.get('notification_body') else \
+                    self.datastore.data['settings']['application']['notification_body']
+
+                n_object['notification_format'] = tag.get('notification_format') if tag.get('notification_format') != default_notification_format_for_watch else \
+                    self.datastore.data['settings']['application']['notification_format']
+
+                if 'notification_urls' in n_object and n_object.get('notification_urls') and not tag.get('notification_muted'):
+                    sent = True
+                    self.queue_notification_for_watch(n_object, watch)
+
+        # (Group tags) try by global
+        if not sent:
+            # leave this as is, but repeat in a loop for each tag also
+            n_object['notification_urls'] = self.datastore.data['settings']['application'].get('notification_urls')
+            n_object['notification_title'] = self.datastore.data['settings']['application'].get('notification_title')
+            n_object['notification_body'] = self.datastore.data['settings']['application'].get('notification_body')
+            n_object['notification_format'] = self.datastore.data['settings']['application'].get('notification_format')
+            if n_object.get('notification_urls') and n_object.get('notification_body') and n_object.get('notification_title'):
+                sent = True
+                self.queue_notification_for_watch(n_object, watch)
+
+        return sent


    def send_filter_failure_notification(self, watch_uuid):
--- a/requirements.txt
+++ b/requirements.txt
@@ -42,6 +42,8 @@ paho-mqtt
 # (introduced once apprise became a dep)
 cryptography~=3.4

+elementpath
+
 # Used for CSS filtering
 beautifulsoup4