[Testbot] Plone 5.0 - Python 2.7 - Build # 1578 - Still failing! - 1 failure(s)
jenkins at plone.org
jenkins at plone.org
Fri Feb 14 15:35:49 UTC 2014
-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 1578 - Still Failing!
-------------------------------------------------------------------------------
http://jenkins.plone.org/job/plone-5.0-python-2.7/1578/
-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------
Repository: plone.app.widgets
Branch: refs/heads/master
Date: 2014-02-14T05:51:56-08:00
Author: David Glick (davisagli) <david at glicksoftware.com>
Commit: https://github.com/plone/plone.app.widgets/commit/95f1829be02c5c0ae95bbe5911ae984c34be11fd
make tests work in p5
Files changed:
M plone/app/widgets/dx.py
M plone/app/widgets/tests/robot/common.robot
M plone/app/widgets/tests/test_dx.py
diff --git a/plone/app/widgets/dx.py b/plone/app/widgets/dx.py
index 6cf5d62..c3a3643 100644
--- a/plone/app/widgets/dx.py
+++ b/plone/app/widgets/dx.py
@@ -334,8 +334,8 @@ def toWidgetValue(self, value):
:returns: Query string converted to JSON.
:rtype: string
"""
- if not value is self.field.missing_value:
- return self.field.missing_value
+ if not value:
+ return '[]'
return json.dumps(value)
def toFieldValue(self, value):
@@ -347,9 +347,13 @@ def toFieldValue(self, value):
:returns: Query string.
:rtype: list
"""
+ try:
+ value = json.loads(value)
+ except ValueError:
+ value = None
if not value:
return self.field.missing_value
- return json.loads(value)
+ return value
class BaseWidget(Widget):
diff --git a/plone/app/widgets/tests/robot/common.robot b/plone/app/widgets/tests/robot/common.robot
index 9166f48..483e1f9 100644
--- a/plone/app/widgets/tests/robot/common.robot
+++ b/plone/app/widgets/tests/robot/common.robot
@@ -28,7 +28,7 @@ I save
Wait until page contains Item created
I edit
- Click link Edit
+ Click link css=#contentview-edit a
Wait until page contains Element id=form-buttons-save
# ----------------------------------------------------------------------------
diff --git a/plone/app/widgets/tests/test_dx.py b/plone/app/widgets/tests/test_dx.py
index c8b8747..7eba468 100644
--- a/plone/app/widgets/tests/test_dx.py
+++ b/plone/app/widgets/tests/test_dx.py
@@ -757,10 +757,17 @@ class QueryStringWidgetTests(unittest.TestCase):
def setUp(self):
self.request = TestRequest(environ={'HTTP_ACCEPT_LANGUAGE': 'en'})
+ def test_converter_toWidgetValue(self):
+ from plone.app.widgets.dx import QueryStringDataConverter
+ converter = QueryStringDataConverter(List(), None)
+ self.assertEqual(converter.toWidgetValue(None), u'[]')
+ self.assertEqual(converter.toWidgetValue([]), u'[]')
+
def test_converter_empty_value(self):
from plone.app.widgets.dx import QueryStringDataConverter
converter = QueryStringDataConverter(List(), None)
self.assertEqual(converter.toFieldValue(u''), None)
+ self.assertEqual(converter.toFieldValue(u'[]'), None)
def test_widget(self):
from plone.app.widgets.dx import QueryStringWidget
Repository: plone.app.widgets
Branch: refs/heads/master
Date: 2014-02-14T06:51:16-08:00
Author: Nathan Van Gheem (vangheem) <vangheem at gmail.com>
Commit: https://github.com/plone/plone.app.widgets/commit/061d945bf4a5aeb0b113c63801c73b7c77fa6a41
Merge pull request #57 from plone/davisagli-fix-test
fix date widget test in p5
Files changed:
M plone/app/widgets/dx.py
M plone/app/widgets/tests/robot/common.robot
M plone/app/widgets/tests/test_dx.py
diff --git a/plone/app/widgets/dx.py b/plone/app/widgets/dx.py
index 6cf5d62..c3a3643 100644
--- a/plone/app/widgets/dx.py
+++ b/plone/app/widgets/dx.py
@@ -334,8 +334,8 @@ def toWidgetValue(self, value):
:returns: Query string converted to JSON.
:rtype: string
"""
- if not value is self.field.missing_value:
- return self.field.missing_value
+ if not value:
+ return '[]'
return json.dumps(value)
def toFieldValue(self, value):
@@ -347,9 +347,13 @@ def toFieldValue(self, value):
:returns: Query string.
:rtype: list
"""
+ try:
+ value = json.loads(value)
+ except ValueError:
+ value = None
if not value:
return self.field.missing_value
- return json.loads(value)
+ return value
class BaseWidget(Widget):
diff --git a/plone/app/widgets/tests/robot/common.robot b/plone/app/widgets/tests/robot/common.robot
index 9166f48..483e1f9 100644
--- a/plone/app/widgets/tests/robot/common.robot
+++ b/plone/app/widgets/tests/robot/common.robot
@@ -28,7 +28,7 @@ I save
Wait until page contains Item created
I edit
- Click link Edit
+ Click link css=#contentview-edit a
Wait until page contains Element id=form-buttons-save
# ----------------------------------------------------------------------------
diff --git a/plone/app/widgets/tests/test_dx.py b/plone/app/widgets/tests/test_dx.py
index c8b8747..7eba468 100644
--- a/plone/app/widgets/tests/test_dx.py
+++ b/plone/app/widgets/tests/test_dx.py
@@ -757,10 +757,17 @@ class QueryStringWidgetTests(unittest.TestCase):
def setUp(self):
self.request = TestRequest(environ={'HTTP_ACCEPT_LANGUAGE': 'en'})
+ def test_converter_toWidgetValue(self):
+ from plone.app.widgets.dx import QueryStringDataConverter
+ converter = QueryStringDataConverter(List(), None)
+ self.assertEqual(converter.toWidgetValue(None), u'[]')
+ self.assertEqual(converter.toWidgetValue([]), u'[]')
+
def test_converter_empty_value(self):
from plone.app.widgets.dx import QueryStringDataConverter
converter = QueryStringDataConverter(List(), None)
self.assertEqual(converter.toFieldValue(u''), None)
+ self.assertEqual(converter.toFieldValue(u'[]'), None)
def test_widget(self):
from plone.app.widgets.dx import QueryStringWidget
-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 5744 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140214/c7f151bb/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 138159 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140214/c7f151bb/attachment-0003.obj>
More information about the Testbot
mailing list