Make topic/collection tests pass when plone.app.collection is installed.

This commit is contained in:
Timo Stollenwerk 2012-04-02 22:00:27 +02:00
parent 4d330f2daa
commit f66d6e1c05
2 changed files with 23 additions and 9 deletions

View File

@ -16,6 +16,9 @@ Changelog
unmigrated comments. unmigrated comments.
[timo] [timo]
- Make topic/collection tests pass when plone.app.collection is installed.
[timo]
2.1.4 (2012-02-29) 2.1.4 (2012-02-29)
------------------ ------------------

View File

@ -308,8 +308,12 @@ List comments in a collection
Create a collection. Create a collection.
>>> from plone.app.testing import setRoles
>>> from plone.app.testing import TEST_USER_NAME
>>> setRoles(portal, 'manager', ['Manager'])
>>> browser.open(portal.absolute_url()) >>> browser.open(portal.absolute_url())
>>> browser.getLink(url='createObject?type_name=Topic').click() >>> from plone.app.discussion.testing import COLLECTION_TYPE
>>> browser.getLink(url='createObject?type_name=' + COLLECTION_TYPE).click()
>>> browser.getControl('Title', index=0 >>> browser.getControl('Title', index=0
... ).value = 'Foo Comment Collection' ... ).value = 'Foo Comment Collection'
>>> browser.getControl('Save').click() >>> browser.getControl('Save').click()
@ -319,15 +323,22 @@ Create a collection.
Set the collection criteria. Set the collection criteria.
>>> browser.getLink('Criteria').click() >>> browser.open(topic_url + "/edit")
>>> browser.getControl('Item Type', index=0).selected = True
>>> browser.getControl('Select content types').selected = True
>>> browser.getControl('Add criteria').click()
>>> print browser.contents
<...Added criterion ATPortalTypeCriterion for field Type...
>>> browser.getControl('Comment').selected = True >>> if COLLECTION_TYPE == "Collection":
>>> browser.getControl('Save', index=0).click() ... browser.getControl(name="addindex").value = ['portal_type']
... browser.getControl(name="form.button.addcriteria").click()
... browser.getControl(name="addoperator").value = ['plone.app.querystring.operation.selection.is']
... browser.getControl(name="form.button.addcriteria").click()
... browser.getControl(name="query.v:records:list").value = ["Discussion Item"]
... browser.getControl(name="form.button.save").click()
... else:
... browser.getLink('Criteria').click()
... browser.getControl('Item Type', index=0).selected = True
... browser.getControl('Select content types').selected = True
... browser.getControl('Add criteria').click()
... browser.getControl('Comment').selected = True
... browser.getControl('Save', index=0).click()
>>> print browser.contents >>> print browser.contents
<...Changes saved... <...Changes saved...