Merge lp:~noskcaj/ubuntu/trusty/webtest/merge into lp:ubuntu/trusty/webtest

[Jackson Doak]

New upstream bugfix release

[Martin Pitt (pitti)]

Sponsored, thanks!

review: Approve

=== modified file 'CHANGELOG.rst'
--- CHANGELOG.rst	2014-01-20 12:45:19 +0000
+++ CHANGELOG.rst	2014-03-07 23:00:45 +0000
@@ -1,6 +1,20 @@
 News
 ====
 
+2.0.14 (2014-01-23)
+-------------------
+
+- Allow `.select()` on <select>s and <select multiple>s.
+  [Markus Bertheau]
+
+
+2.0.13 (2014-01-23)
+-------------------
+
+- Allow selecting <select> options by text
+  [Markus Bertheau]
+
+
 2.0.12 (2014-01-17)
 -------------------
 

=== modified file 'PKG-INFO'
--- PKG-INFO	2014-01-20 12:45:19 +0000
+++ PKG-INFO	2014-03-07 23:00:45 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: WebTest
-Version: 2.0.12
+Version: 2.0.14
 Summary: Helper to test WSGI applications
 Home-page: http://webtest.pythonpaste.org/
 Author: Gael Pasgrimaud

=== modified file 'WebTest.egg-info/PKG-INFO'
--- WebTest.egg-info/PKG-INFO	2014-01-20 12:45:19 +0000
+++ WebTest.egg-info/PKG-INFO	2014-03-07 23:00:45 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: WebTest
-Version: 2.0.12
+Version: 2.0.14
 Summary: Helper to test WSGI applications
 Home-page: http://webtest.pythonpaste.org/
 Author: Gael Pasgrimaud

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-20 12:45:19 +0000
+++ debian/changelog	2014-03-07 23:00:45 +0000
@@ -1,9 +1,34 @@
+webtest (2.0.14-1ubuntu1) trusty; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - d/control: Demote python-lxml and python-pyquery to Suggests.
+
+ -- Jackson Doak <[e-mail]>  Sat, 08 Mar 2014 09:36:06 +1100
+
+webtest (2.0.14-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Piotr Ożarowski <[e-mail]>  Thu, 23 Jan 2014 23:12:31 +0100
+
+webtest (2.0.12-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Piotr Ożarowski <[e-mail]>  Wed, 22 Jan 2014 22:32:04 +0100
+
 webtest (2.0.12-0ubuntu1) trusty; urgency=medium
 
   * New usptream version. 
 
  -- Chuck Short <[e-mail]>  Mon, 20 Jan 2014 12:45:19 -0500
 
+webtest (2.0.11-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Piotr Ożarowski <[e-mail]>  Sun, 12 Jan 2014 19:26:17 +0100
+
 webtest (2.0.10-2ubuntu1) trusty; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:

=== modified file 'docs/changelog.txt'
--- docs/changelog.txt	2014-01-20 12:45:19 +0000
+++ docs/changelog.txt	2014-03-07 23:00:45 +0000
@@ -1,6 +1,20 @@
 News
 ====
 
+2.0.14 (2014-01-23)
+-------------------
+
+- Allow `.select()` on <select>s and <select multiple>s.
+  [Markus Bertheau]
+
+
+2.0.13 (2014-01-23)
+-------------------
+
+- Allow selecting <select> options by text
+  [Markus Bertheau]
+
+
 2.0.12 (2014-01-17)
 -------------------
 

=== modified file 'docs/forms.txt'
--- docs/forms.txt	2014-01-20 12:45:19 +0000
+++ docs/forms.txt	2014-03-07 23:00:45 +0000
@@ -96,6 +96,22 @@
     ['option2', 'option3']
     >>> form['multiple'] = ['option1']
 
+You can select an option by its text with ``.select()``:
+
+.. code-block:: python
+
+    >>> form['select'].select(text="Option 2")
+    >>> print(form['select'].value)
+    option2
+
+For select multiple use ``.select_multiple()``:
+
+.. code-block:: python
+
+    >>> form['multiple'].select_multiple(texts=["Option 1", "Option 2"])
+    >>> print(form['multiple'].value) # doctest: +SKIP
+    ['option1', 'option2']
+
 Select fields can only be set to valid values (i.e., values in an ``<option>``)
 but you can also use ``.force_value()`` to enter values not present in an
 option.

=== modified file 'setup.py'
--- setup.py	2014-01-20 12:45:19 +0000
+++ setup.py	2014-03-07 23:00:45 +0000
@@ -5,7 +5,7 @@
 from setuptools import setup
 from setuptools import find_packages
 
-version = '2.0.12'
+version = '2.0.14'
 
 tests_require = ['nose', 'coverage', 'mock', 'PasteDeploy', 'WSGIProxy2', 'pyquery']
 opt_install_requires = []

=== modified file 'tests/test_forms.py'
--- tests/test_forms.py	2014-01-20 12:45:19 +0000
+++ tests/test_forms.py	2014-03-07 23:00:45 +0000
@@ -520,6 +520,17 @@
         display = single_form.submit("button")
         self.assertIn("<p>You selected 6</p>", display, display)
 
+        res = app.get('/')
+        single_form = res.forms["single_select_form"]
+        self.assertRaises(ValueError, single_form.select, "single", "5",
+                          text="Five")
+        self.assertRaises(ValueError, single_form.select, "single",
+                          text="Three")
+        single_form.select("single", text="Seven")
+        self.assertEqual(single_form["single"].value, "7")
+        display = single_form.submit("button")
+        self.assertIn("<p>You selected 7</p>", display, display)
+
     def test_single_select_forced_value(self):
         app = webtest.TestApp(select_app)
         res = app.get('/')
@@ -591,6 +602,18 @@
         display = multiple_form.submit("button")
         self.assertIn("<p>You selected 9</p>", display, display)
 
+        res = app.get('/')
+        multiple_form = res.forms["multiple_select_form"]
+        self.assertRaises(ValueError, multiple_form.select_multiple,
+                          "multiple",
+                          ["8", "10"], texts=["Eight", "Ten"])
+        self.assertRaises(ValueError, multiple_form.select_multiple,
+                          "multiple", texts=["Twelve"])
+        multiple_form.select_multiple("multiple",
+                                      texts=["Eight", "Nine", "Ten"])
+        display = multiple_form.submit("button")
+        self.assertIn("<p>You selected 8, 9, 10</p>", display, display)
+
     def test_multiple_select_forced_values(self):
         app = webtest.TestApp(select_app)
         res = app.get('/')

=== modified file 'webtest/forms.py'
--- webtest/forms.py	2014-01-20 12:45:19 +0000
+++ webtest/forms.py	2014-03-07 23:00:45 +0000
@@ -112,10 +112,28 @@
         """
         self._forced_value = value
 
+    def select(self, value=None, text=None):
+        if value is not None and text is not None:
+            raise ValueError("Specify only one of value and text.")
+
+        if text is not None:
+            value = self._get_value_for_text(text)
+
+        self.value = value
+
+    def _get_value_for_text(self, text):
+        for i, (option_value, checked, option_text) in enumerate(self.options):
+            if option_text == utils.stringify(text):
+                return option_value
+
+        raise ValueError("Option with text %r not found (from %s)"
+                         % (text, ', '.join(
+                             [repr(t) for o, c, t in self.options])))
+
     def value__set(self, value):
         if self._forced_value is not NoValue:
             self._forced_value = NoValue
-        for i, (option, checked) in enumerate(self.options):
+        for i, (option, checked, text) in enumerate(self.options):
             if option == utils.stringify(value):
                 self.selectedIndex = i
                 break
@@ -123,7 +141,7 @@
             raise ValueError(
                 "Option %r not found (from %s)"
                 % (value, ', '.join(
-                [repr(o) for o, c in self.options])))
+                [repr(o) for o, c, t in self.options])))
 
     def value__get(self):
         if self._forced_value is not NoValue:
@@ -131,7 +149,7 @@
         elif self.selectedIndex is not None:
             return self.options[self.selectedIndex][0]
         else:
-            for option, checked in self.options:
+            for option, checked, text in self.options:
                 if checked:
                     return option
             else:
@@ -158,10 +176,35 @@
         self._forced_values = values
         self.selectedIndices = []
 
+    def select_multiple(self, value=None, texts=None):
+        if value is not None and texts is not None:
+            raise ValueError("Specify only one of value and texts.")
+
+        if texts is not None:
+            value = self._get_value_for_texts(texts)
+
+        self.value = value
+
+    def _get_value_for_texts(self, texts):
+        str_texts = [utils.stringify(text) for text in texts]
+        value = []
+        for i, (option, checked, text) in enumerate(self.options):
+            if text in str_texts:
+                value.append(option)
+                str_texts.remove(text)
+
+        if str_texts:
+            raise ValueError(
+                "Option(s) %r not found (from %s)"
+                % (', '.join(str_texts),
+                   ', '.join([repr(t) for o, c, t in self.options])))
+
+        return value
+
     def value__set(self, values):
         str_values = [utils.stringify(value) for value in values]
         self.selectedIndices = []
-        for i, (option, checked) in enumerate(self.options):
+        for i, (option, checked, text) in enumerate(self.options):
             if option in str_values:
                 self.selectedIndices.append(i)
                 str_values.remove(option)
@@ -169,7 +212,7 @@
             raise ValueError(
                 "Option(s) %r not found (from %s)"
                 % (', '.join(str_values),
-                   ', '.join([repr(o) for o, c in self.options])))
+                   ', '.join([repr(o) for o, c, t in self.options])))
 
     def value__get(self):
         selected_values = []
@@ -178,7 +221,7 @@
                                for i in self.selectedIndices]
         elif not self._forced_values:
             selected_values = []
-            for option, checked in self.options:
+            for option, checked, text in self.options:
                 if checked:
                     selected_values.append(option)
         if self._forced_values:
@@ -197,7 +240,7 @@
         if self.selectedIndex is not None:
             return self.options[self.selectedIndex][0]
         else:
-            for option, checked in self.options:
+            for option, checked, text in self.options:
                 if checked:
                     return option
             else:
@@ -413,7 +456,8 @@
                         assert isinstance(field,
                                           self.FieldClass.classes['radio'])
                     field.options.append((attrs.get('value'),
-                                          'checked' in attrs))
+                                          'checked' in attrs,
+                                          None))
                     continue
                 elif tag_type == 'file':
                     if 'value' in attrs:
@@ -426,7 +470,8 @@
             if tag == 'select':
                 for option in node('option'):
                     field.options.append((option.attrs.get('value', option.text),
-                                          'selected' in option.attrs))
+                                          'selected' in option.attrs,
+                                          option.text))
 
         self.field_order = field_order
         self.fields = fields
@@ -516,12 +561,23 @@
             return self[name]
         return fields[index]
 
-    def select(self, name, value, index=None):
-        """Like ``.set()``, except also confirms the target is a ``<select>``.
+    def select(self, name, value=None, text=None, index=None):
+        """Like ``.set()``, except also confirms the target is a ``<select>``
+        and allows selecting options by text.
         """
         field = self.get(name, index=index)
         assert isinstance(field, Select)
-        field.value = value
+
+        field.select(value, text)
+
+    def select_multiple(self, name, value=None, texts=None, index=None):
+        """Like ``.set()``, except also confirms the target is a
+        ``<select multiple>`` and allows selecting options by text.
+        """
+        field = self.get(name, index=index)
+        assert isinstance(field, MultipleSelect)
+
+        field.select_multiple(value, texts)
 
     def submit(self, name=None, index=None, value=None, **args):
         """Submits the form.  If ``name`` is given, then also select that