diff --git a/ckanext/privatedatasets/tests/test_actions.py b/ckanext/privatedatasets/tests/test_actions.py index fe0bb76..d775365 100644 --- a/ckanext/privatedatasets/tests/test_actions.py +++ b/ckanext/privatedatasets/tests/test_actions.py @@ -34,9 +34,6 @@ class ActionsTest(unittest.TestCase): def setUp(self): # Load the mocks - self._config = actions.config - actions.config = MagicMock() - self._importlib = actions.importlib actions.importlib = MagicMock() @@ -48,7 +45,6 @@ class ActionsTest(unittest.TestCase): def tearDown(self): # Unmock - actions.config = self._config actions.importlib = self._importlib actions.plugins = self._plugins actions.db = self._db @@ -66,7 +62,7 @@ class ActionsTest(unittest.TestCase): def test_class_cannot_be_loaded(self, class_path, class_name, path_exist, class_exist, expected_error): class_package = class_path class_package += ':' + class_name if class_name else '' - actions.config = {PARSER_CONFIG_PROP: class_package} + actions.plugins.toolkit.config = {PARSER_CONFIG_PROP: class_package} # Recover exception actions.plugins.toolkit.ValidationError = self._plugins.toolkit.ValidationError @@ -93,7 +89,7 @@ class ActionsTest(unittest.TestCase): def configure_mocks(self, parse_result, datasets_not_found=[], not_updatable_datasets=[], allowed_users=None, creator_user={'id': '1234', 'name': 'ckan'}): - actions.config = {PARSER_CONFIG_PROP: 'valid.path:%s' % CLASS_NAME} + actions.plugins.toolkit.config = {PARSER_CONFIG_PROP: 'valid.path:%s' % CLASS_NAME} # Configure mocks parser_instance = MagicMock() diff --git a/ckanext/privatedatasets/tests/test_helpers.py b/ckanext/privatedatasets/tests/test_helpers.py index 809237b..6d95b35 100644 --- a/ckanext/privatedatasets/tests/test_helpers.py +++ b/ckanext/privatedatasets/tests/test_helpers.py @@ -33,12 +33,11 @@ class HelpersTest(unittest.TestCase): self._tk = helpers.tk helpers.tk = MagicMock() + helpers.tk.config = {} self._db = helpers.db helpers.db = MagicMock() - self._config = helpers.config - helpers.config = {} self._request = helpers.request helpers.request = MagicMock() @@ -47,7 +46,6 @@ class HelpersTest(unittest.TestCase): helpers.model = self._model helpers.tk = self._tk helpers.db = self._db - helpers.config = self._config helpers.request = self._request @parameterized.expand([ @@ -135,7 +133,7 @@ class HelpersTest(unittest.TestCase): ]) def test_show_acquire_url_on_create(self, config_value, expected_value): if config_value is not None: - helpers.config['ckan.privatedatasets.show_acquire_url_on_create'] = config_value + helpers.tk.config['ckan.privatedatasets.show_acquire_url_on_create'] = config_value # Call the function self.assertEquals(expected_value, helpers.show_acquire_url_on_create()) @@ -147,7 +145,7 @@ class HelpersTest(unittest.TestCase): ]) def test_show_acquire_url_on_edit(self, config_value, expected_value): if config_value is not None: - helpers.config['ckan.privatedatasets.show_acquire_url_on_edit'] = config_value + helpers.tk.config['ckan.privatedatasets.show_acquire_url_on_edit'] = config_value # Call the function self.assertEquals(expected_value, helpers.show_acquire_url_on_edit())