Allow setting session_event when sending messages.

praekeltfoundation · Mar 18, 2015 · ad4eeea · ad4eeea
1 parent 28f31be
commit ad4eeea
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/vumi/message.py b/vumi/message.py
@@ -382,11 +382,11 @@ def send(cls, to_addr, content, **kw):
         kw.setdefault('from_addr', None)
         kw.setdefault('transport_name', None)
         kw.setdefault('transport_type', None)
+        kw.setdefault('session_event', cls.SESSION_NONE)
         out_msg = cls(
             to_addr=to_addr,
             in_reply_to=None,
             content=content,
-            session_event=cls.SESSION_NONE,
             **kw)
         return out_msg
 

diff --git a/vumi/tests/test_message.py b/vumi/tests/test_message.py
@@ -398,6 +398,18 @@ def test_transport_user_message_send(self):
         self.assertEqual(msg['transport_metadata'], {})
         self.assertEqual(msg['helper_metadata'], {})
 
+    def test_transport_user_message_send_with_session_event(self):
+        msg = TransportUserMessage.send(
+            '123', 'Hi!', session_event=TransportUserMessage.SESSION_NEW)
+        self.assertEqual(msg['to_addr'], '123')
+        self.assertEqual(msg['from_addr'], None)
+        self.assertEqual(msg['session_event'], msg.SESSION_NEW)
+        self.assertEqual(msg['in_reply_to'], None)
+        self.assertEqual(msg['transport_name'], None)
+        self.assertEqual(msg['transport_type'], None)
+        self.assertEqual(msg['transport_metadata'], {})
+        self.assertEqual(msg['helper_metadata'], {})
+
 
 class TransportEventTest(TransportMessageTestMixin, VumiTestCase):
     def make_message(self, **extra_fields):