Change init_menu() to establish_settings()

diff --git a/setup.py b/setup.py
index 3560c6e53d4daa542f42a1019c412cf1bc9f9dd7..83f68d34d1c583a6b3b57cf5449376b644d45c59 100644 (file)
--- 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 8d9eeea10354ae6015b0651a644c294c84216c96..8bad1378668c0aad554635b4e26507e9284e3e1f 100644 (file)
--- 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 b41dd80c6ab77460737959710d5e8c7b8b5536b9..20ea3ce7ec2e57370783cbb1cc0bf86c71b5814a 100644 (file)
--- 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 5309dbe2f3b4b224a4c2e815e2f5b72f0252594e..f90845fe7477bbffe586dc0849bda8035882defd 100644 (file)
--- 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 9440b5af3857cae32805994087cd9246e468d7b8..f6ade2ac3d7fd7f68798d662255d217f6beb23aa 100644 (file)
--- 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 6591a14fb0c8d79048719dd2593e892b48c6422c..6f86776d6c8ad7a53437d62b43b04d690a485e56 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,7 @@ deps =
     check-manifest
     cmarkgfm
     flake8
-    pgwui_testing
+    pgwui_develop
     pytest
     pytest-cov
     twine