More convenient channel creation in app tests.

praekeltfoundation · Dec 19, 2013 · 46eefc5 · 46eefc5
1 parent 6a7b8d6
commit 46eefc5
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 37 deletions.
diff --git a/go/apps/bulk_message/tests/test_views.py b/go/apps/bulk_message/tests/test_views.py
@@ -31,9 +31,7 @@ def test_show_running(self):
         Test showing the conversation
         """
         group = self.app_helper.create_group_with_contacts(u'test_group', 0)
-        channel = self.app_helper.create_channel({
-            "supports": {"generic_sends": True},
-        })
+        channel = self.app_helper.create_channel(supports_generic_sends=True)
         conv_helper = self.app_helper.create_conversation(
             name=u"myconv", started=True, channel=channel, groups=[group])
         response = self.client.get(conv_helper.get_view_url('show'))
@@ -45,9 +43,7 @@ def test_show_running(self):
 
     def test_action_bulk_send_view(self):
         group = self.app_helper.create_group_with_contacts(u'test_group', 0)
-        channel = self.app_helper.create_channel({
-            "supports": {"generic_sends": True},
-        })
+        channel = self.app_helper.create_channel(supports_generic_sends=True)
         conv_helper = self.app_helper.create_conversation(
             started=True, channel=channel, groups=[group])
         response = self.client.get(
@@ -101,9 +97,7 @@ def test_action_bulk_send_no_channel(self):
 
     def test_action_bulk_send_dedupe(self):
         group = self.app_helper.create_group_with_contacts(u'test_group', 0)
-        channel = self.app_helper.create_channel({
-            "supports": {"generic_sends": True},
-        })
+        channel = self.app_helper.create_channel(supports_generic_sends=True)
         conv_helper = self.app_helper.create_conversation(
             started=True, channel=channel, groups=[group])
         response = self.client.post(
@@ -123,9 +117,7 @@ def test_action_bulk_send_dedupe(self):
 
     def test_action_bulk_send_no_dedupe(self):
         group = self.app_helper.create_group_with_contacts(u'test_group', 0)
-        channel = self.app_helper.create_channel({
-            "supports": {"generic_sends": True},
-        })
+        channel = self.app_helper.create_channel(supports_generic_sends=True)
         conv_helper = self.app_helper.create_conversation(
             started=True, channel=channel, groups=[group])
         response = self.client.post(
@@ -156,9 +148,7 @@ def test_action_bulk_send_confirm(self):
 
         # Start the conversation
         group = self.app_helper.create_group_with_contacts(u'test_group', 0)
-        channel = self.app_helper.create_channel({
-            "supports": {"generic_sends": True},
-        })
+        channel = self.app_helper.create_channel(supports_generic_sends=True)
         conv_helper = self.app_helper.create_conversation(
             started=True, channel=channel, groups=[group])
 

diff --git a/go/apps/dialogue/tests/test_views.py b/go/apps/dialogue/tests/test_views.py
@@ -21,9 +21,8 @@ def setup_conversation(self, with_group=True, with_channel=True, **kw):
                 self.app_helper.create_group_with_contacts(u'test_group', 0))
         channel = None
         if with_channel:
-            channel = self.app_helper.create_channel({
-                "supports": {"generic_sends": True},
-            })
+            channel = self.app_helper.create_channel(
+                supports_generic_sends=True)
         return self.app_helper.create_conversation(
             channel=channel, groups=groups, **kw)
 

diff --git a/go/apps/surveys/tests/test_views.py b/go/apps/surveys/tests/test_views.py
@@ -25,9 +25,7 @@ def create_poll(self, conversation, **kwargs):
 
     def test_action_send_survey_get(self):
         group = self.app_helper.create_group_with_contacts(u'test_group', 0)
-        channel = self.app_helper.create_channel({
-            "supports": {"generic_sends": True},
-        })
+        channel = self.app_helper.create_channel(supports_generic_sends=True)
         conv_helper = self.app_helper.create_conversation(
             name=u"myconv", started=True, channel=channel, groups=[group])
         response = self.client.get(
@@ -38,9 +36,7 @@ def test_action_send_survey_get(self):
 
     def test_action_send_survey_post(self):
         group = self.app_helper.create_group_with_contacts(u'test_group', 0)
-        channel = self.app_helper.create_channel({
-            "supports": {"generic_sends": True},
-        })
+        channel = self.app_helper.create_channel(supports_generic_sends=True)
         conv_helper = self.app_helper.create_conversation(
             started=True, channel=channel, groups=[group])
         response = self.client.post(
@@ -57,9 +53,7 @@ def test_action_send_survey_post(self):
             delivery_class=conversation.delivery_class))
 
     def test_action_send_survey_no_group(self):
-        channel = self.app_helper.create_channel({
-            "supports": {"generic_sends": True},
-        })
+        channel = self.app_helper.create_channel(supports_generic_sends=True)
         conv_helper = self.app_helper.create_conversation(
             started=True, channel=channel)
         response = self.client.post(
@@ -72,9 +66,7 @@ def test_action_send_survey_no_group(self):
 
     def test_action_send_survey_not_running(self):
         group = self.app_helper.create_group_with_contacts(u'test_group', 0)
-        channel = self.app_helper.create_channel({
-            "supports": {"generic_sends": True},
-        })
+        channel = self.app_helper.create_channel(supports_generic_sends=True)
         conv_helper = self.app_helper.create_conversation(
             started=False, channel=channel, groups=[group])
         response = self.client.post(
@@ -116,9 +108,7 @@ def test_show_running(self):
         Test showing the conversation
         """
         group = self.app_helper.create_group_with_contacts(u'test_group', 0)
-        channel = self.app_helper.create_channel({
-            "supports": {"generic_sends": True},
-        })
+        channel = self.app_helper.create_channel(supports_generic_sends=True)
         conv_helper = self.app_helper.create_conversation(
             name=u"myconv", started=True, channel=channel, groups=[group])
         response = self.client.get(conv_helper.get_view_url('show'))
@@ -174,9 +164,7 @@ def test_edit_continue_editing(self):
 
     def test_action_export_user_data_get(self):
         group = self.app_helper.create_group_with_contacts(u'test_group', 0)
-        channel = self.app_helper.create_channel({
-            "supports": {"generic_sends": True},
-        })
+        channel = self.app_helper.create_channel(supports_generic_sends=True)
         conv_helper = self.app_helper.create_conversation(
             name=u"myconv", started=True, channel=channel, groups=[group])
         response = self.client.get(

diff --git a/go/apps/tests/helpers.py b/go/apps/tests/helpers.py
@@ -74,7 +74,12 @@ def create_conversation(self, started=False, channel=None, **conv_kw):
 
     @proxyable
     @maybe_async
-    def create_channel(self, metadata=None):
+    def create_channel(self, metadata=None, supports_generic_sends=None):
+        if supports_generic_sends is not None:
+            if metadata is None:
+                metadata = {}
+            supports = metadata.setdefault('supports', {})
+            supports['generic_sends'] = supports_generic_sends
         yield self.vumi_helper.setup_tagpool(u"pool", [u"tag"], metadata)
         user_helper = yield self.vumi_helper.get_or_create_user()
         yield user_helper.add_tagpool_permission(u"pool")