Fixed tests for mail providers

This commit is contained in:
Andrew-Chen-Wang 2020-03-14 15:09:05 -04:00
parent 3978890502
commit 5e1d1dd1c3
2 changed files with 16 additions and 33 deletions

View File

@ -48,6 +48,15 @@ SUPPORTED_COMBINATIONS = [
{"cloud_provider": "GCP", "use_whitenoise": "n"}, {"cloud_provider": "GCP", "use_whitenoise": "n"},
{"cloud_provider": "None", "use_whitenoise": "y"}, {"cloud_provider": "None", "use_whitenoise": "y"},
# Note: cloud_provider=None AND use_whitenoise=n is not supported # Note: cloud_provider=None AND use_whitenoise=n is not supported
{"mail_service": "Mailgun"},
{"mail_service": "Amazon SES"},
{"mail_service": "Mailjet"},
{"mail_service": "Mandrill"},
{"mail_service": "Postmark"},
{"mail_service": "Sendgrid"},
{"mail_service": "SendinBlue"},
{"mail_service": "SparkPost"},
{"mail_service": "Other SMTP"},
{"use_drf": "y"}, {"use_drf": "y"},
{"use_drf": "n"}, {"use_drf": "n"},
{"js_task_runner": "None"}, {"js_task_runner": "None"},
@ -73,21 +82,10 @@ SUPPORTED_COMBINATIONS = [
{"keep_local_envs_in_vcs": "n"}, {"keep_local_envs_in_vcs": "n"},
{"debug": "y"}, {"debug": "y"},
{"debug": "n"}, {"debug": "n"},
{"mail_service", "AWS SES"},
{"mail_service", "Mailgun"},
{"mail_service", "Mailjet"},
{"mail_service", "Mandrill"},
{"mail_service", "Postmark"},
{"mail_service", "Sendgrid"},
{"mail_service", "SendinBlue"},
{"mail_service", "SparkPost"},
{"mail_service", "Other SMTP"},
] ]
UNSUPPORTED_COMBINATIONS = [ UNSUPPORTED_COMBINATIONS = [
{"cloud_provider": "None", "use_whitenoise": "n"}, {"cloud_provider": "None", "use_whitenoise": "n"},
{"cloud_provider": "GCP", "mail_service": "Amazon SES"},
{"cloud_provider": "None", "mail_service": "Amazon SES"}
] ]

View File

@ -195,10 +195,7 @@ EMAIL_BACKEND = "anymail.backends.mailgun.EmailBackend"
ANYMAIL = { ANYMAIL = {
"MAILGUN_API_KEY": env("MAILGUN_API_KEY"), "MAILGUN_API_KEY": env("MAILGUN_API_KEY"),
"MAILGUN_SENDER_DOMAIN": env("MAILGUN_DOMAIN"), "MAILGUN_SENDER_DOMAIN": env("MAILGUN_DOMAIN"),
"MAILGUN_API_URL": env( "MAILGUN_API_URL": env("MAILGUN_API_URL", default="https://api.mailgun.net/v3"),
"MAILGUN_API_URL",
default="https://api.mailgun.net/v3"
),
} }
{%- elif cookiecutter.mail_service == 'Amazon SES' %} {%- elif cookiecutter.mail_service == 'Amazon SES' %}
# https://anymail.readthedocs.io/en/stable/esps/amazon_ses/ # https://anymail.readthedocs.io/en/stable/esps/amazon_ses/
@ -210,10 +207,7 @@ EMAIL_BACKEND = "anymail.backends.mailjet.EmailBackend"
ANYMAIL = { ANYMAIL = {
"MAILJET_API_KEY": env("MAILJET_API_KEY"), "MAILJET_API_KEY": env("MAILJET_API_KEY"),
"MAILJET_SECRET_KEY": env("MAILJET_SECRET_KEY"), "MAILJET_SECRET_KEY": env("MAILJET_SECRET_KEY"),
"MAILJET_API_URL": env( "MAILJET_API_URL": env("MAILJET_API_URL", default="https://api.mailjet.com/v3"),
"MAILJET_API_URL",
default="https://api.mailjet.com/v3"
),
} }
{%- elif cookiecutter.mail_service == 'Mandrill' %} {%- elif cookiecutter.mail_service == 'Mandrill' %}
# https://anymail.readthedocs.io/en/stable/esps/mandrill/ # https://anymail.readthedocs.io/en/stable/esps/mandrill/
@ -221,8 +215,7 @@ EMAIL_BACKEND = "anymail.backends.mandrill.EmailBackend"
ANYMAIL = { ANYMAIL = {
"MANDRILL_API_KEY": env("MANDRILL_API_KEY"), "MANDRILL_API_KEY": env("MANDRILL_API_KEY"),
"MANDRILL_API_URL": env( "MANDRILL_API_URL": env(
"MANDRILL_API_URL", "MANDRILL_API_URL", default="https://mandrillapp.com/api/1.0"
default="https://mandrillapp.com/api/1.0"
), ),
} }
{%- elif cookiecutter.mail_service == 'Postmark' %} {%- elif cookiecutter.mail_service == 'Postmark' %}
@ -230,10 +223,7 @@ ANYMAIL = {
EMAIL_BACKEND = "anymail.backends.postmark.EmailBackend" EMAIL_BACKEND = "anymail.backends.postmark.EmailBackend"
ANYMAIL = { ANYMAIL = {
"POSTMARK_SERVER_TOKEN": env("POSTMARK_SERVER_TOKEN"), "POSTMARK_SERVER_TOKEN": env("POSTMARK_SERVER_TOKEN"),
"POSTMARK_API_URL": env( "POSTMARK_API_URL": env("POSTMARK_API_URL", default="https://api.postmarkapp.com/"),
"POSTMARK_API_URL",
default="https://api.postmarkapp.com/"
),
} }
{%- elif cookiecutter.mail_service == 'Sendgrid' %} {%- elif cookiecutter.mail_service == 'Sendgrid' %}
# https://anymail.readthedocs.io/en/stable/esps/sendgrid/ # https://anymail.readthedocs.io/en/stable/esps/sendgrid/
@ -242,10 +232,7 @@ ANYMAIL = {
"SENDGRID_API_KEY": env("SENDGRID_API_KEY"), "SENDGRID_API_KEY": env("SENDGRID_API_KEY"),
"SENDGRID_GENERATE_MESSAGE_ID": env("SENDGRID_GENERATE_MESSAGE_ID"), "SENDGRID_GENERATE_MESSAGE_ID": env("SENDGRID_GENERATE_MESSAGE_ID"),
"SENDGRID_MERGE_FIELD_FORMAT": env("SENDGRID_MERGE_FIELD_FORMAT"), "SENDGRID_MERGE_FIELD_FORMAT": env("SENDGRID_MERGE_FIELD_FORMAT"),
"SENDGRID_API_URL": env( "SENDGRID_API_URL": env("SENDGRID_API_URL", default="https://api.sendgrid.com/v3/"),
"SENDGRID_API_URL",
default="https://api.sendgrid.com/v3/"
),
} }
{%- elif cookiecutter.mail_service == 'SendinBlue' %} {%- elif cookiecutter.mail_service == 'SendinBlue' %}
# https://anymail.readthedocs.io/en/stable/esps/sendinblue/ # https://anymail.readthedocs.io/en/stable/esps/sendinblue/
@ -253,8 +240,7 @@ EMAIL_BACKEND = "anymail.backends.sendinblue.EmailBackend"
ANYMAIL = { ANYMAIL = {
"SENDINBLUE_API_KEY": env("SENDINBLUE_API_KEY"), "SENDINBLUE_API_KEY": env("SENDINBLUE_API_KEY"),
"SENDINBLUE_API_URL": env( "SENDINBLUE_API_URL": env(
"SENDINBLUE_API_URL", "SENDINBLUE_API_URL", default="https://api.sendinblue.com/v3/"
default="https://api.sendinblue.com/v3/"
), ),
} }
{%- elif cookiecutter.mail_service == 'SparkPost' %} {%- elif cookiecutter.mail_service == 'SparkPost' %}
@ -263,8 +249,7 @@ EMAIL_BACKEND = "anymail.backends.sparkpost.EmailBackend"
ANYMAIL = { ANYMAIL = {
"SPARKPOST_API_KEY": env("SPARKPOST_API_KEY"), "SPARKPOST_API_KEY": env("SPARKPOST_API_KEY"),
"SPARKPOST_API_URL": env( "SPARKPOST_API_URL": env(
"SPARKPOST_API_URL", "SPARKPOST_API_URL", default="https://api.sparkpost.com/api/v1"
default="https://api.sparkpost.com/api/v1"
), ),
} }
{%- elif cookiecutter.mail_service == 'Other SMTP' %} {%- elif cookiecutter.mail_service == 'Other SMTP' %}