Use mozmail.com based on env var

.env-dist

@@ -8,7 +8,8 @@ SECRET_KEY=unsafe-secret-key-for-dev-envs
 ADMIN_ENABLED=
 DEBUG=True
 DJANGO_INTERNAL_IPS=127.0.0.1, localhost
-ADDITIONAL_DOMAINS="mozmail.com,"
+TEST_MOZMAIL=True
+ADDITIONAL_DOMAINS="mozmail.com,environment-domain.com"
 SENTRY_DSN=""
 SERVE_ADDON="private_relay.zip"
 AWS_REGION="us-east-1"

emails/models.py

@@ -22,7 +22,6 @@
 
 DOMAIN_DEFAULT = get_email_domain_from_settings()
 DOMAIN_CHOICES = [(item, item) for item in settings.ADDITIONAL_DOMAINS]
-DOMAIN_CHOICES.append((DOMAIN_DEFAULT, DOMAIN_DEFAULT))
 
 
 class Profile(models.Model):

emails/utils.py

@@ -45,6 +45,8 @@ def histogram_if_enabled(name, value, tags=None):
 
 
 def get_email_domain_from_settings():
+    if settings.TEST_MOZMAIL:
+        return settings.ADDITIONAL_DOMAINS.first()
     email_network_locality = urlparse(settings.SITE_ORIGIN).netloc
     # on Heroku we need to add "mail" prefix
     # because we can’t publish MX records on Heroku

privaterelay/settings.py

@@ -244,6 +244,7 @@ def _get_initial_middleware():
 
 WSGI_APPLICATION = 'privaterelay.wsgi.application'
 
+TEST_MOZMAIL = config('TEST_MOZMAIL', False, cast=bool)
 
 # Database
 # https://docs.djangoproject.com/en/2.2/ref/settings/#databases