Abstract config declaration key construction

diff --git a/src/pgwui_server/__init__.py b/src/pgwui_server/__init__.py
index 81b680060949b6329cf69bdac28c480dda63f1b5..3651a2c81836b922f537a03189c627b0bcb3f0b3 100644 (file)
--- a/src/pgwui_server/__init__.py
+++ b/src/pgwui_server/__init__.py
@@ -214,7 +214,7 @@ def parse_component_settings(component_keys, key, settings):
 def validate_settings(errors, settings, components):
     '''Be sure all settings validate
     '''
-    component_keys = ['pgwui.{}'.format(component)
+    component_keys = [plugin.component_to_key(component)
                       for component in components]
     for key in settings.keys():
         parse_component_settings(component_keys, key, settings)

diff --git a/tests/test___init__.py b/tests/test___init__.py
index a8b079a66acc7fc2a70b65f27f78c4a70d2d24c1..a350099f252538f210e622ac739ea124bec43a92 100644 (file)
--- a/tests/test___init__.py
+++ b/tests/test___init__.py
@@ -64,6 +64,8 @@ mock_add_route = testing.instance_method_mock_fixture('add_route')
 
 mock_find_pgwui_components = testing.make_mock_fixture(
     pgwui_common.plugin, 'find_pgwui_components')
+mock_component_to_key = testing.make_mock_fixture(
+    pgwui_common.plugin, 'component_to_key')
 
 
 # Unit tests
@@ -361,7 +363,8 @@ mock_parse_component_settings = testing.make_mock_fixture(
 
 # validate_settings()
 
-def test_validate_settings(mock_parse_component_settings,
+def test_validate_settings(mock_component_to_key,
+                           mock_parse_component_settings,
                            mock_abort_on_bad_setting,
                            mock_validate_setting_values,
                            mock_validate_hmac):
@@ -373,6 +376,8 @@ def test_validate_settings(mock_parse_component_settings,
                 'key2': 'value2'}
     components = ['pgwui_server']
 
+    mock_component_to_key.side_effect = ['pgwui.pgwui_server']
+
     errors = []
     pgwui_server_init.validate_settings(errors, settings, components)