pacnpal/django-anymail
1
0
Fork 0
mirror of https://github.com/pacnpal/django-anymail.git synced 2025-12-21 12:21:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Allow global_merge_vars to be merged in with the per message dict, with keys in the latter taking precedent.

Browse Source 
Update the docs accordingly.
This commit is contained in:
William Hector
2015-07-14 05:57:12 +01:00
parent 883b23362c
commit 7179734a08
4 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
djrill/tests/test_mandrill_send.py
View File

@@ -650,11 +650,21 @@ class DjrillMandrillGlobalFeatureTests(DjrillBackendMockAPITestCase):
self.assertEqual(data['message']['url_strip_qs'], False)
def test_global_merge(self):
# Test that global settings merge in
self.message.global_merge_vars = {'GREETING': "Hello"}
self.message.send()
data = self.get_api_call_data()
self.assertEqual(data['message']['global_merge_vars'],
[{'name': "GREETING", 'content': "Hello"}])
[{'name': "GREETING", 'content': "Hello"},
{'name': 'TEST', 'content': 'djrill'}])
def test_global_merge_overwrite(self):
# Test that global merge settings are overwritten
self.message.global_merge_vars = {'TEST': "Hello"}
self.message.send()
data = self.get_api_call_data()
self.assertEqual(data['message']['global_merge_vars'],
[{'name': 'TEST', 'content': 'Hello'}])
@override_settings(EMAIL_BACKEND="djrill.mail.backends.djrill.DjrillBackend")