mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2024-11-29 21:14:03 +03:00
Merge branch 'simplify-tests-params'
This commit is contained in:
commit
c95baa0853
|
@ -11,9 +11,6 @@ from binaryornot.check import is_binary
|
||||||
PATTERN = r"{{(\s?cookiecutter)[.](.*?)}}"
|
PATTERN = r"{{(\s?cookiecutter)[.](.*?)}}"
|
||||||
RE_OBJ = re.compile(PATTERN)
|
RE_OBJ = re.compile(PATTERN)
|
||||||
|
|
||||||
YN_CHOICES = ["y", "n"]
|
|
||||||
CLOUD_CHOICES = ["AWS", "GCE", "None"]
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def context():
|
def context():
|
||||||
|
@ -30,14 +27,24 @@ def context():
|
||||||
|
|
||||||
|
|
||||||
@pytest_fixture_plus
|
@pytest_fixture_plus
|
||||||
@pytest.mark.parametrize("windows", YN_CHOICES, ids=lambda yn: f"win:{yn}")
|
@pytest.mark.parametrize("windows", ["y", "n"], ids=lambda yn: f"win:{yn}")
|
||||||
@pytest.mark.parametrize("use_docker", YN_CHOICES, ids=lambda yn: f"docker:{yn}")
|
@pytest.mark.parametrize("use_docker", ["y", "n"], ids=lambda yn: f"docker:{yn}")
|
||||||
@pytest.mark.parametrize("use_celery", YN_CHOICES, ids=lambda yn: f"celery:{yn}")
|
@pytest.mark.parametrize("use_celery", ["y", "n"], ids=lambda yn: f"celery:{yn}")
|
||||||
@pytest.mark.parametrize("use_mailhog", YN_CHOICES, ids=lambda yn: f"mailhog:{yn}")
|
@pytest.mark.parametrize("use_mailhog", ["y", "n"], ids=lambda yn: f"mailhog:{yn}")
|
||||||
@pytest.mark.parametrize("use_sentry", YN_CHOICES, ids=lambda yn: f"sentry:{yn}")
|
@pytest.mark.parametrize("use_sentry", ["y", "n"], ids=lambda yn: f"sentry:{yn}")
|
||||||
@pytest.mark.parametrize("use_compressor", YN_CHOICES, ids=lambda yn: f"cmpr:{yn}")
|
@pytest.mark.parametrize("use_compressor", ["y", "n"], ids=lambda yn: f"cmpr:{yn}")
|
||||||
@pytest.mark.parametrize("use_whitenoise", YN_CHOICES, ids=lambda yn: f"wnoise:{yn}")
|
@pytest.mark.parametrize(
|
||||||
@pytest.mark.parametrize("cloud_provider", CLOUD_CHOICES, ids=lambda yn: f"cloud:{yn}")
|
"use_whitenoise,cloud_provider",
|
||||||
|
[
|
||||||
|
("y", "AWS"),
|
||||||
|
("y", "GCP"),
|
||||||
|
("y", "None"),
|
||||||
|
("n", "AWS"),
|
||||||
|
("n", "GCP"),
|
||||||
|
# no whitenoise + co cloud provider is not supported
|
||||||
|
],
|
||||||
|
ids=lambda id: f"wnoise:{id[0]}-cloud:{id[1]}",
|
||||||
|
)
|
||||||
def context_combination(
|
def context_combination(
|
||||||
windows,
|
windows,
|
||||||
use_docker,
|
use_docker,
|
||||||
|
@ -49,11 +56,6 @@ def context_combination(
|
||||||
cloud_provider,
|
cloud_provider,
|
||||||
):
|
):
|
||||||
"""Fixture that parametrize the function where it's used."""
|
"""Fixture that parametrize the function where it's used."""
|
||||||
if cloud_provider == "None":
|
|
||||||
# Either of the two should be set for serving static files, so if cloud provider
|
|
||||||
# is not set, we force Whitenoise to be set
|
|
||||||
use_whitenoise = "y"
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"windows": windows,
|
"windows": windows,
|
||||||
"use_docker": use_docker,
|
"use_docker": use_docker,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user