[Testbot] Plone 5.0 - Python 2.7 - Build # 1514 - Fixed! - 0 failure(s)

jenkins at plone.org jenkins at plone.org
Wed Feb 12 22:02:35 UTC 2014


-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 1514 - Fixed!
-------------------------------------------------------------------------------

http://jenkins.plone.org/job/plone-5.0-python-2.7/1514/


-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------

Repository: plone.app.widgets
Branch: refs/heads/master
Date: 2014-02-12T11:47:40-08:00
Author: David Glick (davisagli) <david at glicksoftware.com>
Commit: https://github.com/plone/plone.app.widgets/commit/6a415f6f344de77b45b79226428e43976db1e2e0

fix querystring converter with empty input

(also pin plone.app.robotframework since release 0.7.6 doesn't work with the other robotframework pins from Plone 4.3)

Files changed:
M plone/app/widgets/dx.py
M plone/app/widgets/tests/test_dx.py
M travis.cfg

diff --git a/plone/app/widgets/dx.py b/plone/app/widgets/dx.py
index 202d55e..300c8ac 100644
--- a/plone/app/widgets/dx.py
+++ b/plone/app/widgets/dx.py
@@ -329,7 +329,7 @@ def toWidgetValue(self, value):
         :returns: Query string converted to JSON.
         :rtype: string
         """
-        if value is self.field.missing_value:
+        if not value is self.field.missing_value:
             return self.field.missing_value
         return json.dumps(value)
 
@@ -342,7 +342,7 @@ def toFieldValue(self, value):
         :returns: Query string.
         :rtype: list
         """
-        if value is self.field.missing_value:
+        if not value:
             return self.field.missing_value
         return json.loads(value)
 
diff --git a/plone/app/widgets/tests/test_dx.py b/plone/app/widgets/tests/test_dx.py
index 51156fe..f88adb6 100644
--- a/plone/app/widgets/tests/test_dx.py
+++ b/plone/app/widgets/tests/test_dx.py
@@ -757,6 +757,11 @@ class QueryStringWidgetTests(unittest.TestCase):
     def setUp(self):
         self.request = TestRequest(environ={'HTTP_ACCEPT_LANGUAGE': 'en'})
 
+    def test_converter_empty_value(self):
+        from plone.app.widgets.dx import QueryStringDataConverter
+        converter = QueryStringDataConverter(List(), None)
+        self.assertEqual(converter.toFieldValue(u''), None)
+
     def test_widget(self):
         from plone.app.widgets.dx import QueryStringWidget
         widget = QueryStringWidget(self.request)
diff --git a/travis.cfg b/travis.cfg
index fdac829..3c9c34f 100644
--- a/travis.cfg
+++ b/travis.cfg
@@ -19,3 +19,4 @@ eggs =
 
 [versions]
 coverage = 3.7
+plone.app.robotframework = 0.7.5


Repository: plone.app.widgets
Branch: refs/heads/master
Date: 2014-02-12T13:18:07-08:00
Author: Rok Garbas (garbas) <rok at garbas.si>
Commit: https://github.com/plone/plone.app.widgets/commit/932aae7306697c1e0fc419441f187c4b3703df2e

Merge pull request #54 from plone/296-querystring

fix querystring converter with empty input

Files changed:
M plone/app/widgets/dx.py
M plone/app/widgets/tests/test_dx.py
M travis.cfg

diff --git a/plone/app/widgets/dx.py b/plone/app/widgets/dx.py
index 202d55e..300c8ac 100644
--- a/plone/app/widgets/dx.py
+++ b/plone/app/widgets/dx.py
@@ -329,7 +329,7 @@ def toWidgetValue(self, value):
         :returns: Query string converted to JSON.
         :rtype: string
         """
-        if value is self.field.missing_value:
+        if not value is self.field.missing_value:
             return self.field.missing_value
         return json.dumps(value)
 
@@ -342,7 +342,7 @@ def toFieldValue(self, value):
         :returns: Query string.
         :rtype: list
         """
-        if value is self.field.missing_value:
+        if not value:
             return self.field.missing_value
         return json.loads(value)
 
diff --git a/plone/app/widgets/tests/test_dx.py b/plone/app/widgets/tests/test_dx.py
index 51156fe..f88adb6 100644
--- a/plone/app/widgets/tests/test_dx.py
+++ b/plone/app/widgets/tests/test_dx.py
@@ -757,6 +757,11 @@ class QueryStringWidgetTests(unittest.TestCase):
     def setUp(self):
         self.request = TestRequest(environ={'HTTP_ACCEPT_LANGUAGE': 'en'})
 
+    def test_converter_empty_value(self):
+        from plone.app.widgets.dx import QueryStringDataConverter
+        converter = QueryStringDataConverter(List(), None)
+        self.assertEqual(converter.toFieldValue(u''), None)
+
     def test_widget(self):
         from plone.app.widgets.dx import QueryStringWidget
         widget = QueryStringWidget(self.request)
diff --git a/travis.cfg b/travis.cfg
index fdac829..3c9c34f 100644
--- a/travis.cfg
+++ b/travis.cfg
@@ -19,3 +19,4 @@ eggs =
 
 [versions]
 coverage = 3.7
+plone.app.robotframework = 0.7.5




-------------------------------------------------------------------------------


More information about the Testbot mailing list