From f9adfec7f03bc793945228b71b583bdc82843b41 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Mon, 25 Jan 2021 21:58:55 -0600 Subject: [PATCH] Change init_menu() to establish_settings() --- setup.py | 2 +- src/pgwui_upload/pgwui_upload.py | 4 ++-- tests/test_check_settings.py | 2 +- tests/test_pgwui_upload.py | 24 +++++++++++++----------- tests/views/test_upload.py | 2 +- tox.ini | 2 +- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/setup.py b/setup.py index 3560c6e..83f68d3 100644 --- a/setup.py +++ b/setup.py @@ -59,7 +59,7 @@ long_description = filter_readme() # Pyramid testing requirements tests_require = [ - 'pgwui_testing==' + version, + 'pgwui_develop==' + version, 'WebTest >= 1.3.1', # py3 compat 'pytest>=3.7.4', 'pytest-cov', diff --git a/src/pgwui_upload/pgwui_upload.py b/src/pgwui_upload/pgwui_upload.py index 8d9eeea..8bad137 100644 --- a/src/pgwui_upload/pgwui_upload.py +++ b/src/pgwui_upload/pgwui_upload.py @@ -31,7 +31,7 @@ DEFAULT_NULL = 'choice-yes' DEFAULT_FILE_FORMAT = 'csv' -def init_menu(config): +def establish_settings(config): '''Add default menu information into settings when they are not present ''' settings = config.get_settings() @@ -53,6 +53,6 @@ def init_menu(config): def includeme(config): '''Pyramid configuration for PGWUI_Upload ''' - init_menu(config) + establish_settings(config) config.add_route(PGWUI_COMPONENT, DEFAULT_UPLOAD_ROUTE) config.scan() diff --git a/tests/test_check_settings.py b/tests/test_check_settings.py index b41dd80..20ea3ce 100644 --- a/tests/test_check_settings.py +++ b/tests/test_check_settings.py @@ -24,7 +24,7 @@ import pytest import pgwui_upload_core.check_settings import pgwui_upload.check_settings as check_settings -from pgwui_testing import testing +from pgwui_develop import testing # Activiate our pytest plugin pytest_plugins = ("pgwui",) diff --git a/tests/test_pgwui_upload.py b/tests/test_pgwui_upload.py index 5309dbe..f90845f 100644 --- a/tests/test_pgwui_upload.py +++ b/tests/test_pgwui_upload.py @@ -1,4 +1,5 @@ -# Copyright (C) 2019, 2020 The Meme Factory, Inc. http://www.karlpinc.com/ +# Copyright (C) 2019, 2020, 2021 The Meme Factory, Inc. +# http://www.karlpinc.com/ # This file is part of PGWUI_Upload. # @@ -24,7 +25,7 @@ import pyramid.testing import pgwui_upload.pgwui_upload as pgwui_upload -from pgwui_testing import testing +from pgwui_develop import testing # Activiate our pytest plugin pytest_plugins = ("pgwui",) @@ -38,15 +39,15 @@ def test_pgwui_upload_is_pgwui_component(pgwui_component_entry_point): assert pgwui_component_entry_point('pgwui_upload') is True -# init_menu() +# establish_settings() @pytest.mark.unittest -def test_init_menu_default(): +def test_establish_settings_default(): '''The settings get the module's default value when no settings exist ''' with pyramid.testing.testConfig() as config: - pgwui_upload.init_menu(config) + pgwui_upload.establish_settings(config) new_settings = config.get_settings() assert new_settings['pgwui']['pgwui_upload']['menu_label'] \ @@ -54,7 +55,7 @@ def test_init_menu_default(): @pytest.mark.unittest -def test_init_menu_no_default(): +def test_establish_settings_no_default(): '''The settings keep their value when they exist ''' test_menu_label = 'test label' @@ -67,14 +68,15 @@ def test_init_menu_no_default(): sample_settings['pgwui']['pgwui_upload']['menu_label'] \ = test_menu_label - pgwui_upload.init_menu(config) + pgwui_upload.establish_settings(config) new_settings = config.get_settings() assert new_settings['pgwui']['pgwui_upload']['menu_label'] \ == test_menu_label -mock_init_menu = testing.make_mock_fixture(pgwui_upload, 'init_menu') +mock_establish_settings = testing.make_mock_fixture( + pgwui_upload, 'establish_settings') # includeme() @@ -84,8 +86,8 @@ mock_scan = testing.instance_method_mock_fixture('scan') @pytest.mark.unittest -def test_includeme(mock_init_menu, mock_add_route, mock_scan): - '''init_menu, add_route, and scan are all called +def test_includeme(mock_establish_settings, mock_add_route, mock_scan): + '''establish_settings, add_route, and scan are all called ''' with pyramid.testing.testConfig() as config: mocked_add_route = mock_add_route(config) @@ -93,6 +95,6 @@ def test_includeme(mock_init_menu, mock_add_route, mock_scan): pgwui_upload.includeme(config) - mock_init_menu.assert_called_once() + mock_establish_settings.assert_called_once() mocked_add_route.assert_called_once() mocked_scan.assert_called_once() diff --git a/tests/views/test_upload.py b/tests/views/test_upload.py index 9440b5a..f6ade2a 100644 --- a/tests/views/test_upload.py +++ b/tests/views/test_upload.py @@ -22,7 +22,7 @@ import logging import pytest -from pgwui_testing import testing +from pgwui_develop import testing from pyramid.testing import DummyRequest from pyramid.threadlocal import get_current_request from pgwui_common.__init__ import includeme as pgwui_common_includeme diff --git a/tox.ini b/tox.ini index 6591a14..6f86776 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ deps = check-manifest cmarkgfm flake8 - pgwui_testing + pgwui_develop pytest pytest-cov twine -- 2.34.1