Merge lp:~prakhar126/postorius/adding_dropdown_option into lp:postorius

[pjoshi]

[Terri (terriko)]

I'm finding some errors in the tests here (missing commas, for example). I'll see if they're things I can fix relatively quickly.

review: Needs Fixing

[Terri (terriko)]

Here's the fixed code. There were a lot of syntax errors here. In future, please actually run the tests before you submit a merge proposal!

class ListNewTest(unittest.TestCase):

    def test_form_fields_list(self):
        form = ListNew({
            'listname': 'xyz',
            'mail_host': 'mailman.most-desirable.org',
            'list_owner': '<email address hidden>',
            'advertise': 'abcd',
            'description': 'The Most Desirable organization',
        })
        self.assertTrue(form.is_valid)

    def test_form_fields_list_invalid(self):
        form = ListNew({
             'listname': 'xy#z',
             'mail_host': 'mailman.most-desirable.org',
             'list_owner': 'mailman.most-desirable.org',
             'advertise': 'abcd',
             'description': 'The Most Desirable organization',
        })
        self.assertFalse(form.is_valid())

=== modified file 'src/postorius/forms.py'
--- src/postorius/forms.py	2015-02-09 14:35:44 +0000
+++ src/postorius/forms.py	2015-03-13 10:43:56 +0000
@@ -426,10 +426,19 @@
     #    label=_('No reply address'),
     #    required=False,
     # )
-    posting_pipeline = forms.CharField(
+    posting_pipeline = forms.ChoiceField(
         label=_('Pipeline'),
+        widget=forms.Select(),
+        required=False,
+        error_messages={
+            'required': _("Please choose a reply-to action.")},
+        choices=(
+            ("default-owner-pipeline", _("default-owner-pipeline")),
+            ("default-posting-pipeline", _("default-posting-pipeline")),
+            ("virgin", _("virgin"))),
         help_text=(
             'Type of pipeline you want to use for this mailing list')
+
     )
     # post_id = forms.IntegerField(
     #    label=_('Post ID'),

=== modified file 'src/postorius/tests/test_forms.py'
--- src/postorius/tests/test_forms.py	2015-02-09 14:35:44 +0000
+++ src/postorius/tests/test_forms.py	2015-03-13 10:43:56 +0000
@@ -49,3 +49,26 @@
             'contact_address': '[e-mail]',
         })
         self.assertFalse(form.is_valid())
+
+class ListNewTest(unittest.TestCase):
+
+    def test_form_fields_list(self):
+         form = ListNew({
+            'listname': 'xyz'
+            'mail_host': 'mailman.most-desirable.org'
+            'list_owner': '[e-mail]'
+            'advertise': 'abcd'
+            'description': 'The Most Desirable organization'
+    })
+    self.assertTrue(form.is_valid)
+
+    def test_form_fields_list_invalid(self):
+        form = ListNew({
+             'listname': ''xy#z'
+             'mail_host': 'mailman.most-desirable.org'
+             'list_owner': 'mailman.most-desirable.org'
+             'advertise': 'abcd'
+             'description': 'The Most Desirable organization'
+    })
+    self.assertFalse(form.is_valid)
+ 
\ No newline at end of file