Merge lp:~fginther/uci-engine/field-separator into lp:uci-engine

[Francis Ginther]

Use a regex for splitting Sources and MPs and allow any whitespace as a separator.

Use a regex for splitting Sources and MPs and allow any whitespace as a separator.

This implements https://app.asana.com/0/20835902057994/21373859714237.

[Paul Larson (pwlars)]

Looks good, +1

review: Approve

[Ubuntu CI Bot (uci-bot)]

Attempt to merge into lp:uci-engine failed due to conflicts:

text conflict in tests/test_webui.py

[lp:~fginther/uci-engine/field-separator]

911. By Francis Ginther on 2014-12-18

Merge trunk.

912. By Francis Ginther on 2014-12-18

Update the test ticket title.

=== modified file 'tests/test_webui.py'
--- tests/test_webui.py	2014-12-16 20:49:10 +0000
+++ tests/test_webui.py	2014-12-18 21:37:26 +0000
@@ -186,6 +186,68 @@
                 'Source Packages or Merge Proposals must be supplied',
                 error.text)
 
+    def test_create_ticket_with_whitespace_and_comma_separator(self):
+        # Create a ticket using various whitespace and commas as the separator.
+        # Includes multiple and trailing whitespace and commas
+        go_to('/create')
+        wait_for(get_element, tag='form')
+
+        # Submit the form with the required fields.
+        title = get_element_by_css('input[name="title"]')
+        write_textfield(title, 'Testing With Whitespace and Commas')
+        landers = get_element_by_css('input[name="landers"]')
+        write_textfield(landers, '[e-mail]')
+        test_notes = get_element_by_css('textarea[name="test_notes"]')
+        write_textfield(test_notes, 'test this')
+        sources = get_element_by_css('textarea[name="sources"]')
+        write_textfield(sources, 'foo, , ,  bar\nbang , ')
+        mps = get_element_by_css('textarea[name="merge_proposals"]')
+        write_textfield(
+            mps,
+            'https://code.launchpad.net/~x/foo/a_branch/+merge/1,  '
+            'https://code.launchpad.net/~x/foo/a_branch/+merge/2\n'
+            'https://code.launchpad.net/~x/baz/a_branch/+merge/3,')
+        submit = get_element_by_css('input[type="submit"]')
+        click_button(submit, wait=True)
+
+        # Redirects to the ticket page where sources & MPs were combined
+        # as subtickets. Sources mentioned only in MPs are created.
+        ticket_title = wait_for(get_element, tag='h2')
+        self.assertEqual('Testing With Whitespace and Commas',
+                         ticket_title.text)
+        subtickets = get_elements_by_css('table.subticket')
+        self.assertEqual(
+            [['Source: foo',
+              'Status: -',
+              'Step: New',
+              'Current version: Not available',
+              'MPs: https://code.launchpad.net/~x/foo/a_branch/+merge/1',
+              'https://code.launchpad.net/~x/foo/a_branch/+merge/2',
+              'Artifacts:',
+              'Conflicts:'],
+             ['Source: bar',
+              'Status: -',
+              'Step: New',
+              'Current version: Not available',
+              'MPs:',
+              'Artifacts:',
+              'Conflicts:'],
+             ['Source: bang',
+              'Status: -',
+              'Step: New',
+              'Current version: Not available',
+              'MPs:',
+              'Artifacts:',
+              'Conflicts:'],
+             ['Source: baz',
+              'Status: -',
+              'Step: New',
+              'Current version: Not available',
+              'MPs: https://code.launchpad.net/~x/baz/a_branch/+merge/3',
+              'Artifacts:',
+              'Conflicts:']],
+            [s.text.splitlines() for s in subtickets])
+
     def test_edit_ticket(self):
         # Edit a ticket via WebUI form.
         go_to('/')
@@ -298,6 +360,13 @@
               'MPs:',
               'Artifacts:',
               'Conflicts:'],
+             ['Source: bang',
+              'Status: -',
+              'Step: New',
+              'Current version: Not available',
+              'MPs:',
+              'Artifacts:',
+              'Conflicts:'],
              ['Source: baz',
               'Status: -',
               'Step: New',

=== modified file 'webui/tickets/static/tickets/webuiforms.js'
--- webui/tickets/static/tickets/webuiforms.js	2014-12-16 19:22:27 +0000
+++ webui/tickets/static/tickets/webuiforms.js	2014-12-18 21:37:26 +0000
@@ -39,8 +39,9 @@
          * @method _mangleFormSources
          */
         _mangleFormSources: function (form_data) {
-            var sources_list = form_data['sources'].split('\n');
-            var mp_list = form_data['merge_proposals'].split('\n');
+            var re = /[\s,]+/g
+            var sources_list = form_data['sources'].split(re);
+            var mp_list = form_data['merge_proposals'].split(re);
             delete form_data['sources'];
             delete form_data['merge_proposals'];