From 79dd2cad20ea4a15387c6d67c1b50ea98199013c Mon Sep 17 00:00:00 2001 From: UlrichB22 <97119703+UlrichB22@users.noreply.github.com> Date: Wed, 21 Dec 2022 22:04:14 +0100 Subject: [PATCH 1/2] Fix doctype in test_frontend.py for Werkzeug >= 2.1.2 --- src/moin/apps/frontend/_tests/test_frontend.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/moin/apps/frontend/_tests/test_frontend.py b/src/moin/apps/frontend/_tests/test_frontend.py index 1d72ef77e..8d8d94b93 100644 --- a/src/moin/apps/frontend/_tests/test_frontend.py +++ b/src/moin/apps/frontend/_tests/test_frontend.py @@ -39,7 +39,10 @@ def _test_view(self, viewname, status='200 OK', data=('', ''), cont assert rv.headers['Content-Type'] in content_types if method == 'GET': for item in data: - assert item in rv_data + if item == '= 2.1.2 is set + assert item in str(rv_data).lower() + else: + assert item in rv_data return rv def _test_view_post(self, viewname, status='302 FOUND', content_types=('text/html; charset=utf-8', ), data=('', ''), form=None, viewopts=None): @@ -175,7 +178,7 @@ def test_orphaned_items(self): self._test_view('frontend.orphaned_items') def test_quicklink_item(self): - self._test_view('frontend.quicklink_item', status='302 FOUND', viewopts=dict(item_name='DoesntExist'), data=[' Date: Wed, 21 Dec 2022 22:46:54 +0100 Subject: [PATCH 2/2] Fix doctype in test_serve.py for Werkzeug >= 2.1.2 --- src/moin/apps/serve/_tests/test_serve.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/moin/apps/serve/_tests/test_serve.py b/src/moin/apps/serve/_tests/test_serve.py index e331be069..4b1a74e66 100644 --- a/src/moin/apps/serve/_tests/test_serve.py +++ b/src/moin/apps/serve/_tests/test_serve.py @@ -20,4 +20,5 @@ def test_files(self, app): rv = c.get(url_for('serve.files', name="DoesntExist")) assert rv.status == '404 NOT FOUND' assert rv.headers['Content-Type'] == 'text/html; charset=utf-8' - assert b'= 2.1.2 is set (PR 1325) + assert '