Fix so all tests pass when the template is instantiated

diff --git a/src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/check_settings.py.mak b/src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/check_settings.py.mak
index eb4884a8dee51a86f8603907f70f65f365bb9655..15264f4a38fd91a9c770447252ca7ef0f2ae81d7 100644 (file)
--- a/src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/check_settings.py.mak
+++ b/src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/check_settings.py.mak
@@ -37,7 +37,7 @@ BOOLEAN_SETTINGS = []
 def validate_example_on_off_ask(errors, settings):
     '''Make sure the values are those allowed
     '''
-    value = settings.get('literal_column_headings')
+    value = settings.get('example_on_off_ask')
     if value is None:
         return
     if value not in ('on', 'off', 'ask'):

diff --git a/src/pgwui_develop/TEMPLATE/tests/test_pgwui_TEMPLATE.py.mak b/src/pgwui_develop/TEMPLATE/tests/test_pgwui_TEMPLATE.py.mak
index e7da2d6a0a17a4af9b6d53733fbacb15f68a8967..330cc35350917ca74c0263b01148f7baeef81020 100644 (file)
--- a/src/pgwui_develop/TEMPLATE/tests/test_pgwui_TEMPLATE.py.mak
+++ b/src/pgwui_develop/TEMPLATE/tests/test_pgwui_TEMPLATE.py.mak
@@ -51,7 +51,7 @@ def test_establish_settings_default():
 
         new_settings = config.get_settings()
     assert (new_settings['pgwui']['${component.lower()}']['menu_label']
-            == ${component.lower()}.DEFAULT_UPLOAD_MENU_LABEL)
+            == ${component.lower()}.DEFAULT_${short_name.upper()}_MENU_LABEL)
 
 
 @pytest.mark.unittest
@@ -81,10 +81,8 @@ mock_establish_settings = testing.make_mock_fixture(
 
 # includeme()
 
-mock_add_route = testing.late_instance_mock_fixture(
-    pyramid.testing.testConfig, 'add_route')
-mock_scan = testing.late_instance_mock_fixture(
-    pyramid.testing.testConfig, 'scan')
+mock_add_route = testing.late_instance_mock_fixture('add_route')
+mock_scan = testing.late_instance_mock_fixture('scan')
 
 
 @pytest.mark.unittest

diff --git a/src/pgwui_develop/TEMPLATE/tests/views/test_TEMPLATE.py.mak b/src/pgwui_develop/TEMPLATE/tests/views/test_TEMPLATE.py.mak
index e786bc38e264d56650d4fdf41cfb85840cac1cd6..ea99f123293f2fc959ec183d4aba69d5bc76b6c2 100644 (file)
--- a/src/pgwui_develop/TEMPLATE/tests/views/test_TEMPLATE.py.mak
+++ b/src/pgwui_develop/TEMPLATE/tests/views/test_TEMPLATE.py.mak
@@ -40,6 +40,10 @@ pytest_plugins = ("pgwui",)
 
 
 # Constants
+DEFAULT_URLS = {'${component.lower()}': '/${short_name}',
+                'pgwui_logout': '/logout',
+                'home_page': '/'}
+
 CHANGED_RESPONSE = {
     'db': 'somedb',
     'db_changed': True,
@@ -78,14 +82,15 @@ def isolate_upload_view(monkeypatch, pyramid_request_config):
         def upload_engine(*args):
             return MockUploadEngine(response)
 
-        monkeypatch.setattr(${short_name}, 'UploadEngine', upload_engine)
+        monkeypatch.setattr(
+            ${short_name}.pgwui_core.core, 'UploadEngine', upload_engine)
 
         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)
         ${component.lower()}_includeme(pyramid_request_config)
-        # settings['pgwui'].update({'urls': DEFAULT_URLS})
+        settings['pgwui'].update({'urls': DEFAULT_URLS})
         pyramid_request_config.add_settings(settings)
 
     return run