Drop unintended json date encoding

djrill/tests/test_legacy.py

@@ -1,58 +1,8 @@
 # Tests deprecated Djrill features
 
-from datetime import date, datetime
-import warnings
-
-from django.core import mail
 from django.test import TestCase
 
 from djrill import NotSupportedByMandrillError
-from djrill.tests.mock_backend import DjrillBackendMockAPITestCase
-from djrill.tests.utils import reset_warning_registry
-
-
-class DjrillBackendDeprecationTests(DjrillBackendMockAPITestCase):
-
-    def setUp(self):
-        reset_warning_registry()
-        super(DjrillBackendDeprecationTests, self).setUp()
-
-    def test_deprecated_json_date_encoding(self):
-        """Djrill 2.0+ avoids a blanket JSONDateUTCEncoder"""
-        # Djrill allows dates for send_at, so shouldn't warn:
-        message = mail.EmailMessage('Subject', 'Body', 'from@example.com', ['to@example.com'])
-        message.send_at = datetime(2022, 10, 11, 12, 13, 14, 567)
-        self.assertNotWarns(DeprecationWarning, message.send)
-
-        # merge_vars need to be json-serializable, so should generate a warning:
-        message = mail.EmailMessage('Subject', 'Body', 'from@example.com', ['to@example.com'])
-        message.global_merge_vars = {'DATE': date(2022, 10, 11)}
-        self.assertWarnsMessage(DeprecationWarning,
-                                "Djrill 2.0 will require you to explicitly convert this date to a string",
-                                message.send)
-        # ... but should still encode the date (for now):
-        data = self.get_api_call_data()
-        self.assertEqual(data['message']['global_merge_vars'],
-                         [{'name': 'DATE', 'content': "2022-10-11 00:00:00"}])
-
-    def assertWarnsMessage(self, warning, message, callable, *args, **kwds):
-        """Checks that `callable` issues a warning of category `warning` containing `message`"""
-        with warnings.catch_warnings(record=True) as warned:
-            warnings.simplefilter("always")
-            callable(*args, **kwds)
-        self.assertGreater(len(warned), 0, msg="No warnings issued")
-        self.assertTrue(
-            any(issubclass(w.category, warning) and message in str(w.message) for w in warned),
-            msg="%r(%r) not found in %r" % (warning, message, [str(w) for w in warned]))
-
-    def assertNotWarns(self, warning, callable, *args, **kwds):
-        """Checks that `callable` does not issue any warnings of category `warning`"""
-        with warnings.catch_warnings(record=True) as warned:
-            warnings.simplefilter("always")
-            callable(*args, **kwds)
-        relevant_warnings = [w for w in warned if issubclass(w.category, warning)]
-        self.assertEqual(len(relevant_warnings), 0,
-                         msg="Unexpected warnings %r" % [str(w) for w in relevant_warnings])
 
 
 class DjrillLegacyExceptionTests(TestCase):

djrill/tests/test_mandrill_send.py

@@ -529,7 +529,7 @@ class DjrillMandrillFeatureTests(DjrillBackendMockAPITestCase):
         self.assertEqual(sent, 0)
         self.assertIsNone(msg.mandrill_response)
 
-    def test_json_serialization_warnings(self):
+    def test_json_serialization_errors(self):
         """Try to provide more information about non-json-serializable data"""
         self.message.global_merge_vars = {'PRICE': Decimal('19.99')}
         with self.assertRaisesMessage(
@@ -539,6 +539,12 @@ class DjrillMandrillFeatureTests(DjrillBackendMockAPITestCase):
         ):
             self.message.send()
 
+    def test_dates_not_serialized(self):
+        """Pre-2.0 Djrill accidentally serialized dates to ISO"""
+        self.message.global_merge_vars = {'SHIP_DATE': date(2015, 12, 2)}
+        with self.assertRaises(TypeError):
+            self.message.send()
+
 
 @override_settings(MANDRILL_SETTINGS={
     'from_name': 'Djrill Test',