Change init_menu() to establish_settings()

diff --git a/setup.py b/setup.py
index 66088a7f26d9e866c3bb83ac49350d7f159dd389..a543cd234c6458552da9daebd293f30de675e27b 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_bulk_upload/pgwui_bulk_upload.py b/src/pgwui_bulk_upload/pgwui_bulk_upload.py
index 38c750da8d1ceee8e1ebdacc5a0750f290615122..183f456f519b05d85c4bf63bc5447d7a16ffc06d 100644 (file)
--- a/src/pgwui_bulk_upload/pgwui_bulk_upload.py
+++ b/src/pgwui_bulk_upload/pgwui_bulk_upload.py
@@ -33,7 +33,7 @@ DEFAULT_NULL = 'choice-yes'
 DEFAULT_FILE_FORMAT = 'csv'
 
 
-def establish_default_settings(config):
+def establish_settings(config):
     '''Setup all the defaults:
     menu label, map file
     '''
@@ -58,6 +58,6 @@ def establish_default_settings(config):
 def includeme(config):
     '''Pyramid configuration for PGWUI_Bulk_Upload
     '''
-    establish_default_settings(config)
+    establish_settings(config)
     config.add_route(PGWUI_COMPONENT, DEFAULT_BULK_UPLOAD_ROUTE)
     config.scan()

diff --git a/tests/test_check_settings.py b/tests/test_check_settings.py
index 8370f43923f71447e538b92e249f3854b7d02d61..4d1f6a7e2bcacbc7c439c949389e7538e6d8eeed 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_bulk_upload.check_settings as check_settings
 
-from pgwui_testing import testing
+from pgwui_develop import testing
 
 # Activiate the PGWUI pytest plugin
 pytest_plugins = ("pgwui",)

diff --git a/tests/test_pgwui_bulk_upload.py b/tests/test_pgwui_bulk_upload.py
index dd4baaadc94edd98b2cc0ff9946525f2de770e71..1ddbde235709bc3a2160f34331524928338f6f04 100644 (file)
--- a/tests/test_pgwui_bulk_upload.py
+++ b/tests/test_pgwui_bulk_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_Bulk_Upload.
 #
@@ -24,7 +25,7 @@ import pyramid.testing
 
 import pgwui_bulk_upload.pgwui_bulk_upload as pgwui_bulk_upload
 
-from pgwui_testing import testing
+from pgwui_develop import testing
 
 # Activiate the PGWUI pytest plugin
 pytest_plugins = ("pgwui",)
@@ -38,15 +39,15 @@ def test_pgwui_bulk_upload_is_pgwui_component(pgwui_component_entry_point):
     assert pgwui_component_entry_point('pgwui_bulk_upload') is True
 
 
-# establish_default_settings()
+# establish_settings()
 
 @pytest.mark.unittest
-def test_establish_default_settings_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_bulk_upload.establish_default_settings(config)
+        pgwui_bulk_upload.establish_settings(config)
 
         new_settings = config.get_settings()
     bulk_upload_settings = new_settings['pgwui']['pgwui_bulk_upload']
@@ -57,7 +58,7 @@ def test_establish_default_settings_default():
 
 
 @pytest.mark.unittest
-def test_establish_default_settings_no_default():
+def test_establish_settings_no_default():
     '''The settings keep their value when they exist
     '''
     test_menu_label = 'test label'
@@ -72,15 +73,15 @@ def test_establish_default_settings_no_default():
         bulk_upload_settings['menu_label'] = test_menu_label
         bulk_upload_settings['map_file'] = test_map_file
 
-        pgwui_bulk_upload.establish_default_settings(config)
+        pgwui_bulk_upload.establish_settings(config)
 
         new_settings = config.get_settings()['pgwui']['pgwui_bulk_upload']
     assert new_settings['menu_label'] == test_menu_label
     assert new_settings['map_file'] == test_map_file
 
 
-mock_establish_default_settings = testing.make_mock_fixture(
-    pgwui_bulk_upload, 'establish_default_settings')
+mock_establish_settings = testing.make_mock_fixture(
+    pgwui_bulk_upload, 'establish_settings')
 
 
 # includeme()
@@ -90,8 +91,8 @@ mock_scan = testing.instance_method_mock_fixture('scan')
 
 
 @pytest.mark.unittest
-def test_includeme(mock_establish_default_settings, mock_add_route, mock_scan):
-    '''establish_default_settings, 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)
@@ -99,6 +100,6 @@ def test_includeme(mock_establish_default_settings, mock_add_route, mock_scan):
 
         pgwui_bulk_upload.includeme(config)
 
-    mock_establish_default_settings.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_bulk_upload.py b/tests/views/test_bulk_upload.py
index d967baf02617bf59c850ec240e5287207081a76a..d36871d4d4a1e3d537e7f9d1606765450d3e3534 100644 (file)
--- a/tests/views/test_bulk_upload.py
+++ b/tests/views/test_bulk_upload.py
@@ -21,7 +21,7 @@
 # Karl O. Pinc <kop@karlpinc.com>
 
 import pytest
-from pgwui_testing import testing
+from pgwui_develop import testing
 
 import copy
 import logging

diff --git a/tox.ini b/tox.ini
index b2fe965c6a139d31760860fd7f753d7b71a69413..3eae53d52c4ce4092a027241dd51f476ee746d37 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