Merge pull request #1480 from johngian/1286524

[Fix bug 1286524] Fix BASKET_NDA_NEWSLETTER config entry.
mozilla · Jul 13, 2016 · 5f0af73 · 5f0af73
2 parents e9f88e2 + 007b85f
commit 5f0af73
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 4 deletions.
diff --git a/mozillians/settings/base.py b/mozillians/settings/base.py
@@ -432,7 +432,7 @@ def COMPRESS_JINJA2_GET_ENVIRONMENT():
     BASKET_URL = 'https://basket.mozilla.com'
 
 BASKET_VOUCHED_NEWSLETTER = 'mozilla-phone'
-BASKET_NDA_NEWSLETTER = 'nda-mozillians'
+BASKET_NDA_NEWSLETTER = 'mozillians-nda'
 NDA_GROUP = "nda"
 
 USER_AVATAR_DIR = 'uploads/userprofile'

diff --git a/mozillians/settings/local.py-devdist b/mozillians/settings/local.py-devdist
@@ -65,7 +65,6 @@ STATSD_CLIENT = 'django_statsd.clients.log'
 
 # Basket
 BASKET_URL = 'http://127.0.0.1'
-BASKET_NEWSLETTER = 'mozilla-phone'
 BASKET_MANAGERS = None  # or list of email addresses.
 
 GA_ACCOUNT_CODE = None

diff --git a/mozillians/settings/local.py-docker-dist b/mozillians/settings/local.py-docker-dist
@@ -69,7 +69,6 @@ STATSD_CLIENT = 'django_statsd.clients.log'
 
 # Basket
 BASKET_URL = None
-BASKET_NEWSLETTER = 'mozilla-phone'
 BASKET_MANAGERS = None # or list of email addresses.
 
 GA_ACCOUNT_CODE = None

diff --git a/mozillians/users/tests/test_tasks.py b/mozillians/users/tests/test_tasks.py
@@ -136,7 +136,6 @@ def test_email_basket_managers(self, send_mail_mock):
         send_mail_mock.assert_called_with(
             subject, body, 'noreply', 'basket_managers', fail_silently=False)
 
-    @override_settings(BASKET_NEWSLETTER='newsletter')
     @patch('mozillians.users.tasks.BASKET_ENABLED', True)
     @patch('mozillians.users.tasks.waffle.switch_is_active')
     @patch('mozillians.users.tasks.basket')