Refactor form handling (#548)

2022-04-19 21:43:07 +02:00
parent 380c512cc2
commit 8f062bfec9
19 changed files with 283 additions and 292 deletions
--- a/changedetectionio/tests/conftest.py
+++ b/changedetectionio/tests/conftest.py
@@ -16,6 +16,7 @@ def cleanup(datastore_path):
    # Unlink test output files
    files = ['output.txt',
             'url-watches.json',
+             'secret.txt',
             'notification.txt',
             'count.txt',
             'endpoint-content.txt'
--- a/changedetectionio/tests/test_access_control.py
+++ b/changedetectionio/tests/test_access_control.py
@@ -1,5 +1,5 @@
 from flask import url_for
-
+from . util import live_server_setup

 def test_check_access_control(app, client):
    # Still doesnt work, but this is closer.
@@ -12,9 +12,9 @@ def test_check_access_control(app, client):
        # Enable password check.
        res = c.post(
            url_for("settings_page"),
-            data={"password": "foobar",
-                  "minutes_between_check": 180,
-                  'fetch_backend': "html_requests"},
+            data={"application-password": "foobar",
+                  "requests-minutes_between_check": 180,
+                  'application-fetch_backend': "html_requests"},
            follow_redirects=True
        )

@@ -49,74 +49,31 @@ def test_check_access_control(app, client):
        assert b"minutes_between_check" in res.data
        assert b"fetch_backend" in res.data

+        ##################################################
+        # Remove password button, and check that it worked
+        ##################################################
        res = c.post(
            url_for("settings_page"),
            data={
-                "minutes_between_check": 180,
-                "tag": "",
-                "headers": "",
-                "fetch_backend": "html_webdriver",
-                "removepassword_button": "Remove password"
+                "requests-minutes_between_check": 180,
+                "application-fetch_backend": "html_webdriver",
+                "application-removepassword_button": "Remove password"
            },
            follow_redirects=True,
        )
+        assert b"Password protection removed." in res.data
+        assert b"LOG OUT" not in res.data

-# There was a bug where saving the settings form would submit a blank password
-def test_check_access_control_no_blank_password(app, client):
-    # Still doesnt work, but this is closer.
-
-    with app.test_client() as c:
-        # Check we dont have any password protection enabled yet.
-        res = c.get(url_for("settings_page"))
-        assert b"Remove password" not in res.data
-
-        # Enable password check.
+        ############################################################
+        # Be sure a blank password doesnt setup password protection
+        ############################################################
        res = c.post(
            url_for("settings_page"),
-            data={"password": "",
-                  "minutes_between_check": 180,
-                  'fetch_backend': "html_requests"},
+            data={"application-password": "",
+                  "requests-minutes_between_check": 180,
+                  'application-fetch_backend': "html_requests"},
            follow_redirects=True
        )

-        assert b"Password protection enabled." not in res.data
-        assert b"Login" not in res.data
+        assert b"Password protection enabled" not in res.data

-
-# There was a bug where saving the settings form would submit a blank password
-def test_check_access_no_remote_access_to_remove_password(app, client):
-    # Still doesnt work, but this is closer.
-
-    with app.test_client() as c:
-        # Check we dont have any password protection enabled yet.
-        res = c.get(url_for("settings_page"))
-        assert b"Remove password" not in res.data
-
-        # Enable password check.
-        res = c.post(
-            url_for("settings_page"),
-            data={"password": "password",
-                  "minutes_between_check": 180,
-                  'fetch_backend': "html_requests"},
-            follow_redirects=True
-        )
-
-        assert b"Password protection enabled." in res.data
-        assert b"Login" in res.data
-
-        res = c.post(
-            url_for("settings_page"),
-            data={
-                "minutes_between_check": 180,
-                "tag": "",
-                "headers": "",
-                "fetch_backend": "html_webdriver",
-                "removepassword_button": "Remove password"
-            },
-            follow_redirects=True,
-        )
-        assert b"Password protection removed." not in res.data
-
-        res = c.get(url_for("index"),
-              follow_redirects=True)
-        assert b"watch-table-wrapper" not in res.data
--- a/changedetectionio/tests/test_backend.py
+++ b/changedetectionio/tests/test_backend.py
@@ -109,7 +109,7 @@ def test_check_basic_change_detection_functionality(client, live_server):
    # Enable auto pickup of <title> in settings
    res = client.post(
        url_for("settings_page"),
-        data={"extract_title_as_title": "1", "minutes_between_check": 180, 'fetch_backend': "html_requests"},
+        data={"application-extract_title_as_title": "1", "requests-minutes_between_check": 180, 'application-fetch_backend': "html_requests"},
        follow_redirects=True
    )

--- a/changedetectionio/tests/test_ignore_text.py
+++ b/changedetectionio/tests/test_ignore_text.py
@@ -196,9 +196,9 @@ def test_check_global_ignore_text_functionality(client, live_server):
    res = client.post(
        url_for("settings_page"),
        data={
-            "minutes_between_check": 180,
-            "global_ignore_text": ignore_text,
-            'fetch_backend': "html_requests"
+            "requests-minutes_between_check": 180,
+            "application-global_ignore_text": ignore_text,
+            'application-fetch_backend': "html_requests"
        },
        follow_redirects=True
    )
--- a/changedetectionio/tests/test_ignorehyperlinks.py
+++ b/changedetectionio/tests/test_ignorehyperlinks.py
@@ -55,9 +55,9 @@ def test_render_anchor_tag_content_true(client, live_server):
    res = client.post(
        url_for("settings_page"),
        data={
-            "minutes_between_check": 180,
-            "render_anchor_tag_content": "true",
-            "fetch_backend": "html_requests",
+            "requests-minutes_between_check": 180,
+            "application-render_anchor_tag_content": "true",
+            "application-fetch_backend": "html_requests",
        },
        follow_redirects=True,
    )
@@ -116,9 +116,9 @@ def test_render_anchor_tag_content_false(client, live_server):
    res = client.post(
        url_for("settings_page"),
        data={
-            "minutes_between_check": 180,
-            "render_anchor_tag_content": "false",
-            "fetch_backend": "html_requests",
+            "requests-minutes_between_check": 180,
+            "application-render_anchor_tag_content": "false",
+            "application-fetch_backend": "html_requests",
        },
        follow_redirects=True,
    )
@@ -175,8 +175,8 @@ def test_render_anchor_tag_content_default(client, live_server):
    res = client.post(
        url_for("settings_page"),
        data={
-            "minutes_between_check": 180,
-            "fetch_backend": "html_requests",
+            "requests-minutes_between_check": 180,
+            "application-fetch_backend": "html_requests",
        },
        follow_redirects=True,
    )
--- a/changedetectionio/tests/test_ignorestatuscode.py
+++ b/changedetectionio/tests/test_ignorestatuscode.py
@@ -51,9 +51,9 @@ def test_normal_page_check_works_with_ignore_status_code(client, live_server):
    res = client.post(
        url_for("settings_page"),
        data={
-            "minutes_between_check": 180,
-            "ignore_status_codes": "y",
-            'fetch_backend': "html_requests"
+            "requests-minutes_between_check": 180,
+            "application-ignore_status_codes": "y",
+            'application-fetch_backend': "html_requests"
        },
        follow_redirects=True
    )
--- a/changedetectionio/tests/test_ignorewhitespace.py
+++ b/changedetectionio/tests/test_ignorewhitespace.py
@@ -61,9 +61,9 @@ def test_check_ignore_whitespace(client, live_server):
    res = client.post(
        url_for("settings_page"),
        data={
-            "minutes_between_check": 180,
-            "ignore_whitespace": "y",
-            'fetch_backend': "html_requests"
+            "requests-minutes_between_check": 180,
+            "application-ignore_whitespace": "y",
+            "application-fetch_backend": "html_requests"
        },
        follow_redirects=True
    )
--- a/changedetectionio/tests/test_notification.py
+++ b/changedetectionio/tests/test_notification.py
@@ -195,11 +195,11 @@ def test_notification_validation(client, live_server):
    # Now adding a wrong token should give us an error
    res = client.post(
        url_for("settings_page"),
-        data={"notification_title": "New ChangeDetection.io Notification - {watch_url}",
-              "notification_body": "Rubbish: {rubbish}\n",
-              "notification_format": "Text",
-              "notification_urls": "json://localhost/foobar",
-              "time_between_check": {'seconds': 180},
+        data={"application-notification_title": "New ChangeDetection.io Notification - {watch_url}",
+              "application-notification_body": "Rubbish: {rubbish}\n",
+              "application-notification_format": "Text",
+              "application-notification_urls": "json://localhost/foobar",
+              "requests-minutes_between_check": 180,
              "fetch_backend": "html_requests"
              },
        follow_redirects=True
--- a/changedetectionio/tests/test_request.py
+++ b/changedetectionio/tests/test_request.py
@@ -84,9 +84,25 @@ def test_body_in_request(client, live_server):
    )
    assert b"1 Imported" in res.data

-    body_value = 'Test Body Value'
+    time.sleep(3)

-    # Add a properly formatted body with a proper method
+    # add the first 'version'
+    res = client.post(
+        url_for("edit_page", uuid="first"),
+        data={
+              "url": test_url,
+              "tag": "",
+              "method": "POST",
+              "fetch_backend": "html_requests",
+              "body": "something something"},
+        follow_redirects=True
+    )
+    assert b"Updated watch." in res.data
+
+    time.sleep(3)
+
+    # Now the change which should trigger a change
+    body_value = 'Test Body Value'
    res = client.post(
        url_for("edit_page", uuid="first"),
        data={
--- a/changedetectionio/tests/test_watch_fields_storage.py
+++ b/changedetectionio/tests/test_watch_fields_storage.py
@@ -56,8 +56,8 @@ def test_check_recheck_global_setting(client, live_server):
    res = client.post(
        url_for("settings_page"),
        data={
-               "minutes_between_check": 1566,
-               'fetch_backend': "html_requests"
+               "requests-minutes_between_check": 1566,
+               'application-fetch_backend': "html_requests"
               },
        follow_redirects=True
    )
@@ -88,8 +88,8 @@ def test_check_recheck_global_setting(client, live_server):
    res = client.post(
        url_for("settings_page"),
        data={
-               "minutes_between_check": 222,
-                'fetch_backend': "html_requests"
+               "requests-minutes_between_check": 222,
+                'application-fetch_backend': "html_requests"
               },
        follow_redirects=True
    )
@@ -124,8 +124,8 @@ def test_check_recheck_global_setting(client, live_server):
    res = client.post(
        url_for("settings_page"),
        data={
-               "minutes_between_check": 666,
-                'fetch_backend': "html_requests"
+               "requests-minutes_between_check": 666,
+                'application-fetch_backend': "html_requests"
               },
        follow_redirects=True
    )
--- a/changedetectionio/tests/util.py
+++ b/changedetectionio/tests/util.py
@@ -85,6 +85,7 @@ def live_server_setup(live_server):
    # Just return the body in the request
    @live_server.app.route('/test-body', methods=['POST', 'GET'])
    def test_body():
+        print ("TEST-BODY GOT", request.data, "returning")
        return request.data

    # Just return the verb in the request