refactor(test): move baking to a common fixture

tests/conftest.py

@@ -1,7 +1,37 @@
 """Pytest configuration."""
 
 import pytest
+import sh
+
+from .bake import bake_in_temp_dir
 
 # Pytest will rewrite assertions in test modules, but not elsewhere.
 # This tells pytest to also rewrite assertions in these modules.
 pytest.register_assert_rewrite("tests.common_tests")
+
+
+@pytest.fixture(name="custom_template", scope="module")
+def fixture_custom_template(cookies_session, custom_template_name):
+    """
+    Produce the template directory to use with tests.
+
+    Each test_cookiecutter_*.py file uses a different cookiecutter directory.
+    It gives the base name with the `custom_template_name` fixture.  This makes
+    a full path for use with `bake_in_temp_dir`.
+    """
+    template = cookies_session._default_template + "/" + custom_template_name  # pylint: disable=protected-access
+    return template
+
+
+@pytest.fixture(scope="module")
+def options_baked(cookies_session, configuration, custom_template):
+    """
+    Bake a cookie cutter, parameterized by configurations.
+
+    Provides the configuration dict, and changes into the directory with the
+    baked result.
+    """
+    with bake_in_temp_dir(cookies_session, extra_context=configuration, template=custom_template):
+        sh.make('upgrade')
+        sh.pip('install', '-r', 'requirements/test.txt')
+        yield configuration

tests/test_cookiecutter_django_app.py

@@ -54,25 +54,14 @@
 ]
 
 
-@pytest.fixture(name='custom_template', scope="module")
-def fixture_custom_template(cookies_session):
-    template = cookies_session._default_template + "/cookiecutter-django-app"  # pylint: disable=protected-access
-    return template
+@pytest.fixture(name="configuration", params=configurations, scope="module")
+def fixture_configuration(request):
+    return request.param
 
 
-@pytest.fixture(params=configurations, name='options_baked', scope="module")
-def fixture_options_baked(cookies_session, request, custom_template):
-    """
-    Bake a cookie cutter, parameterized by configurations.
-
-    Provides the configuration dict, and changes into the directory with the
-    baked result.
-    """
-    with bake_in_temp_dir(cookies_session, extra_context=request.param, template=custom_template):
-        sh.make('upgrade')
-        sh.pip('install', '-r', 'requirements/test.txt')
-
-        yield request.param
+@pytest.fixture(name="custom_template_name", scope="module")
+def fixture_custom_template_name():
+    return "cookiecutter-django-app"
 
 
 # Fixture names aren't always used in test functions. Disable completely.

tests/test_cookiecutter_django_ida.py

@@ -44,25 +44,14 @@
 ]
 
 
-@pytest.fixture(name='custom_template', scope="module")
-def fixture_custom_template(cookies_session):
-    template = cookies_session._default_template + "/cookiecutter-django-ida"  # pylint: disable=protected-access
-    return template
+@pytest.fixture(name="configuration", params=configurations, scope="module")
+def fixture_configuration(request):
+    return request.param
 
 
-@pytest.fixture(params=configurations, name='options_baked', scope="module")
-def fixture_options_baked(cookies_session, request, custom_template):
-    """
-    Bake a cookie cutter, parameterized by configurations.
-
-    Provides the configuration dict, and changes into the directory with the
-    baked result.
-    """
-    with bake_in_temp_dir(cookies_session, extra_context=request.param, template=custom_template):
-        sh.make('upgrade')
-        sh.pip('install', '-r', 'requirements/test.txt')
-
-        yield request.param
+@pytest.fixture(name="custom_template_name", scope="module")
+def fixture_custom_template_name():
+    return "cookiecutter-django-ida"
 
 
 # Fixture names aren't always used in test functions. Disable completely.

tests/test_cookiecutter_python_library.py

@@ -45,25 +45,14 @@
 ]
 
 
-@pytest.fixture(name='custom_template', scope="module")
-def fixture_custom_template(cookies_session):
-    template = cookies_session._default_template + "/cookiecutter-python-library"  # pylint: disable=protected-access
-    return template
+@pytest.fixture(name="configuration", params=configurations, scope="module")
+def fixture_configuration(request):
+    return request.param
 
 
-@pytest.fixture(params=configurations, name='options_baked', scope="module")
-def fixture_options_baked(cookies_session, request, custom_template):
-    """
-    Bake a cookie cutter, parameterized by configurations.
-
-    Provides the configuration dict, and changes into the directory with the
-    baked result.
-    """
-    with bake_in_temp_dir(cookies_session, extra_context=request.param, template=custom_template):
-        sh.make('upgrade')
-        sh.pip('install', '-r', 'requirements/test.txt')
-
-        yield request.param
+@pytest.fixture(name="custom_template_name", scope="module")
+def fixture_custom_template_name():
+    return "cookiecutter-python-library"
 
 
 # Fixture names aren't always used in test functions. Disable completely.

tests/test_cookiecutter_xblock.py

@@ -45,24 +45,14 @@
 ]
 
 
-@pytest.fixture(name='custom_template', scope="module")
-def fixture_custom_template(cookies_session):
-    template = cookies_session._default_template + "/cookiecutter-xblock"  # pylint: disable=protected-access
-    return template
-
-
-@pytest.fixture(params=configurations, name='options_baked', scope="module")
-def fixture_options_baked(cookies_session, request, custom_template):
-    """
-    Bake a cookie cutter, parameterized by configurations.
-
-    Provides the configuration dict, and changes into the directory with the
-    baked result.
-    """
-    with bake_in_temp_dir(cookies_session, extra_context=request.param, template=custom_template):
-        sh.make('upgrade')
-        sh.pip('install', '-r', 'requirements/test.txt')
-        yield request.param
+@pytest.fixture(name="configuration", params=configurations, scope="module")
+def fixture_configuration(request):
+    return request.param
+
+
+@pytest.fixture(name="custom_template_name", scope="module")
+def fixture_custom_template_name():
+    return "cookiecutter-xblock"
 
 
 # Fixture names aren't always used in test functions. Disable completely.