udata 9.1.2.dev30355__py2.py3-none-any.whl → 9.1.2.dev30382__py2.py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of udata might be problematic. Click here for more details.
- tasks/__init__.py +109 -107
- tasks/helpers.py +18 -18
- udata/__init__.py +4 -4
- udata/admin/views.py +5 -5
- udata/api/__init__.py +135 -124
- udata/api/commands.py +45 -37
- udata/api/errors.py +5 -4
- udata/api/fields.py +23 -21
- udata/api/oauth2.py +55 -74
- udata/api/parsers.py +15 -15
- udata/api/signals.py +1 -1
- udata/api_fields.py +137 -89
- udata/app.py +56 -54
- udata/assets.py +5 -5
- udata/auth/__init__.py +37 -26
- udata/auth/forms.py +23 -15
- udata/auth/helpers.py +1 -1
- udata/auth/mails.py +3 -3
- udata/auth/password_validation.py +19 -15
- udata/auth/views.py +94 -68
- udata/commands/__init__.py +71 -69
- udata/commands/cache.py +7 -7
- udata/commands/db.py +201 -140
- udata/commands/dcat.py +36 -30
- udata/commands/fixtures.py +100 -84
- udata/commands/images.py +21 -20
- udata/commands/info.py +17 -20
- udata/commands/init.py +10 -10
- udata/commands/purge.py +12 -13
- udata/commands/serve.py +41 -29
- udata/commands/static.py +16 -18
- udata/commands/test.py +20 -20
- udata/commands/tests/fixtures.py +26 -24
- udata/commands/worker.py +31 -33
- udata/core/__init__.py +12 -12
- udata/core/activity/__init__.py +0 -1
- udata/core/activity/api.py +59 -49
- udata/core/activity/models.py +28 -26
- udata/core/activity/signals.py +1 -1
- udata/core/activity/tasks.py +16 -10
- udata/core/badges/api.py +6 -6
- udata/core/badges/commands.py +14 -13
- udata/core/badges/fields.py +8 -5
- udata/core/badges/forms.py +7 -4
- udata/core/badges/models.py +16 -31
- udata/core/badges/permissions.py +1 -3
- udata/core/badges/signals.py +2 -2
- udata/core/badges/tasks.py +3 -2
- udata/core/badges/tests/test_commands.py +10 -10
- udata/core/badges/tests/test_model.py +24 -31
- udata/core/contact_point/api.py +19 -18
- udata/core/contact_point/api_fields.py +21 -14
- udata/core/contact_point/factories.py +2 -2
- udata/core/contact_point/forms.py +7 -6
- udata/core/contact_point/models.py +3 -5
- udata/core/dataservices/api.py +26 -21
- udata/core/dataservices/factories.py +13 -11
- udata/core/dataservices/models.py +35 -40
- udata/core/dataservices/permissions.py +4 -4
- udata/core/dataservices/rdf.py +40 -17
- udata/core/dataservices/tasks.py +4 -3
- udata/core/dataset/actions.py +10 -10
- udata/core/dataset/activities.py +21 -23
- udata/core/dataset/api.py +321 -298
- udata/core/dataset/api_fields.py +443 -271
- udata/core/dataset/apiv2.py +305 -229
- udata/core/dataset/commands.py +38 -36
- udata/core/dataset/constants.py +61 -54
- udata/core/dataset/csv.py +70 -74
- udata/core/dataset/events.py +39 -32
- udata/core/dataset/exceptions.py +8 -4
- udata/core/dataset/factories.py +57 -65
- udata/core/dataset/forms.py +87 -63
- udata/core/dataset/models.py +336 -280
- udata/core/dataset/permissions.py +9 -6
- udata/core/dataset/preview.py +15 -17
- udata/core/dataset/rdf.py +156 -122
- udata/core/dataset/search.py +92 -77
- udata/core/dataset/signals.py +1 -1
- udata/core/dataset/tasks.py +63 -54
- udata/core/discussions/actions.py +5 -5
- udata/core/discussions/api.py +124 -120
- udata/core/discussions/factories.py +2 -2
- udata/core/discussions/forms.py +9 -7
- udata/core/discussions/metrics.py +1 -3
- udata/core/discussions/models.py +25 -24
- udata/core/discussions/notifications.py +18 -14
- udata/core/discussions/permissions.py +3 -3
- udata/core/discussions/signals.py +4 -4
- udata/core/discussions/tasks.py +24 -28
- udata/core/followers/api.py +32 -33
- udata/core/followers/models.py +9 -9
- udata/core/followers/signals.py +3 -3
- udata/core/jobs/actions.py +7 -7
- udata/core/jobs/api.py +99 -92
- udata/core/jobs/commands.py +48 -49
- udata/core/jobs/forms.py +11 -11
- udata/core/jobs/models.py +6 -6
- udata/core/metrics/__init__.py +2 -2
- udata/core/metrics/commands.py +34 -30
- udata/core/metrics/models.py +2 -4
- udata/core/metrics/signals.py +1 -1
- udata/core/metrics/tasks.py +3 -3
- udata/core/organization/activities.py +12 -15
- udata/core/organization/api.py +167 -174
- udata/core/organization/api_fields.py +183 -124
- udata/core/organization/apiv2.py +32 -32
- udata/core/organization/commands.py +20 -22
- udata/core/organization/constants.py +11 -11
- udata/core/organization/csv.py +17 -15
- udata/core/organization/factories.py +8 -11
- udata/core/organization/forms.py +32 -26
- udata/core/organization/metrics.py +2 -1
- udata/core/organization/models.py +87 -67
- udata/core/organization/notifications.py +18 -14
- udata/core/organization/permissions.py +10 -11
- udata/core/organization/rdf.py +14 -14
- udata/core/organization/search.py +30 -28
- udata/core/organization/signals.py +7 -7
- udata/core/organization/tasks.py +42 -61
- udata/core/owned.py +38 -27
- udata/core/post/api.py +82 -81
- udata/core/post/constants.py +8 -5
- udata/core/post/factories.py +4 -4
- udata/core/post/forms.py +13 -14
- udata/core/post/models.py +20 -22
- udata/core/post/tests/test_api.py +30 -32
- udata/core/reports/api.py +8 -7
- udata/core/reports/constants.py +1 -3
- udata/core/reports/models.py +10 -10
- udata/core/reuse/activities.py +15 -19
- udata/core/reuse/api.py +123 -126
- udata/core/reuse/api_fields.py +120 -85
- udata/core/reuse/apiv2.py +11 -10
- udata/core/reuse/constants.py +23 -23
- udata/core/reuse/csv.py +18 -18
- udata/core/reuse/factories.py +5 -9
- udata/core/reuse/forms.py +24 -21
- udata/core/reuse/models.py +55 -51
- udata/core/reuse/permissions.py +2 -2
- udata/core/reuse/search.py +49 -46
- udata/core/reuse/signals.py +1 -1
- udata/core/reuse/tasks.py +4 -5
- udata/core/site/api.py +47 -50
- udata/core/site/factories.py +2 -2
- udata/core/site/forms.py +4 -5
- udata/core/site/models.py +94 -63
- udata/core/site/rdf.py +14 -14
- udata/core/spam/api.py +16 -9
- udata/core/spam/constants.py +4 -4
- udata/core/spam/fields.py +13 -7
- udata/core/spam/models.py +27 -20
- udata/core/spam/signals.py +1 -1
- udata/core/spam/tests/test_spam.py +6 -5
- udata/core/spatial/api.py +72 -80
- udata/core/spatial/api_fields.py +73 -58
- udata/core/spatial/commands.py +67 -64
- udata/core/spatial/constants.py +3 -3
- udata/core/spatial/factories.py +37 -54
- udata/core/spatial/forms.py +27 -26
- udata/core/spatial/geoids.py +17 -17
- udata/core/spatial/models.py +43 -47
- udata/core/spatial/tasks.py +2 -1
- udata/core/spatial/tests/test_api.py +115 -130
- udata/core/spatial/tests/test_fields.py +74 -77
- udata/core/spatial/tests/test_geoid.py +22 -22
- udata/core/spatial/tests/test_models.py +5 -7
- udata/core/spatial/translations.py +16 -16
- udata/core/storages/__init__.py +16 -18
- udata/core/storages/api.py +66 -64
- udata/core/storages/tasks.py +7 -7
- udata/core/storages/utils.py +15 -15
- udata/core/storages/views.py +5 -6
- udata/core/tags/api.py +17 -14
- udata/core/tags/csv.py +4 -4
- udata/core/tags/models.py +8 -5
- udata/core/tags/tasks.py +11 -13
- udata/core/tags/views.py +4 -4
- udata/core/topic/api.py +84 -73
- udata/core/topic/apiv2.py +157 -127
- udata/core/topic/factories.py +3 -4
- udata/core/topic/forms.py +12 -14
- udata/core/topic/models.py +14 -19
- udata/core/topic/parsers.py +26 -26
- udata/core/user/activities.py +30 -29
- udata/core/user/api.py +151 -152
- udata/core/user/api_fields.py +132 -100
- udata/core/user/apiv2.py +7 -7
- udata/core/user/commands.py +38 -38
- udata/core/user/factories.py +8 -9
- udata/core/user/forms.py +14 -11
- udata/core/user/metrics.py +2 -2
- udata/core/user/models.py +68 -69
- udata/core/user/permissions.py +4 -5
- udata/core/user/rdf.py +7 -8
- udata/core/user/tasks.py +2 -2
- udata/core/user/tests/test_user_model.py +24 -16
- udata/db/tasks.py +2 -1
- udata/entrypoints.py +35 -31
- udata/errors.py +2 -1
- udata/event/values.py +6 -6
- udata/factories.py +2 -2
- udata/features/identicon/api.py +5 -6
- udata/features/identicon/backends.py +48 -55
- udata/features/identicon/tests/test_backends.py +4 -5
- udata/features/notifications/__init__.py +0 -1
- udata/features/notifications/actions.py +9 -9
- udata/features/notifications/api.py +17 -13
- udata/features/territories/__init__.py +12 -10
- udata/features/territories/api.py +14 -15
- udata/features/territories/models.py +23 -28
- udata/features/transfer/actions.py +8 -11
- udata/features/transfer/api.py +84 -77
- udata/features/transfer/factories.py +2 -1
- udata/features/transfer/models.py +11 -12
- udata/features/transfer/notifications.py +19 -15
- udata/features/transfer/permissions.py +5 -5
- udata/forms/__init__.py +5 -2
- udata/forms/fields.py +164 -172
- udata/forms/validators.py +19 -22
- udata/forms/widgets.py +9 -13
- udata/frontend/__init__.py +31 -26
- udata/frontend/csv.py +68 -58
- udata/frontend/markdown.py +40 -44
- udata/harvest/actions.py +89 -77
- udata/harvest/api.py +294 -238
- udata/harvest/backends/__init__.py +4 -4
- udata/harvest/backends/base.py +128 -111
- udata/harvest/backends/dcat.py +80 -66
- udata/harvest/commands.py +56 -60
- udata/harvest/csv.py +8 -8
- udata/harvest/exceptions.py +6 -3
- udata/harvest/filters.py +24 -23
- udata/harvest/forms.py +27 -28
- udata/harvest/models.py +88 -80
- udata/harvest/notifications.py +15 -10
- udata/harvest/signals.py +13 -13
- udata/harvest/tasks.py +11 -10
- udata/harvest/tests/factories.py +23 -24
- udata/harvest/tests/test_actions.py +136 -166
- udata/harvest/tests/test_api.py +220 -214
- udata/harvest/tests/test_base_backend.py +117 -112
- udata/harvest/tests/test_dcat_backend.py +380 -308
- udata/harvest/tests/test_filters.py +33 -22
- udata/harvest/tests/test_models.py +11 -14
- udata/harvest/tests/test_notifications.py +6 -7
- udata/harvest/tests/test_tasks.py +7 -6
- udata/i18n.py +237 -78
- udata/linkchecker/backends.py +5 -11
- udata/linkchecker/checker.py +23 -22
- udata/linkchecker/commands.py +4 -6
- udata/linkchecker/models.py +6 -6
- udata/linkchecker/tasks.py +18 -20
- udata/mail.py +21 -21
- udata/migrations/2020-07-24-remove-s-from-scope-oauth.py +9 -8
- udata/migrations/2020-08-24-add-fs-filename.py +9 -8
- udata/migrations/2020-09-28-update-reuses-datasets-metrics.py +5 -4
- udata/migrations/2020-10-16-migrate-ods-resources.py +9 -10
- udata/migrations/2021-04-08-update-schema-with-new-structure.py +8 -7
- udata/migrations/2021-05-27-fix-default-schema-name.py +7 -6
- udata/migrations/2021-07-05-remove-unused-badges.py +17 -15
- udata/migrations/2021-07-07-update-schema-for-community-resources.py +7 -6
- udata/migrations/2021-08-17-follow-integrity.py +5 -4
- udata/migrations/2021-08-17-harvest-integrity.py +13 -12
- udata/migrations/2021-08-17-oauth2client-integrity.py +5 -4
- udata/migrations/2021-08-17-transfer-integrity.py +5 -4
- udata/migrations/2021-08-17-users-integrity.py +9 -8
- udata/migrations/2021-12-14-reuse-topics.py +7 -6
- udata/migrations/2022-04-21-improve-extension-detection.py +8 -7
- udata/migrations/2022-09-22-clean-inactive-harvest-datasets.py +16 -14
- udata/migrations/2022-10-10-add-fs_uniquifier-to-user-model.py +6 -6
- udata/migrations/2022-10-10-migrate-harvest-extras.py +36 -26
- udata/migrations/2023-02-08-rename-internal-dates.py +46 -28
- udata/migrations/2024-01-29-fix-reuse-and-dataset-with-private-None.py +10 -8
- udata/migrations/2024-03-22-migrate-activity-kwargs-to-extras.py +6 -4
- udata/migrations/2024-06-11-fix-reuse-datasets-references.py +7 -6
- udata/migrations/__init__.py +123 -105
- udata/models/__init__.py +4 -4
- udata/mongo/__init__.py +13 -11
- udata/mongo/badges_field.py +3 -2
- udata/mongo/datetime_fields.py +13 -12
- udata/mongo/document.py +17 -16
- udata/mongo/engine.py +15 -16
- udata/mongo/errors.py +2 -1
- udata/mongo/extras_fields.py +30 -20
- udata/mongo/queryset.py +12 -12
- udata/mongo/slug_fields.py +38 -28
- udata/mongo/taglist_field.py +1 -2
- udata/mongo/url_field.py +5 -5
- udata/mongo/uuid_fields.py +4 -3
- udata/notifications/__init__.py +1 -1
- udata/notifications/mattermost.py +10 -9
- udata/rdf.py +167 -188
- udata/routing.py +40 -45
- udata/search/__init__.py +18 -19
- udata/search/adapter.py +17 -16
- udata/search/commands.py +44 -51
- udata/search/fields.py +13 -20
- udata/search/query.py +23 -18
- udata/search/result.py +9 -10
- udata/sentry.py +21 -19
- udata/settings.py +262 -198
- udata/sitemap.py +8 -6
- udata/static/chunks/{11.e9b9ca1f3e03d4020377.js → 11.52e531c19f8de80c00cf.js} +3 -3
- udata/static/chunks/{11.e9b9ca1f3e03d4020377.js.map → 11.52e531c19f8de80c00cf.js.map} +1 -1
- udata/static/chunks/{13.038c0d9aa0dfa0181c4b.js → 13.c3343a7f1070061c0e10.js} +2 -2
- udata/static/chunks/{13.038c0d9aa0dfa0181c4b.js.map → 13.c3343a7f1070061c0e10.js.map} +1 -1
- udata/static/chunks/{16.0baa2b64a74a2dcde25c.js → 16.8fa42440ad75ca172e6d.js} +2 -2
- udata/static/chunks/{16.0baa2b64a74a2dcde25c.js.map → 16.8fa42440ad75ca172e6d.js.map} +1 -1
- udata/static/chunks/{19.350a9f150b074b4ecefa.js → 19.9c6c8412729cd6d59cfa.js} +3 -3
- udata/static/chunks/{19.350a9f150b074b4ecefa.js.map → 19.9c6c8412729cd6d59cfa.js.map} +1 -1
- udata/static/chunks/{5.6ebbce2b9b3e696d3da5.js → 5.71d15c2e4f21feee2a9a.js} +3 -3
- udata/static/chunks/{5.6ebbce2b9b3e696d3da5.js.map → 5.71d15c2e4f21feee2a9a.js.map} +1 -1
- udata/static/chunks/{6.d8a5f7b017bcbd083641.js → 6.9139dc098b8ea640b890.js} +3 -3
- udata/static/chunks/{6.d8a5f7b017bcbd083641.js.map → 6.9139dc098b8ea640b890.js.map} +1 -1
- udata/static/common.js +1 -1
- udata/static/common.js.map +1 -1
- udata/storage/s3.py +20 -13
- udata/tags.py +4 -5
- udata/tasks.py +43 -42
- udata/tests/__init__.py +9 -6
- udata/tests/api/__init__.py +5 -6
- udata/tests/api/test_auth_api.py +395 -321
- udata/tests/api/test_base_api.py +31 -33
- udata/tests/api/test_contact_points.py +7 -9
- udata/tests/api/test_dataservices_api.py +211 -158
- udata/tests/api/test_datasets_api.py +823 -812
- udata/tests/api/test_follow_api.py +13 -15
- udata/tests/api/test_me_api.py +95 -112
- udata/tests/api/test_organizations_api.py +301 -339
- udata/tests/api/test_reports_api.py +35 -25
- udata/tests/api/test_reuses_api.py +134 -139
- udata/tests/api/test_swagger.py +5 -5
- udata/tests/api/test_tags_api.py +18 -25
- udata/tests/api/test_topics_api.py +94 -94
- udata/tests/api/test_transfer_api.py +53 -48
- udata/tests/api/test_user_api.py +128 -141
- udata/tests/apiv2/test_datasets.py +290 -198
- udata/tests/apiv2/test_me_api.py +10 -11
- udata/tests/apiv2/test_organizations.py +56 -74
- udata/tests/apiv2/test_swagger.py +5 -5
- udata/tests/apiv2/test_topics.py +69 -87
- udata/tests/cli/test_cli_base.py +8 -8
- udata/tests/cli/test_db_cli.py +21 -19
- udata/tests/dataservice/test_dataservice_tasks.py +8 -12
- udata/tests/dataset/test_csv_adapter.py +44 -35
- udata/tests/dataset/test_dataset_actions.py +2 -3
- udata/tests/dataset/test_dataset_commands.py +7 -8
- udata/tests/dataset/test_dataset_events.py +36 -29
- udata/tests/dataset/test_dataset_model.py +224 -217
- udata/tests/dataset/test_dataset_rdf.py +142 -131
- udata/tests/dataset/test_dataset_tasks.py +15 -15
- udata/tests/dataset/test_resource_preview.py +10 -13
- udata/tests/features/territories/__init__.py +9 -13
- udata/tests/features/territories/test_territories_api.py +71 -91
- udata/tests/forms/test_basic_fields.py +7 -7
- udata/tests/forms/test_current_user_field.py +39 -66
- udata/tests/forms/test_daterange_field.py +31 -39
- udata/tests/forms/test_dict_field.py +28 -26
- udata/tests/forms/test_extras_fields.py +102 -76
- udata/tests/forms/test_form_field.py +8 -8
- udata/tests/forms/test_image_field.py +33 -26
- udata/tests/forms/test_model_field.py +134 -123
- udata/tests/forms/test_model_list_field.py +7 -7
- udata/tests/forms/test_nested_model_list_field.py +117 -79
- udata/tests/forms/test_publish_as_field.py +36 -65
- udata/tests/forms/test_reference_field.py +34 -53
- udata/tests/forms/test_user_forms.py +23 -21
- udata/tests/forms/test_uuid_field.py +6 -10
- udata/tests/frontend/__init__.py +9 -6
- udata/tests/frontend/test_auth.py +7 -6
- udata/tests/frontend/test_csv.py +81 -96
- udata/tests/frontend/test_hooks.py +43 -43
- udata/tests/frontend/test_markdown.py +211 -191
- udata/tests/helpers.py +32 -37
- udata/tests/models.py +2 -2
- udata/tests/organization/test_csv_adapter.py +21 -16
- udata/tests/organization/test_notifications.py +11 -18
- udata/tests/organization/test_organization_model.py +13 -13
- udata/tests/organization/test_organization_rdf.py +29 -22
- udata/tests/organization/test_organization_tasks.py +16 -17
- udata/tests/plugin.py +76 -73
- udata/tests/reuse/test_reuse_model.py +21 -21
- udata/tests/reuse/test_reuse_task.py +11 -13
- udata/tests/search/__init__.py +11 -12
- udata/tests/search/test_adapter.py +60 -70
- udata/tests/search/test_query.py +16 -16
- udata/tests/search/test_results.py +10 -7
- udata/tests/site/test_site_api.py +11 -16
- udata/tests/site/test_site_metrics.py +20 -30
- udata/tests/site/test_site_model.py +4 -5
- udata/tests/site/test_site_rdf.py +94 -78
- udata/tests/test_activity.py +17 -17
- udata/tests/test_discussions.py +292 -299
- udata/tests/test_i18n.py +37 -40
- udata/tests/test_linkchecker.py +91 -85
- udata/tests/test_mail.py +13 -17
- udata/tests/test_migrations.py +219 -180
- udata/tests/test_model.py +164 -157
- udata/tests/test_notifications.py +17 -17
- udata/tests/test_owned.py +14 -14
- udata/tests/test_rdf.py +25 -23
- udata/tests/test_routing.py +89 -93
- udata/tests/test_storages.py +137 -128
- udata/tests/test_tags.py +44 -46
- udata/tests/test_topics.py +7 -7
- udata/tests/test_transfer.py +42 -49
- udata/tests/test_uris.py +160 -161
- udata/tests/test_utils.py +79 -71
- udata/tests/user/test_user_rdf.py +5 -9
- udata/tests/workers/test_jobs_commands.py +57 -58
- udata/tests/workers/test_tasks_routing.py +23 -29
- udata/tests/workers/test_workers_api.py +125 -131
- udata/tests/workers/test_workers_helpers.py +6 -6
- udata/tracking.py +4 -6
- udata/uris.py +45 -46
- udata/utils.py +68 -66
- udata/wsgi.py +1 -1
- {udata-9.1.2.dev30355.dist-info → udata-9.1.2.dev30382.dist-info}/METADATA +3 -2
- udata-9.1.2.dev30382.dist-info/RECORD +704 -0
- udata-9.1.2.dev30355.dist-info/RECORD +0 -704
- {udata-9.1.2.dev30355.dist-info → udata-9.1.2.dev30382.dist-info}/LICENSE +0 -0
- {udata-9.1.2.dev30355.dist-info → udata-9.1.2.dev30382.dist-info}/WHEEL +0 -0
- {udata-9.1.2.dev30355.dist-info → udata-9.1.2.dev30382.dist-info}/entry_points.txt +0 -0
- {udata-9.1.2.dev30355.dist-info → udata-9.1.2.dev30382.dist-info}/top_level.txt +0 -0
|
@@ -68,7 +68,7 @@ class NestedModelListFieldTest(TestCase):
|
|
|
68
68
|
|
|
69
69
|
def test_with_one_valid_data(self):
|
|
70
70
|
fake = Fake()
|
|
71
|
-
form = self.factory(MultiDict({
|
|
71
|
+
form = self.factory(MultiDict({"nested-0-name": "John Doe"}))
|
|
72
72
|
|
|
73
73
|
form.validate()
|
|
74
74
|
self.assertEqual(form.errors, {})
|
|
@@ -77,11 +77,11 @@ class NestedModelListFieldTest(TestCase):
|
|
|
77
77
|
|
|
78
78
|
self.assertEqual(len(fake.nested), 1)
|
|
79
79
|
self.assertIsInstance(fake.nested[0], Nested)
|
|
80
|
-
self.assertEqual(fake.nested[0].name,
|
|
80
|
+
self.assertEqual(fake.nested[0].name, "John Doe")
|
|
81
81
|
|
|
82
82
|
def test_with_one_valid_json(self):
|
|
83
83
|
fake = Fake()
|
|
84
|
-
form = self.factory({
|
|
84
|
+
form = self.factory({"nested": [{"name": "John Doe"}]})
|
|
85
85
|
|
|
86
86
|
form.validate()
|
|
87
87
|
self.assertEqual(form.errors, {})
|
|
@@ -90,15 +90,19 @@ class NestedModelListFieldTest(TestCase):
|
|
|
90
90
|
|
|
91
91
|
self.assertEqual(len(fake.nested), 1)
|
|
92
92
|
self.assertIsInstance(fake.nested[0], Nested)
|
|
93
|
-
self.assertEqual(fake.nested[0].name,
|
|
93
|
+
self.assertEqual(fake.nested[0].name, "John Doe")
|
|
94
94
|
|
|
95
95
|
def test_with_multiple_valid_data(self):
|
|
96
96
|
fake = Fake()
|
|
97
|
-
form = self.factory(
|
|
98
|
-
(
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
97
|
+
form = self.factory(
|
|
98
|
+
MultiDict(
|
|
99
|
+
[
|
|
100
|
+
("nested-0-name", faker.name()),
|
|
101
|
+
("nested-1-name", faker.name()),
|
|
102
|
+
("nested-2-name", faker.name()),
|
|
103
|
+
]
|
|
104
|
+
)
|
|
105
|
+
)
|
|
102
106
|
|
|
103
107
|
form.validate()
|
|
104
108
|
self.assertEqual(form.errors, {})
|
|
@@ -111,11 +115,15 @@ class NestedModelListFieldTest(TestCase):
|
|
|
111
115
|
|
|
112
116
|
def test_with_multiple_valid_json(self):
|
|
113
117
|
fake = Fake()
|
|
114
|
-
form = self.factory(
|
|
115
|
-
{
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
118
|
+
form = self.factory(
|
|
119
|
+
{
|
|
120
|
+
"nested": [
|
|
121
|
+
{"name": faker.name()},
|
|
122
|
+
{"name": faker.name()},
|
|
123
|
+
{"name": faker.name()},
|
|
124
|
+
]
|
|
125
|
+
}
|
|
126
|
+
)
|
|
119
127
|
|
|
120
128
|
form.validate()
|
|
121
129
|
self.assertEqual(form.errors, {})
|
|
@@ -127,16 +135,23 @@ class NestedModelListFieldTest(TestCase):
|
|
|
127
135
|
self.assertIsInstance(nested, Nested)
|
|
128
136
|
|
|
129
137
|
def test_with_initial_elements(self):
|
|
130
|
-
fake = Fake.objects.create(
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
138
|
+
fake = Fake.objects.create(
|
|
139
|
+
nested=[
|
|
140
|
+
Nested(name=faker.name()),
|
|
141
|
+
Nested(name=faker.name()),
|
|
142
|
+
]
|
|
143
|
+
)
|
|
134
144
|
order = [n.id for n in fake.nested]
|
|
135
|
-
form = self.factory(
|
|
136
|
-
{
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
145
|
+
form = self.factory(
|
|
146
|
+
{
|
|
147
|
+
"nested": [
|
|
148
|
+
{"id": str(fake.nested[0].id)},
|
|
149
|
+
{"id": str(fake.nested[1].id)},
|
|
150
|
+
{"name": faker.name()},
|
|
151
|
+
]
|
|
152
|
+
},
|
|
153
|
+
fake,
|
|
154
|
+
)
|
|
140
155
|
|
|
141
156
|
form.validate()
|
|
142
157
|
self.assertEqual(form.errors, {})
|
|
@@ -149,17 +164,19 @@ class NestedModelListFieldTest(TestCase):
|
|
|
149
164
|
self.assertIsNotNone(fake.nested[2].id)
|
|
150
165
|
|
|
151
166
|
def test_with_nested_initial_elements(self):
|
|
152
|
-
fake = Fake.objects.create(
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
167
|
+
fake = Fake.objects.create(
|
|
168
|
+
nested=[
|
|
169
|
+
Nested(name=faker.name(), sub=SubNested(name=faker.word())),
|
|
170
|
+
Nested(name=faker.name(), sub=SubNested(name=faker.word())),
|
|
171
|
+
]
|
|
172
|
+
)
|
|
156
173
|
order = [n.id for n in fake.nested]
|
|
157
174
|
data = [
|
|
158
|
-
{
|
|
159
|
-
{
|
|
160
|
-
{
|
|
175
|
+
{"id": str(fake.nested[0].id)},
|
|
176
|
+
{"id": str(fake.nested[1].id)},
|
|
177
|
+
{"name": faker.name(), "sub": {"name": faker.name()}},
|
|
161
178
|
]
|
|
162
|
-
form = self.factory({
|
|
179
|
+
form = self.factory({"nested": data}, fake, sub=True)
|
|
163
180
|
|
|
164
181
|
form.validate()
|
|
165
182
|
self.assertEqual(form.errors, {})
|
|
@@ -173,19 +190,26 @@ class NestedModelListFieldTest(TestCase):
|
|
|
173
190
|
self.assertIsNotNone(nested.sub)
|
|
174
191
|
self.assertIsNotNone(nested.sub.name)
|
|
175
192
|
self.assertIsNotNone(fake.nested[2].id)
|
|
176
|
-
self.assertEqual(fake.nested[2].sub.name, data[2][
|
|
193
|
+
self.assertEqual(fake.nested[2].sub.name, data[2]["sub"]["name"])
|
|
177
194
|
|
|
178
195
|
def test_with_initial_elements_as_ids(self):
|
|
179
|
-
fake = Fake.objects.create(
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
196
|
+
fake = Fake.objects.create(
|
|
197
|
+
nested=[
|
|
198
|
+
Nested(name=faker.name()),
|
|
199
|
+
Nested(name=faker.name()),
|
|
200
|
+
]
|
|
201
|
+
)
|
|
183
202
|
order = [n.id for n in fake.nested]
|
|
184
|
-
form = self.factory(
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
203
|
+
form = self.factory(
|
|
204
|
+
{
|
|
205
|
+
"nested": [
|
|
206
|
+
str(fake.nested[0].id),
|
|
207
|
+
str(fake.nested[1].id),
|
|
208
|
+
{"name": faker.name()},
|
|
209
|
+
]
|
|
210
|
+
},
|
|
211
|
+
fake,
|
|
212
|
+
)
|
|
189
213
|
|
|
190
214
|
form.validate()
|
|
191
215
|
self.assertEqual(form.errors, {})
|
|
@@ -198,12 +222,14 @@ class NestedModelListFieldTest(TestCase):
|
|
|
198
222
|
self.assertIsNotNone(fake.nested[2].id)
|
|
199
223
|
|
|
200
224
|
def test_with_non_submitted_initial_elements(self):
|
|
201
|
-
fake = Fake.objects.create(
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
225
|
+
fake = Fake.objects.create(
|
|
226
|
+
nested=[
|
|
227
|
+
Nested(name=faker.name()),
|
|
228
|
+
Nested(name=faker.name()),
|
|
229
|
+
]
|
|
230
|
+
)
|
|
205
231
|
initial = [(n.id, n.name) for n in fake.nested]
|
|
206
|
-
form = self.factory({
|
|
232
|
+
form = self.factory({"name": faker.word()}, fake)
|
|
207
233
|
|
|
208
234
|
form.validate()
|
|
209
235
|
self.assertEqual(form.errors, {})
|
|
@@ -217,17 +243,24 @@ class NestedModelListFieldTest(TestCase):
|
|
|
217
243
|
self.assertEqual(nested.name, name)
|
|
218
244
|
|
|
219
245
|
def test_update_initial_elements(self):
|
|
220
|
-
fake = Fake.objects.create(
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
246
|
+
fake = Fake.objects.create(
|
|
247
|
+
nested=[
|
|
248
|
+
Nested(name=faker.name()),
|
|
249
|
+
Nested(name=faker.name()),
|
|
250
|
+
]
|
|
251
|
+
)
|
|
224
252
|
initial = [n.id for n in fake.nested]
|
|
225
|
-
form = self.factory(
|
|
226
|
-
{
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
253
|
+
form = self.factory(
|
|
254
|
+
{
|
|
255
|
+
"nested": [
|
|
256
|
+
{"id": str(fake.nested[0].id), "name": faker.name()},
|
|
257
|
+
{"id": str(fake.nested[1].id), "name": faker.name()},
|
|
258
|
+
{"name": faker.name()},
|
|
259
|
+
]
|
|
260
|
+
},
|
|
261
|
+
fake,
|
|
262
|
+
)
|
|
263
|
+
names = [n["name"] for n in form.data["nested"]]
|
|
231
264
|
|
|
232
265
|
form.validate()
|
|
233
266
|
self.assertEqual(form.errors, {})
|
|
@@ -242,10 +275,15 @@ class NestedModelListFieldTest(TestCase):
|
|
|
242
275
|
self.assertIsNotNone(fake.nested[2].id)
|
|
243
276
|
|
|
244
277
|
def test_non_submitted_subnested(self):
|
|
245
|
-
form = self.factory(
|
|
246
|
-
{
|
|
247
|
-
|
|
248
|
-
|
|
278
|
+
form = self.factory(
|
|
279
|
+
{
|
|
280
|
+
"nested": [
|
|
281
|
+
{"name": faker.name()},
|
|
282
|
+
{"name": faker.name(), "sub": {"name": faker.name()}},
|
|
283
|
+
]
|
|
284
|
+
},
|
|
285
|
+
sub=True,
|
|
286
|
+
)
|
|
249
287
|
|
|
250
288
|
form.validate()
|
|
251
289
|
self.assertEqual(form.errors, {})
|
|
@@ -257,17 +295,17 @@ class NestedModelListFieldTest(TestCase):
|
|
|
257
295
|
self.assertIsNotNone(fake.nested[1].sub)
|
|
258
296
|
|
|
259
297
|
def test_reorder_initial_elements(self):
|
|
260
|
-
fake = Fake.objects.create(
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
298
|
+
fake = Fake.objects.create(
|
|
299
|
+
nested=[
|
|
300
|
+
Nested(name=faker.name()),
|
|
301
|
+
Nested(name=faker.name()),
|
|
302
|
+
Nested(name=faker.name()),
|
|
303
|
+
Nested(name=faker.name()),
|
|
304
|
+
]
|
|
305
|
+
)
|
|
266
306
|
initial = [(n.id, n.name) for n in fake.nested]
|
|
267
307
|
new_order = [1, 2, 3, 0]
|
|
268
|
-
form = self.factory({
|
|
269
|
-
{'id': str(fake.nested[i].id)} for i in new_order
|
|
270
|
-
]}, fake)
|
|
308
|
+
form = self.factory({"nested": [{"id": str(fake.nested[i].id)} for i in new_order]}, fake)
|
|
271
309
|
|
|
272
310
|
form.validate()
|
|
273
311
|
self.assertEqual(form.errors, {})
|
|
@@ -281,18 +319,18 @@ class NestedModelListFieldTest(TestCase):
|
|
|
281
319
|
self.assertEqual(nested.name, name)
|
|
282
320
|
|
|
283
321
|
def test_reorder_initial_elements_with_raw(self):
|
|
284
|
-
fake = Fake.objects.create(
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
322
|
+
fake = Fake.objects.create(
|
|
323
|
+
nested=[
|
|
324
|
+
Nested(name=faker.name(), raw={"test": 0}),
|
|
325
|
+
Nested(name=faker.name(), raw={"test": 1}),
|
|
326
|
+
Nested(name=faker.name(), raw={"test": 2}),
|
|
327
|
+
Nested(name=faker.name(), raw={"test": 3}),
|
|
328
|
+
]
|
|
329
|
+
)
|
|
290
330
|
initial = [(n.id, n.name) for n in fake.nested]
|
|
291
331
|
|
|
292
332
|
new_order = [1, 2, 3, 0]
|
|
293
|
-
form = self.factory({
|
|
294
|
-
{'id': str(fake.nested[i].id)} for i in new_order
|
|
295
|
-
]}, fake)
|
|
333
|
+
form = self.factory({"nested": [{"id": str(fake.nested[i].id)} for i in new_order]}, fake)
|
|
296
334
|
|
|
297
335
|
form.validate()
|
|
298
336
|
self.assertEqual(form.errors, {})
|
|
@@ -304,4 +342,4 @@ class NestedModelListFieldTest(TestCase):
|
|
|
304
342
|
id, name = initial[old_idx]
|
|
305
343
|
self.assertEqual(nested.id, id)
|
|
306
344
|
self.assertEqual(nested.name, name)
|
|
307
|
-
self.assertEqual(nested.raw[
|
|
345
|
+
self.assertEqual(nested.raw["test"], old_idx)
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
from bson import ObjectId
|
|
2
|
-
|
|
3
2
|
from werkzeug.datastructures import MultiDict
|
|
4
3
|
|
|
5
4
|
from udata.auth import login_user
|
|
6
|
-
from udata.core.user.factories import UserFactory, AdminFactory
|
|
7
5
|
from udata.core.organization.factories import OrganizationFactory
|
|
6
|
+
from udata.core.user.factories import AdminFactory, UserFactory
|
|
8
7
|
from udata.forms import ModelForm, fields
|
|
9
|
-
from udata.models import
|
|
8
|
+
from udata.models import Member, Organization, User, db
|
|
10
9
|
from udata.tests import TestCase
|
|
11
10
|
|
|
12
11
|
|
|
@@ -86,14 +85,12 @@ class PublishFieldTest(TestCase):
|
|
|
86
85
|
def test_with_valid_organization(self):
|
|
87
86
|
Ownable, OwnableForm = self.factory()
|
|
88
87
|
user = UserFactory()
|
|
89
|
-
member = Member(user=user, role=
|
|
88
|
+
member = Member(user=user, role="editor")
|
|
90
89
|
org = OrganizationFactory(members=[member])
|
|
91
90
|
|
|
92
91
|
login_user(user)
|
|
93
92
|
|
|
94
|
-
form = OwnableForm(MultiDict({
|
|
95
|
-
'organization': str(org.id)
|
|
96
|
-
}))
|
|
93
|
+
form = OwnableForm(MultiDict({"organization": str(org.id)}))
|
|
97
94
|
|
|
98
95
|
self.assertEqual(form.owner.data, user)
|
|
99
96
|
self.assertEqual(form.organization.data, org)
|
|
@@ -112,15 +109,12 @@ class PublishFieldTest(TestCase):
|
|
|
112
109
|
def test_organization_over_owner(self):
|
|
113
110
|
Ownable, OwnableForm = self.factory()
|
|
114
111
|
user = UserFactory()
|
|
115
|
-
member = Member(user=user, role=
|
|
112
|
+
member = Member(user=user, role="editor")
|
|
116
113
|
org = OrganizationFactory(members=[member])
|
|
117
114
|
|
|
118
115
|
login_user(user)
|
|
119
116
|
|
|
120
|
-
form = OwnableForm(MultiDict({
|
|
121
|
-
'owner': str(user.id),
|
|
122
|
-
'organization': str(org.id)
|
|
123
|
-
}))
|
|
117
|
+
form = OwnableForm(MultiDict({"owner": str(user.id), "organization": str(org.id)}))
|
|
124
118
|
|
|
125
119
|
self.assertEqual(form.owner.data, user)
|
|
126
120
|
self.assertEqual(form.organization.data, org)
|
|
@@ -139,14 +133,12 @@ class PublishFieldTest(TestCase):
|
|
|
139
133
|
def test_with_valid_organization_from_json(self):
|
|
140
134
|
Ownable, OwnableForm = self.factory()
|
|
141
135
|
user = UserFactory()
|
|
142
|
-
member = Member(user=user, role=
|
|
136
|
+
member = Member(user=user, role="editor")
|
|
143
137
|
org = OrganizationFactory(members=[member])
|
|
144
138
|
|
|
145
139
|
login_user(user)
|
|
146
140
|
|
|
147
|
-
form = OwnableForm.from_json({
|
|
148
|
-
'organization': str(org.id)
|
|
149
|
-
})
|
|
141
|
+
form = OwnableForm.from_json({"organization": str(org.id)})
|
|
150
142
|
|
|
151
143
|
self.assertEqual(form.owner.data, user)
|
|
152
144
|
self.assertEqual(form.organization.data, org)
|
|
@@ -165,14 +157,12 @@ class PublishFieldTest(TestCase):
|
|
|
165
157
|
def test_with_organization_object_from_json(self):
|
|
166
158
|
Ownable, OwnableForm = self.factory()
|
|
167
159
|
user = UserFactory()
|
|
168
|
-
member = Member(user=user, role=
|
|
160
|
+
member = Member(user=user, role="editor")
|
|
169
161
|
org = OrganizationFactory(members=[member])
|
|
170
162
|
|
|
171
163
|
login_user(user)
|
|
172
164
|
|
|
173
|
-
form = OwnableForm.from_json({
|
|
174
|
-
'organization': {'id': str(org.id)}
|
|
175
|
-
})
|
|
165
|
+
form = OwnableForm.from_json({"organization": {"id": str(org.id)}})
|
|
176
166
|
|
|
177
167
|
self.assertEqual(form.organization.data, org)
|
|
178
168
|
|
|
@@ -187,36 +177,29 @@ class PublishFieldTest(TestCase):
|
|
|
187
177
|
def test_with_invalid_data(self):
|
|
188
178
|
Ownable, OwnableForm = self.factory()
|
|
189
179
|
|
|
190
|
-
form = OwnableForm(MultiDict({
|
|
191
|
-
'organization': str('wrongwith12c')
|
|
192
|
-
}))
|
|
180
|
+
form = OwnableForm(MultiDict({"organization": str("wrongwith12c")}))
|
|
193
181
|
|
|
194
182
|
form.validate()
|
|
195
|
-
self.assertIn(
|
|
196
|
-
self.assertEqual(len(form.errors[
|
|
183
|
+
self.assertIn("organization", form.errors)
|
|
184
|
+
self.assertEqual(len(form.errors["organization"]), 1)
|
|
197
185
|
|
|
198
186
|
def test_with_organization_not_found(self):
|
|
199
187
|
Ownable, OwnableForm = self.factory()
|
|
200
188
|
|
|
201
|
-
form = OwnableForm(MultiDict({
|
|
202
|
-
'organization': str(ObjectId())
|
|
203
|
-
}))
|
|
189
|
+
form = OwnableForm(MultiDict({"organization": str(ObjectId())}))
|
|
204
190
|
|
|
205
191
|
form.validate()
|
|
206
|
-
self.assertIn(
|
|
207
|
-
self.assertEqual(len(form.errors[
|
|
192
|
+
self.assertIn("organization", form.errors)
|
|
193
|
+
self.assertEqual(len(form.errors["organization"]), 1)
|
|
208
194
|
|
|
209
195
|
def test_with_initial_and_both_member(self):
|
|
210
196
|
Ownable, OwnableForm = self.factory()
|
|
211
197
|
user = UserFactory()
|
|
212
|
-
org = OrganizationFactory(members=[Member(user=user, role=
|
|
213
|
-
neworg = OrganizationFactory(
|
|
214
|
-
members=[Member(user=user, role='editor')])
|
|
198
|
+
org = OrganizationFactory(members=[Member(user=user, role="editor")])
|
|
199
|
+
neworg = OrganizationFactory(members=[Member(user=user, role="editor")])
|
|
215
200
|
ownable = Ownable(organization=org)
|
|
216
201
|
|
|
217
|
-
form = OwnableForm(MultiDict({
|
|
218
|
-
'organization': str(neworg.id)
|
|
219
|
-
}), obj=ownable)
|
|
202
|
+
form = OwnableForm(MultiDict({"organization": str(neworg.id)}), obj=ownable)
|
|
220
203
|
|
|
221
204
|
self.assertEqual(form.organization.data, neworg)
|
|
222
205
|
|
|
@@ -231,65 +214,57 @@ class PublishFieldTest(TestCase):
|
|
|
231
214
|
def test_with_initial_and_not_member(self):
|
|
232
215
|
Ownable, OwnableForm = self.factory()
|
|
233
216
|
user = UserFactory()
|
|
234
|
-
org = OrganizationFactory(members=[Member(user=user, role=
|
|
217
|
+
org = OrganizationFactory(members=[Member(user=user, role="editor")])
|
|
235
218
|
neworg = OrganizationFactory()
|
|
236
219
|
ownable = Ownable(organization=org)
|
|
237
220
|
|
|
238
|
-
form = OwnableForm(MultiDict({
|
|
239
|
-
'organization': str(neworg.id)
|
|
240
|
-
}), obj=ownable)
|
|
221
|
+
form = OwnableForm(MultiDict({"organization": str(neworg.id)}), obj=ownable)
|
|
241
222
|
|
|
242
223
|
self.assertEqual(form.organization.data, neworg)
|
|
243
224
|
|
|
244
225
|
login_user(user)
|
|
245
226
|
form.validate()
|
|
246
|
-
self.assertIn(
|
|
247
|
-
self.assertEqual(len(form.errors[
|
|
227
|
+
self.assertIn("organization", form.errors)
|
|
228
|
+
self.assertEqual(len(form.errors["organization"]), 1)
|
|
248
229
|
|
|
249
230
|
def test_not_member(self):
|
|
250
231
|
Ownable, OwnableForm = self.factory()
|
|
251
|
-
member = Member(user=UserFactory(), role=
|
|
232
|
+
member = Member(user=UserFactory(), role="editor")
|
|
252
233
|
org = OrganizationFactory(members=[member])
|
|
253
234
|
|
|
254
235
|
login_user(UserFactory())
|
|
255
236
|
|
|
256
|
-
form = OwnableForm(MultiDict({
|
|
257
|
-
'organization': str(org.id)
|
|
258
|
-
}))
|
|
237
|
+
form = OwnableForm(MultiDict({"organization": str(org.id)}))
|
|
259
238
|
|
|
260
239
|
self.assertEqual(form.organization.data, org)
|
|
261
240
|
|
|
262
241
|
self.assertFalse(form.validate())
|
|
263
|
-
self.assertIn(
|
|
264
|
-
self.assertEqual(len(form.errors[
|
|
242
|
+
self.assertIn("organization", form.errors)
|
|
243
|
+
self.assertEqual(len(form.errors["organization"]), 1)
|
|
265
244
|
|
|
266
245
|
def test_no_user_logged_in_permission(self):
|
|
267
246
|
Ownable, OwnableForm = self.factory()
|
|
268
|
-
member = Member(user=UserFactory(), role=
|
|
247
|
+
member = Member(user=UserFactory(), role="editor")
|
|
269
248
|
org = OrganizationFactory(members=[member])
|
|
270
249
|
|
|
271
|
-
form = OwnableForm(MultiDict({
|
|
272
|
-
'organization': str(org.id)
|
|
273
|
-
}))
|
|
250
|
+
form = OwnableForm(MultiDict({"organization": str(org.id)}))
|
|
274
251
|
|
|
275
252
|
self.assertEqual(form.organization.data, org)
|
|
276
253
|
|
|
277
254
|
self.assertFalse(form.validate())
|
|
278
|
-
self.assertIn(
|
|
279
|
-
self.assertEqual(len(form.errors[
|
|
255
|
+
self.assertIn("organization", form.errors)
|
|
256
|
+
self.assertEqual(len(form.errors["organization"]), 1)
|
|
280
257
|
|
|
281
258
|
def test_set_organization_if_permissions(self):
|
|
282
259
|
Ownable, OwnableForm = self.factory()
|
|
283
260
|
user = UserFactory()
|
|
284
|
-
member = Member(user=user, role=
|
|
261
|
+
member = Member(user=user, role="editor")
|
|
285
262
|
org = OrganizationFactory(members=[member])
|
|
286
263
|
ownable = Ownable(owner=user)
|
|
287
264
|
|
|
288
265
|
login_user(user)
|
|
289
266
|
|
|
290
|
-
form = OwnableForm(MultiDict({
|
|
291
|
-
'organization': str(org.id)
|
|
292
|
-
}), obj=ownable)
|
|
267
|
+
form = OwnableForm(MultiDict({"organization": str(org.id)}), obj=ownable)
|
|
293
268
|
|
|
294
269
|
self.assertTrue(form.validate())
|
|
295
270
|
self.assertEqual(form.errors, {})
|
|
@@ -306,9 +281,7 @@ class PublishFieldTest(TestCase):
|
|
|
306
281
|
|
|
307
282
|
login_user(AdminFactory())
|
|
308
283
|
|
|
309
|
-
form = OwnableForm(MultiDict({
|
|
310
|
-
'owner': str(user.id)
|
|
311
|
-
}), obj=ownable)
|
|
284
|
+
form = OwnableForm(MultiDict({"owner": str(user.id)}), obj=ownable)
|
|
312
285
|
|
|
313
286
|
self.assertEqual(form.owner.data, user)
|
|
314
287
|
self.assertEqual(form.organization.data, org)
|
|
@@ -331,9 +304,7 @@ class PublishFieldTest(TestCase):
|
|
|
331
304
|
|
|
332
305
|
login_user(AdminFactory())
|
|
333
306
|
|
|
334
|
-
form = OwnableForm(MultiDict({
|
|
335
|
-
'organization': str(org.id)
|
|
336
|
-
}), obj=ownable)
|
|
307
|
+
form = OwnableForm(MultiDict({"organization": str(org.id)}), obj=ownable)
|
|
337
308
|
|
|
338
309
|
self.assertEqual(form.owner.data, user)
|
|
339
310
|
self.assertEqual(form.organization.data, org)
|
|
@@ -351,7 +322,7 @@ class PublishFieldTest(TestCase):
|
|
|
351
322
|
def test_with_initial_org_and_no_data_provided(self):
|
|
352
323
|
Ownable, OwnableForm = self.factory()
|
|
353
324
|
user = UserFactory()
|
|
354
|
-
org = OrganizationFactory(members=[Member(user=user, role=
|
|
325
|
+
org = OrganizationFactory(members=[Member(user=user, role="editor")])
|
|
355
326
|
ownable = Ownable(organization=org)
|
|
356
327
|
|
|
357
328
|
form = OwnableForm(MultiDict({}), obj=ownable)
|