A urls map in settings is now required by pgwui_common
authorKarl O. Pinc <kop@karlpinc.com>
Tue, 8 Dec 2020 04:47:19 +0000 (22:47 -0600)
committerKarl O. Pinc <kop@karlpinc.com>
Tue, 8 Dec 2020 04:47:19 +0000 (22:47 -0600)
tests/views/test_upload.py

index 8b39bea68e926498fde6f3be4802f4ba454ad1b9..886f4aa9430e75316697178e3e913689ec48d591 100644 (file)
@@ -54,6 +54,10 @@ UPLOAD_FORM_W_LIT_CHECKED = {'literal_col_headings': True}
 HOME_PAGE_SETTINGS = {'type': 'URL',
                       'source': '/'}
 
+DEFAULT_URLS = {'pgwui_upload': '/upload',
+                'pgwui_logout': '/logout',
+                'home_page': '/'}
+
 
 # Helper classes
 
@@ -92,6 +96,8 @@ def isolate_upload_view(monkeypatch, pyramid_request_config):
         settings['pgwui'].update({'home_page': HOME_PAGE_SETTINGS})
         pgwui_common_includeme(pyramid_request_config)
         pgwui_upload_includeme(pyramid_request_config)
+        settings['pgwui'].update({'urls': DEFAULT_URLS})
+        pyramid_request_config.add_settings(settings)
 
     return run
 
@@ -225,11 +231,11 @@ def test_upload_view_literal_cols_ask(isolate_upload_view):
     '''When literal_column_headings == ask the respose should reflect this'''
 
     response = UNCHANGED_RESPONSE
+    isolate_upload_view(response)
 
-    settings = get_current_registry().settings
-    settings['pgwui'] = {'literal_column_headings': 'ask'}
+    settings = get_current_request().registry.settings
+    settings['pgwui'].update({'literal_column_headings': 'ask'})
 
-    isolate_upload_view(response)
     result = upload.upload_view(get_current_request())
 
     assert result['ask_about_literal_cols']
@@ -239,11 +245,11 @@ def test_upload_view_literal_cols_noask(isolate_upload_view):
     '''When literal_column_headings != ask the respose should reflect this'''
 
     response = UNCHANGED_RESPONSE
+    isolate_upload_view(response)
 
     settings = get_current_registry().settings
-    settings['pgwui'] = {'literal_column_headings': 'no'}
+    settings['pgwui'].update({'literal_column_headings': 'no'})
 
-    isolate_upload_view(response)
     result = upload.upload_view(get_current_request())
 
     assert not(result['ask_about_literal_cols'])