diff --git a/tests/form_pages/test_all.py b/tests/form_pages/test_all.py index 6515444fd..039c4169e 100644 --- a/tests/form_pages/test_all.py +++ b/tests/form_pages/test_all.py @@ -8333,8 +8333,6 @@ def test_form_comment_is_hidden_attribute(pub): @pytest.fixture def create_formdata(pub): - pub = pub - FormDef.wipe() data = [ diff --git a/tests/test_formdef.py b/tests/test_formdef.py index 9b8000648..ef8318347 100644 --- a/tests/test_formdef.py +++ b/tests/test_formdef.py @@ -236,7 +236,12 @@ def test_file_field_migration(pub): ] formdef.fields[0].__dict__['file_type'] = [ 'image/*', - 'application/pdf,application/vnd.oasis.opendocument.text,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.oasis.opendocument.spreadsheet,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + ( + 'application/pdf,application/vnd.oasis.opendocument.text,application/msword,' + 'application/vnd.openxmlformats-officedocument.wordprocessingml.document,' + 'application/vnd.oasis.opendocument.spreadsheet,application/vnd.ms-excel,' + 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' + ), ] formdef.fields[1].__dict__['file_type'] = ['image/*'] formdef.store() @@ -246,7 +251,12 @@ def test_file_field_migration(pub): assert formdef.fields[0].document_type['id'] == '_legacy' assert formdef.fields[0].document_type['mimetypes'] == [ 'image/*', - 'application/pdf,application/vnd.oasis.opendocument.text,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.oasis.opendocument.spreadsheet,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + ( + 'application/pdf,application/vnd.oasis.opendocument.text,application/msword,' + 'application/vnd.openxmlformats-officedocument.wordprocessingml.document,' + 'application/vnd.oasis.opendocument.spreadsheet,application/vnd.ms-excel,' + 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' + ), ] assert formdef.fields[1].document_type['label'] == 'Image files' assert formdef.fields[0].document_type['label'] == 'Image files, Documents' diff --git a/tests/test_hobo.py b/tests/test_hobo.py index 3b4e266cf..93711c235 100644 --- a/tests/test_hobo.py +++ b/tests/test_hobo.py @@ -36,7 +36,6 @@ HOBO_JSON = { 'title': 'Authentic', 'base_url': 'http://authentic.example.net/', 'id': 3, - 'secret_key': '_b82$d)(xcw$dl@ieis@jhmrmbbeb4$=%lrpi*4p&b))*a*=5!', 'slug': 'authentic', 'secret_key': '12345', },