[Testbot] Plone 5.0 - Python 2.7 - Build # 1527 - Still failing! - 6 failure(s)
jenkins at plone.org
jenkins at plone.org
Thu Feb 13 12:54:20 UTC 2014
-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 1527 - Still Failing!
-------------------------------------------------------------------------------
http://jenkins.plone.org/job/plone-5.0-python-2.7/1527/
-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------
Repository: plone.app.widgets
Branch: refs/heads/master
Date: 2014-02-13T02:51:34-08:00
Author: Jure Cerjak (jcerjak) <jcerjak at termitnjak.si>
Commit: https://github.com/plone/plone.app.widgets/commit/327beb685ff23f37c7bd05b20cada1832e07d247
Fix RichTextWidget tests for Plone 4.3.
Files changed:
M .travis.yml
M plone/app/widgets/at.py
M plone/app/widgets/dx.py
M plone/app/widgets/tests/test_dx.py
M travis.cfg
M versions.cfg
diff --git a/.travis.yml b/.travis.yml
index d5dc662..89e7b97 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,8 @@ addons:
- access_key: $SAUCE_ACCESS_KEY
install:
- mkdir -p buildout-cache/downloads
+ - mkdir src
+ - git clone git://github.com/plone/plone.app.contenttypes.git -b mockup-issue-220 src/plone.app.contenttypes
- python bootstrap.py -c travis.cfg
- bin/buildout -N -t 3 -c travis.cfg
script:
@@ -38,8 +40,12 @@ env:
- ROBOT_REMOTE_URL=http://$SAUCE_USERNAME:$SAUCE_ACCESS_KEY@ondemand.saucelabs.com:80/wd/hub
matrix:
allow_failures:
+ - env: BROWSER="platform:OS X 10.8,browserName:iphone,version:6.1,device-orientation:portrait"
+ - env: BROWSER="platform:OS X 10.8,browserName:ipad,version:6.1,device-orientation:portrait"
- env: BROWSER="platform:Linux,browserName:android,version:4.0,device-type:tablet,device-orientation:portrait"
- env: BROWSER="platform:Windows 8.1,browserName:internet explorer,version:11"
- env: BROWSER="platform:Windows 7,browserName:internet explorer,version:10"
- env: BROWSER="platform:Windows 7,browserName:internet explorer,version:9"
- env: BROWSER="platform:Windows 7,browserName:internet explorer,version:8"
+ - env: BROWSER="platform:Windows 7,browserName:opera,version:12"
+ - env: BROWSER="platform:OS X 10.8,browserName:safari,version:6"
diff --git a/plone/app/widgets/at.py b/plone/app/widgets/at.py
index 41cc817..8f67f0a 100644
--- a/plone/app/widgets/at.py
+++ b/plone/app/widgets/at.py
@@ -569,7 +569,7 @@ def _base_args(self, context, field, request):
args.setdefault('pattern_options', {})
merged = dict_merge(get_tinymce_options(context, field, request),
args['pattern_options'])
- args['pattern_options'] = merged
+ args['pattern_options'] = merged['pattern_options']
return args
diff --git a/plone/app/widgets/dx.py b/plone/app/widgets/dx.py
index 71afa80..86dd9f2 100644
--- a/plone/app/widgets/dx.py
+++ b/plone/app/widgets/dx.py
@@ -6,9 +6,9 @@
from datetime import datetime
from plone.app.textfield.widget import IRichTextWidget \
- as patextfield_IRichTextWidget
+ as patextfield_IRichTextWidget
from plone.app.textfield.widget import RichTextWidget \
- as patextfield_RichTextWidget
+ as patextfield_RichTextWidget
from plone.app.textfield.value import RichTextValue
from plone.app.widgets.base import InputWidget
from plone.app.widgets.base import SelectWidget as BaseSelectWidget
@@ -67,7 +67,7 @@
try:
from plone.app.contenttypes.behaviors.collection import ICollection as IDXCollection # noqa
- from plone.app.contenttypes.behaviors.richtext import IRichText # noqa
+ from plone.app.contenttypes.behaviors.richtext import IRichText # noqa
HAS_PAC = True
except ImportError:
HAS_PAC = False
@@ -727,14 +727,13 @@ def _base_args(self):
charset = properties.site_properties.getProperty('default_charset',
'utf-8')
value = self.value and self.value.raw or u''
- args['value'] = (self.request.get(self.field.getName(),
- value)
- ).decode(charset)
+ args['value'] = (self.request.get(
+ self.field.getName(), value)).decode(charset)
args.setdefault('pattern_options', {})
- merged = dict_merge(get_tinymce_options(self.context, self.field, self.request),
+ merged = dict_merge(get_tinymce_options(self.context, self.field, self.request), # noqa
args['pattern_options'])
- args['pattern_options'] = merged
+ args['pattern_options'] = merged['pattern_options']
return args
@@ -779,7 +778,6 @@ def RelatedItemsFieldWidget(field, request):
def QueryStringFieldWidget(field, request):
return FieldWidget(field, QueryStringWidget(request))
-
@adapter(getSpecification(IRichText['text']), IFormLayer)
@implementer(IFieldWidget)
def RichTextFieldWidget(field, request):
diff --git a/plone/app/widgets/tests/test_dx.py b/plone/app/widgets/tests/test_dx.py
index 2d79333..c3b40e9 100644
--- a/plone/app/widgets/tests/test_dx.py
+++ b/plone/app/widgets/tests/test_dx.py
@@ -914,6 +914,8 @@ def test_widget_params(self):
from plone.app.widgets.dx import RichTextWidget
widget = FieldWidget(self.field, RichTextWidget(self.request))
+ # set the context so we can get tinymce settings
+ widget.context = self.portal
widget.update()
base_args = widget._base_args()
self.assertEqual(base_args['name'], 'text')
diff --git a/travis.cfg b/travis.cfg
index 3c9c34f..339bc3e 100644
--- a/travis.cfg
+++ b/travis.cfg
@@ -10,6 +10,8 @@ package-extras = [test,archetypes,dexterity]
test-eggs = Pillow
parts += extra
+develop += src/plone.app.contenttypes
+
[extra]
recipe = zc.recipe.egg
eggs =
@@ -20,3 +22,4 @@ eggs =
[versions]
coverage = 3.7
plone.app.robotframework = 0.7.5
+plone.app.contenttypes =
\ No newline at end of file
diff --git a/versions.cfg b/versions.cfg
index 0c22b77..fb42498 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -11,3 +11,19 @@ plone.app.querystring = 1.1.0
plone.app.vocabularies = 2.1.12
plone.formwidget.querystring = 1.1.0
plone.formwidget.recurrence = 1.1
+
+# versions copied from https://github.com/plone/buildout.coredev/blob/5.0/versions.cfg#L39
+plone.app.robotframework = 0.7.5
+plone.app.testing = 4.2.4
+robotframework = 2.8.4
+robotframework-selenium2library = 1.5.0
+robotsuite = 1.4.3
+selenium = 2.39.0
+collective.xmltestreport = 1.3.1
+mock = 1.0.1
+zope.testrunner = 4.1.1
+pep8 = 1.4.6
+Babel = 1.3
+robotframework-selenium2screenshots = 0.4.0
+sphinxcontrib-robotframework = 0.4.3
+Pygments = 1.6
\ No newline at end of file
Repository: plone.app.widgets
Branch: refs/heads/master
Date: 2014-02-13T04:46:33-08:00
Author: Rok Garbas (garbas) <rok at garbas.si>
Commit: https://github.com/plone/plone.app.widgets/commit/93dc0d348a28cf5553430ed6c190788658aa63ce
Merge pull request #55 from plone/fix-richtextwidget-tests
Fix RichTextWidget tests for Plone 4.3.
Files changed:
M .travis.yml
M plone/app/widgets/at.py
M plone/app/widgets/dx.py
M plone/app/widgets/tests/test_dx.py
M travis.cfg
M versions.cfg
diff --git a/.travis.yml b/.travis.yml
index d5dc662..89e7b97 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,8 @@ addons:
- access_key: $SAUCE_ACCESS_KEY
install:
- mkdir -p buildout-cache/downloads
+ - mkdir src
+ - git clone git://github.com/plone/plone.app.contenttypes.git -b mockup-issue-220 src/plone.app.contenttypes
- python bootstrap.py -c travis.cfg
- bin/buildout -N -t 3 -c travis.cfg
script:
@@ -38,8 +40,12 @@ env:
- ROBOT_REMOTE_URL=http://$SAUCE_USERNAME:$SAUCE_ACCESS_KEY@ondemand.saucelabs.com:80/wd/hub
matrix:
allow_failures:
+ - env: BROWSER="platform:OS X 10.8,browserName:iphone,version:6.1,device-orientation:portrait"
+ - env: BROWSER="platform:OS X 10.8,browserName:ipad,version:6.1,device-orientation:portrait"
- env: BROWSER="platform:Linux,browserName:android,version:4.0,device-type:tablet,device-orientation:portrait"
- env: BROWSER="platform:Windows 8.1,browserName:internet explorer,version:11"
- env: BROWSER="platform:Windows 7,browserName:internet explorer,version:10"
- env: BROWSER="platform:Windows 7,browserName:internet explorer,version:9"
- env: BROWSER="platform:Windows 7,browserName:internet explorer,version:8"
+ - env: BROWSER="platform:Windows 7,browserName:opera,version:12"
+ - env: BROWSER="platform:OS X 10.8,browserName:safari,version:6"
diff --git a/plone/app/widgets/at.py b/plone/app/widgets/at.py
index 41cc817..8f67f0a 100644
--- a/plone/app/widgets/at.py
+++ b/plone/app/widgets/at.py
@@ -569,7 +569,7 @@ def _base_args(self, context, field, request):
args.setdefault('pattern_options', {})
merged = dict_merge(get_tinymce_options(context, field, request),
args['pattern_options'])
- args['pattern_options'] = merged
+ args['pattern_options'] = merged['pattern_options']
return args
diff --git a/plone/app/widgets/dx.py b/plone/app/widgets/dx.py
index 71afa80..86dd9f2 100644
--- a/plone/app/widgets/dx.py
+++ b/plone/app/widgets/dx.py
@@ -6,9 +6,9 @@
from datetime import datetime
from plone.app.textfield.widget import IRichTextWidget \
- as patextfield_IRichTextWidget
+ as patextfield_IRichTextWidget
from plone.app.textfield.widget import RichTextWidget \
- as patextfield_RichTextWidget
+ as patextfield_RichTextWidget
from plone.app.textfield.value import RichTextValue
from plone.app.widgets.base import InputWidget
from plone.app.widgets.base import SelectWidget as BaseSelectWidget
@@ -67,7 +67,7 @@
try:
from plone.app.contenttypes.behaviors.collection import ICollection as IDXCollection # noqa
- from plone.app.contenttypes.behaviors.richtext import IRichText # noqa
+ from plone.app.contenttypes.behaviors.richtext import IRichText # noqa
HAS_PAC = True
except ImportError:
HAS_PAC = False
@@ -727,14 +727,13 @@ def _base_args(self):
charset = properties.site_properties.getProperty('default_charset',
'utf-8')
value = self.value and self.value.raw or u''
- args['value'] = (self.request.get(self.field.getName(),
- value)
- ).decode(charset)
+ args['value'] = (self.request.get(
+ self.field.getName(), value)).decode(charset)
args.setdefault('pattern_options', {})
- merged = dict_merge(get_tinymce_options(self.context, self.field, self.request),
+ merged = dict_merge(get_tinymce_options(self.context, self.field, self.request), # noqa
args['pattern_options'])
- args['pattern_options'] = merged
+ args['pattern_options'] = merged['pattern_options']
return args
@@ -779,7 +778,6 @@ def RelatedItemsFieldWidget(field, request):
def QueryStringFieldWidget(field, request):
return FieldWidget(field, QueryStringWidget(request))
-
@adapter(getSpecification(IRichText['text']), IFormLayer)
@implementer(IFieldWidget)
def RichTextFieldWidget(field, request):
diff --git a/plone/app/widgets/tests/test_dx.py b/plone/app/widgets/tests/test_dx.py
index 2d79333..c3b40e9 100644
--- a/plone/app/widgets/tests/test_dx.py
+++ b/plone/app/widgets/tests/test_dx.py
@@ -914,6 +914,8 @@ def test_widget_params(self):
from plone.app.widgets.dx import RichTextWidget
widget = FieldWidget(self.field, RichTextWidget(self.request))
+ # set the context so we can get tinymce settings
+ widget.context = self.portal
widget.update()
base_args = widget._base_args()
self.assertEqual(base_args['name'], 'text')
diff --git a/travis.cfg b/travis.cfg
index 3c9c34f..339bc3e 100644
--- a/travis.cfg
+++ b/travis.cfg
@@ -10,6 +10,8 @@ package-extras = [test,archetypes,dexterity]
test-eggs = Pillow
parts += extra
+develop += src/plone.app.contenttypes
+
[extra]
recipe = zc.recipe.egg
eggs =
@@ -20,3 +22,4 @@ eggs =
[versions]
coverage = 3.7
plone.app.robotframework = 0.7.5
+plone.app.contenttypes =
\ No newline at end of file
diff --git a/versions.cfg b/versions.cfg
index 0c22b77..fb42498 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -11,3 +11,19 @@ plone.app.querystring = 1.1.0
plone.app.vocabularies = 2.1.12
plone.formwidget.querystring = 1.1.0
plone.formwidget.recurrence = 1.1
+
+# versions copied from https://github.com/plone/buildout.coredev/blob/5.0/versions.cfg#L39
+plone.app.robotframework = 0.7.5
+plone.app.testing = 4.2.4
+robotframework = 2.8.4
+robotframework-selenium2library = 1.5.0
+robotsuite = 1.4.3
+selenium = 2.39.0
+collective.xmltestreport = 1.3.1
+mock = 1.0.1
+zope.testrunner = 4.1.1
+pep8 = 1.4.6
+Babel = 1.3
+robotframework-selenium2screenshots = 0.4.0
+sphinxcontrib-robotframework = 0.4.3
+Pygments = 1.6
\ No newline at end of file
-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 12658 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140213/3748d535/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 393693 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140213/3748d535/attachment-0003.obj>
More information about the Testbot
mailing list