Keep two fixtures but use a neater one-liner and allow both fixtures to be used at once.

Co-authored-by: Matt Graham <[email protected]>

Author: samcunliffe

tests/conftest.py

@@ -26,9 +26,8 @@ def default_config() -> dict[str, str]:
 def default_config_with(default_config: dict[str, str]) -> typing.Callable:
     """Extend or modify the default configuration with one additional value."""
 
-    def _wrapped_with(key: str, value: str) -> dict[str, str]:
-        default_config[key] = value
-        return default_config
+    def _wrapped_with(**kwargs: str) -> dict[str, str]:
+        return default_config | kwargs
 
     return _wrapped_with
 

tests/test_git_init.py

@@ -14,7 +14,7 @@ def test_initialisation_of_git_repo(
 ) -> None:
     """Checks to see if git was correctly initialised if desired."""
     # Run cookiecutter with initialise_git_repository
-    config = default_config_with("initialise_git_repository", str(init))
+    config = default_config_with(initialise_git_repository=str(init))
     result, test_project_dir = generate_package(config=config)
 
     # check if git is initialised

tests/test_package_generation.py

@@ -42,7 +42,7 @@ def test_package_generation(
     """Test package generation."""
     # Not having a git repo makes it easier to check in/out reference
     # data files to the main python-tooling git repository
-    config = default_config_with("initialise_git_repository", "False")
+    config = default_config_with(initialise_git_repository="False")
     _, test_project_dir = generate_package(config=config)
 
     expected_package_dir = (
@@ -117,7 +117,7 @@ def test_optional_funder(
     generate_package: typing.Callable,
 ) -> None:
     """Test specifying funder or not in package generation."""
-    config = default_config_with("funder", funder)
+    config = default_config_with(funder=funder)
     _, test_project_dir = generate_package(config)
 
     with (test_project_dir / "README.md").open() as f: