adjust tests

fiduswriter · Mar 9, 2023 · 20b6d24 · 20b6d24
1 parent 9dc79df
commit 20b6d24
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/fiduswriter/phplist/tests/test_phplist.py b/fiduswriter/phplist/tests/test_phplist.py
@@ -1,5 +1,4 @@
 import time
-import json
 import multiprocessing
 from http.server import BaseHTTPRequestHandler, HTTPServer
 import cgi
@@ -22,7 +21,7 @@
 # From https://realpython.com/testing-third-party-apis-with-mock-servers/
 class MockServerRequestHandler(BaseHTTPRequestHandler):
     def do_POST(self):
-        if self.path != "/admin/?page=call&pi=restapi":
+        if self.path != "/admin/?page=importsimple":
             self.send_response(requests.codes.not_found)
             self.end_headers()
             return
@@ -34,23 +33,23 @@ def do_POST(self):
                 "CONTENT_TYPE": self.headers["Content-Type"],
             },
         )
-        cmd = form["cmd"].value
-        if cmd == "login":
+        if "cmd" in form and form["cmd"].value == "login":
             self.send_response(requests.codes.ok)
             self.send_header("Set-Cookie", "fish=2000")
             self.end_headers()
-        elif cmd == "subscriberAdd":
-            self.send_response(requests.codes.ok)
-            self.send_header("Content-Type", "application/json")
-            self.end_headers()
             self.wfile.write(
-                json.dumps({"status": "OK", "data": {"id": 19}}).encode(
-                    encoding="utf_8"
+                '<html><head></head><body><input type="hidden" name="formtoken" value="1f2342432j4bn3b237114" /></body></html>'.encode(
+                    "utf-8"
                 )
             )
-        elif cmd == "listSubscriberAdd":
+        elif "importcontent" in form:
             self.send_response(requests.codes.ok)
             self.end_headers()
+            self.wfile.write(
+                "<html><head></head><body>Email has been subscribed!</body></html>".encode(
+                    "utf-8"
+                )
+            )
         else:
             self.send_response(requests.codes.not_found)
             self.end_headers()

diff --git a/fiduswriter/phplist/views.py b/fiduswriter/phplist/views.py
@@ -1,4 +1,3 @@
-import json
 import re
 from httpx import AsyncClient, HTTPError
 from asgiref.sync import async_to_sync, sync_to_async
@@ -31,7 +30,6 @@ async def subscribe_email(request):
                 url,
                 params={"page": "importsimple"},
                 headers={
-                    "Accept": "application/json",
                     "Content-Type": "application/x-www-form-urlencoded",
                 },
                 content=urlencode(login_data),
@@ -68,7 +66,6 @@ async def subscribe_email(request):
             url,
             params={"page": "importsimple"},
             headers={
-                "Accept": "application/json",
                 "Cookie": session_cookie,
                 "Content-Type": "application/x-www-form-urlencoded",
             },