Add test for content_subtype

Author: Rich Leland

sparkpost/django/message.py

@@ -33,7 +33,9 @@ def __init__(self, message):
         if message.subject:
             formatted['subject'] = message.subject
 
-        if message.content_subtype == 'html':
+        if hasattr(message, 'template'):
+            formatted['template'] = message.template
+        elif message.content_subtype == 'html':
             formatted['html'] = message.body
         else:
             formatted['text'] = message.body
@@ -73,10 +75,8 @@ def __init__(self, message):
                     'data': base64_encoded_content.decode('ascii'),
                     'type': mimetype
                 })
+
         if hasattr(message, 'substitution_data'):
             formatted['substitution_data'] = message.substitution_data
 
-        if hasattr(message, 'template'):
-            formatted['template'] = message.template
-
         super(SparkPostMessage, self).__init__(formatted)

test/django/test_message.py

@@ -108,6 +108,22 @@ def test_attachment_unicode():
     assert actual == expected
 
 
+def test_content_subtype():
+    email_message = EmailMessage(
+        to=['[email protected]'],
+        from_email='[email protected]',
+        body='<p>Testing</p>'
+    )
+    email_message.content_subtype = 'html'
+    actual = SparkPostMessage(email_message)
+    expected = dict(
+        recipients=['[email protected]'],
+        from_email='[email protected]',
+        html='<p>Testing</p>'
+    )
+    assert actual == expected
+
+
 def test_template():
     email_message = EmailMessage(
         to=['[email protected]'],