From 0d8ec5fb4c253311505ecc4f33f9a308930e1125 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Sat, 16 Mar 2024 16:25:46 -0500 Subject: [PATCH] Change name: instance_method_mock_fixture() -> late_instance_mock_fixture() --- tests/test_assets.py | 4 ++-- tests/test_pgwui_common.py | 14 +++++++------- tests/test_routes.py | 4 ++-- tests/test_urls.py | 16 ++++++++-------- tests/views/test_page_views.py | 5 +++-- 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/tests/test_assets.py b/tests/test_assets.py index 079176b..ede9ebb 100644 --- a/tests/test_assets.py +++ b/tests/test_assets.py @@ -1,4 +1,4 @@ -# Copyright (C) 2018, 2020, 2021 The Meme Factory, Inc. +# Copyright (C) 2018, 2020, 2021, 2024 The Meme Factory, Inc. # http://www.karlpinc.com/ # This file is part of PGWUI_Common. @@ -35,7 +35,7 @@ pytest_plugins = ("pgwui",) # Mark all tests with "unittest" pytestmark = pytest.mark.unittest -mock_override_asset = testing.instance_method_mock_fixture('override_asset') +mock_override_asset = testing.late_instance_mock_fixture('override_asset') # override_assets() diff --git a/tests/test_pgwui_common.py b/tests/test_pgwui_common.py index 917f2f6..f86b7d0 100644 --- a/tests/test_pgwui_common.py +++ b/tests/test_pgwui_common.py @@ -42,13 +42,13 @@ FOO_URL = 'foo://bar/' mock_find_pgwui_components = testing.make_mock_fixture( urls, 'find_pgwui_components') -mock_method_route_path = testing.instance_method_mock_fixture('route_path') -mock_route_url = testing.instance_method_mock_fixture('route_url') -mock_include = testing.instance_method_mock_fixture('include') -mock_add_static_view = testing.instance_method_mock_fixture('add_static_view') -mock_add_route = testing.instance_method_mock_fixture('add_route') -mock_add_view = testing.instance_method_mock_fixture('add_view') -mock_static_path = testing.instance_method_mock_fixture('static_path') +mock_method_route_path = testing.late_instance_mock_fixture('route_path') +mock_route_url = testing.late_instance_mock_fixture('route_url') +mock_include = testing.late_instance_mock_fixture('include') +mock_add_static_view = testing.late_instance_mock_fixture('add_static_view') +mock_add_route = testing.late_instance_mock_fixture('add_route') +mock_add_view = testing.late_instance_mock_fixture('add_view') +mock_static_path = testing.late_instance_mock_fixture('static_path') def mock_view(request): diff --git a/tests/test_routes.py b/tests/test_routes.py index 321b57d..b2237b2 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -1,4 +1,4 @@ -# Copyright (C) 2018, 2019, 2020, 2021 The Meme Factory, Inc. +# Copyright (C) 2018, 2019, 2020, 2021, 2024 The Meme Factory, Inc. # http://www.karlpinc.com/ # This file is part of PGWUI_Common. @@ -27,7 +27,7 @@ import logging import pyramid.testing import pgwui_common.routes as routes -mock_add_route = testing.instance_method_mock_fixture('add_route') +mock_add_route = testing.late_instance_mock_fixture('add_route') # add_routes() diff --git a/tests/test_urls.py b/tests/test_urls.py index 6b6ebfa..d7dbf1e 100644 --- a/tests/test_urls.py +++ b/tests/test_urls.py @@ -1,4 +1,4 @@ -# Copyright (C) 2018, 2020, 2021 The Meme Factory, Inc. +# Copyright (C) 2018, 2020, 2021, 2024 The Meme Factory, Inc. # http://www.karlpinc.com/ # This file is part of PGWUI_Common. @@ -44,13 +44,13 @@ FOO_URL = 'foo://bar/' mock_find_pgwui_components = testing.make_mock_fixture( urls, 'find_pgwui_components') -mock_method_route_path = testing.instance_method_mock_fixture('route_path') -mock_route_url = testing.instance_method_mock_fixture('route_url') -mock_include = testing.instance_method_mock_fixture('include') -mock_add_static_view = testing.instance_method_mock_fixture('add_static_view') -mock_add_route = testing.instance_method_mock_fixture('add_route') -mock_add_view = testing.instance_method_mock_fixture('add_view') -mock_static_path = testing.instance_method_mock_fixture('static_path') +mock_method_route_path = testing.late_instance_mock_fixture('route_path') +mock_route_url = testing.late_instance_mock_fixture('route_url') +mock_include = testing.late_instance_mock_fixture('include') +mock_add_static_view = testing.late_instance_mock_fixture('add_static_view') +mock_add_route = testing.late_instance_mock_fixture('add_route') +mock_add_view = testing.late_instance_mock_fixture('add_view') +mock_static_path = testing.late_instance_mock_fixture('static_path') mock_request_blank = testing.make_magicmock_fixture( pyramid.request, 'Request') diff --git a/tests/views/test_page_views.py b/tests/views/test_page_views.py index 7ea715a..f98a0cf 100644 --- a/tests/views/test_page_views.py +++ b/tests/views/test_page_views.py @@ -1,4 +1,5 @@ -# Copyright (C) 2020, 2021 The Meme Factory, Inc. http://www.karlpinc.com/ +# Copyright (C) 2020, 2021, 2024 The Meme Factory, Inc. +# http://www.karlpinc.com/ # This file is part of PGWUI_Common. # @@ -33,7 +34,7 @@ from pgwui_develop import testing # Helper functions and constants -mock_page = testing.instance_method_mock_fixture('page') +mock_page = testing.late_instance_mock_fixture('page') mock_FileResponse = testing.make_mock_fixture( page_views, 'FileResponse') -- 2.34.1