From: Karl O. Pinc Date: Tue, 1 Dec 2020 23:19:43 +0000 (-0600) Subject: base_view() is now in pgwui_common.view X-Git-Url: https://papio.biology.duke.edu/gitweb/?a=commitdiff_plain;h=cc214d04136af6a0229f90a554b3587e8e7384e7;p=pgwui_upload base_view() is now in pgwui_common.view --- diff --git a/src/pgwui_upload/views/upload.py b/src/pgwui_upload/views/upload.py index e2a6bdb..35c8f8c 100644 --- a/src/pgwui_upload/views/upload.py +++ b/src/pgwui_upload/views/upload.py @@ -36,7 +36,7 @@ import markupsafe import psycopg2.errorcodes from psycopg2 import ProgrammingError -from pgwui_common.pgwui_common import auth_base_view +from pgwui_common.view import auth_base_view from pgwui_core.core import ( UploadEngine, DataLineProcessor, diff --git a/tests/views/test_upload.py b/tests/views/test_upload.py index 3fad198..8b39bea 100644 --- a/tests/views/test_upload.py +++ b/tests/views/test_upload.py @@ -51,6 +51,9 @@ UNCHANGED_RESPONSE = {'db_changed': False} # A "upload form" UPLOAD_FORM_W_LIT_CHECKED = {'literal_col_headings': True} +HOME_PAGE_SETTINGS = {'type': 'URL', + 'source': '/'} + # Helper classes @@ -84,6 +87,9 @@ def isolate_upload_view(monkeypatch, pyramid_request_config): monkeypatch.setattr( upload, 'TableUploadHandler', MockTableUploadHandler) + settings = pyramid_request_config.get_settings() + settings['pgwui'] = settings.get('pgwui', dict()) + settings['pgwui'].update({'home_page': HOME_PAGE_SETTINGS}) pgwui_common_includeme(pyramid_request_config) pgwui_upload_includeme(pyramid_request_config)