-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Branch: refs/heads/master Date: 2015-11-25T11:40:56+01:00 Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org> Commit: plone/plone.app.event@ea50f6c In tests, use ``selection.any`` in querystrings. Issue plone/Products.CMFPlone#1040 Files changed: M CHANGES.rst M plone/app/event/tests/base_setup.py M plone/app/event/tests/test_event_listing.py Repository: plone.app.event Branch: refs/heads/master Date: 2015-11-25T11:43:34+01:00 Author: Gil Forcada Codinachs (gforcada) <gil.forcada@freitag.de> Commit: plone/plone.app.event@0d6aea4 Merge pull request #207 from plone/cmfplone-issue-1040 In tests, use ``selection.any`` in querystrings. Files changed: M CHANGES.rst M plone/app/event/tests/base_setup.py M plone/app/event/tests/test_event_listing.py
- Loading branch information
Showing
1 changed file
with
115 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,92 +1,156 @@ | ||
| Repository: plone.app.discussion | ||
| Repository: plone.app.event | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2015-11-25T11:40:06+01:00 | ||
| Date: 2015-11-25T11:40:56+01:00 | ||
| Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org> | ||
| Commit: https://github.com/plone/plone.app.discussion/commit/e5d6916c2f2987193f3fc3b5dd96e1d8d0489226 | ||
| Commit: https://github.com/plone/plone.app.event/commit/ea50f6c1d3250f5ee6c99d3a57ca9c8105e78fe8 | ||
|
|
||
| In tests, use ``selection.any`` in querystrings. | ||
|
|
||
| Issue https://github.com/plone/Products.CMFPlone/issues/1040 | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M plone/app/discussion/tests/collection-integration-test.txt | ||
| M plone/app/event/tests/base_setup.py | ||
| M plone/app/event/tests/test_event_listing.py | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index 8cb33dd..00ffd1b 100644 | ||
| index 95fe70d..974a34a 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -13,6 +13,10 @@ Fixes: | ||
| - Update Site Setup link in all control panels (fixes https://github.com/plone/Products.CMFPlone/issues/1255) | ||
| [davilima6] | ||
| @@ -25,6 +25,10 @@ Fixes: | ||
| zc.buildout`` instead. | ||
| [thet] | ||
|
|
||
| +- In tests, use ``selection.any`` in querystrings. | ||
| + Issue https://github.com/plone/Products.CMFPlone/issues/1040 | ||
| + [maurits] | ||
| + | ||
| - Move translations to plone.app.locales | ||
| https://github.com/plone/plone.app.discussion/issues/66 | ||
| [gforcada] | ||
| diff --git a/plone/app/discussion/tests/collection-integration-test.txt b/plone/app/discussion/tests/collection-integration-test.txt | ||
| index 7e42343..62f79be 100644 | ||
| --- a/plone/app/discussion/tests/collection-integration-test.txt | ||
| +++ b/plone/app/discussion/tests/collection-integration-test.txt | ||
| @@ -28,7 +28,7 @@ Set the collection criteria. | ||
| >>> if COLLECTION_TYPE == "Collection": | ||
| ... 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="addoperator").value = ['plone.app.querystring.operation.selection.any'] | ||
| ... browser.getControl(name="form.button.addcriteria").click() | ||
| ... browser.getControl(name="query.v:records:list").value = ["Discussion Item"] | ||
| ... browser.getControl(name="form.button.save").click() | ||
|
|
||
|
|
||
| Repository: plone.app.discussion | ||
|
|
||
| 2.0.4 (2015-10-28) | ||
| ------------------ | ||
| diff --git a/plone/app/event/tests/base_setup.py b/plone/app/event/tests/base_setup.py | ||
| index c70259b..64798b5 100644 | ||
| --- a/plone/app/event/tests/base_setup.py | ||
| +++ b/plone/app/event/tests/base_setup.py | ||
| @@ -143,7 +143,7 @@ def setUp(self): | ||
| collection.reverse_sort = True | ||
| collection.query = [ | ||
| {'i': 'portal_type', | ||
| - 'o': 'plone.app.querystring.operation.selection.is', | ||
| + 'o': 'plone.app.querystring.operation.selection.any', | ||
| 'v': ['Event', 'plone.app.event.dx.event'] | ||
| }, | ||
| ] | ||
| diff --git a/plone/app/event/tests/test_event_listing.py b/plone/app/event/tests/test_event_listing.py | ||
| index c2d92e7..5f3c6b0 100644 | ||
| --- a/plone/app/event/tests/test_event_listing.py | ||
| +++ b/plone/app/event/tests/test_event_listing.py | ||
| @@ -72,7 +72,7 @@ def _collection_batching_base(self): | ||
| collection = self.portal.col_test | ||
| collection.query = [ | ||
| {'i': 'portal_type', | ||
| - 'o': 'plone.app.querystring.operation.selection.is', | ||
| + 'o': 'plone.app.querystring.operation.selection.any', | ||
| 'v': ['Event', 'plone.app.event.dx.event'] | ||
| }, | ||
| ] | ||
| @@ -113,7 +113,7 @@ def test_date_filtering(self): | ||
| collection = self.portal.col_without_date_criterion | ||
| collection.query = [ | ||
| {'i': 'portal_type', | ||
| - 'o': 'plone.app.querystring.operation.selection.is', | ||
| + 'o': 'plone.app.querystring.operation.selection.any', | ||
| 'v': ['Event', 'plone.app.event.dx.event'] | ||
| }, | ||
| ] | ||
| @@ -133,7 +133,7 @@ def test_no_date_filtering(self): | ||
| collection = self.portal.col_with_date_criterion | ||
| collection.query = [ | ||
| {'i': 'portal_type', | ||
| - 'o': 'plone.app.querystring.operation.selection.is', | ||
| + 'o': 'plone.app.querystring.operation.selection.any', | ||
| 'v': ['Event', 'plone.app.event.dx.event'] | ||
| }, | ||
| {'i': 'start', | ||
|
|
||
|
|
||
| Repository: plone.app.event | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2015-11-25T11:42:42+01:00 | ||
| Date: 2015-11-25T11:43:34+01:00 | ||
| Author: Gil Forcada Codinachs (gforcada) <gil.forcada@freitag.de> | ||
| Commit: https://github.com/plone/plone.app.discussion/commit/d73e5cb83a905b4beac28dfca07745ed16fcf2f0 | ||
| Commit: https://github.com/plone/plone.app.event/commit/0d6aea4cccbc7c74080d7c9737ec7397a6e7c772 | ||
|
|
||
| Merge pull request #76 from plone/cmfplone-issue-1040 | ||
| Merge pull request #207 from plone/cmfplone-issue-1040 | ||
|
|
||
| In tests, use ``selection.any`` in querystrings. | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M plone/app/discussion/tests/collection-integration-test.txt | ||
| M plone/app/event/tests/base_setup.py | ||
| M plone/app/event/tests/test_event_listing.py | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index 8cb33dd..00ffd1b 100644 | ||
| index 95fe70d..974a34a 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -13,6 +13,10 @@ Fixes: | ||
| - Update Site Setup link in all control panels (fixes https://github.com/plone/Products.CMFPlone/issues/1255) | ||
| [davilima6] | ||
| @@ -25,6 +25,10 @@ Fixes: | ||
| zc.buildout`` instead. | ||
| [thet] | ||
|
|
||
| +- In tests, use ``selection.any`` in querystrings. | ||
| + Issue https://github.com/plone/Products.CMFPlone/issues/1040 | ||
| + [maurits] | ||
| + | ||
| - Move translations to plone.app.locales | ||
| https://github.com/plone/plone.app.discussion/issues/66 | ||
| [gforcada] | ||
| diff --git a/plone/app/discussion/tests/collection-integration-test.txt b/plone/app/discussion/tests/collection-integration-test.txt | ||
| index 7e42343..62f79be 100644 | ||
| --- a/plone/app/discussion/tests/collection-integration-test.txt | ||
| +++ b/plone/app/discussion/tests/collection-integration-test.txt | ||
| @@ -28,7 +28,7 @@ Set the collection criteria. | ||
| >>> if COLLECTION_TYPE == "Collection": | ||
| ... 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="addoperator").value = ['plone.app.querystring.operation.selection.any'] | ||
| ... browser.getControl(name="form.button.addcriteria").click() | ||
| ... browser.getControl(name="query.v:records:list").value = ["Discussion Item"] | ||
| ... browser.getControl(name="form.button.save").click() | ||
|
|
||
| 2.0.4 (2015-10-28) | ||
| ------------------ | ||
| diff --git a/plone/app/event/tests/base_setup.py b/plone/app/event/tests/base_setup.py | ||
| index c70259b..64798b5 100644 | ||
| --- a/plone/app/event/tests/base_setup.py | ||
| +++ b/plone/app/event/tests/base_setup.py | ||
| @@ -143,7 +143,7 @@ def setUp(self): | ||
| collection.reverse_sort = True | ||
| collection.query = [ | ||
| {'i': 'portal_type', | ||
| - 'o': 'plone.app.querystring.operation.selection.is', | ||
| + 'o': 'plone.app.querystring.operation.selection.any', | ||
| 'v': ['Event', 'plone.app.event.dx.event'] | ||
| }, | ||
| ] | ||
| diff --git a/plone/app/event/tests/test_event_listing.py b/plone/app/event/tests/test_event_listing.py | ||
| index c2d92e7..5f3c6b0 100644 | ||
| --- a/plone/app/event/tests/test_event_listing.py | ||
| +++ b/plone/app/event/tests/test_event_listing.py | ||
| @@ -72,7 +72,7 @@ def _collection_batching_base(self): | ||
| collection = self.portal.col_test | ||
| collection.query = [ | ||
| {'i': 'portal_type', | ||
| - 'o': 'plone.app.querystring.operation.selection.is', | ||
| + 'o': 'plone.app.querystring.operation.selection.any', | ||
| 'v': ['Event', 'plone.app.event.dx.event'] | ||
| }, | ||
| ] | ||
| @@ -113,7 +113,7 @@ def test_date_filtering(self): | ||
| collection = self.portal.col_without_date_criterion | ||
| collection.query = [ | ||
| {'i': 'portal_type', | ||
| - 'o': 'plone.app.querystring.operation.selection.is', | ||
| + 'o': 'plone.app.querystring.operation.selection.any', | ||
| 'v': ['Event', 'plone.app.event.dx.event'] | ||
| }, | ||
| ] | ||
| @@ -133,7 +133,7 @@ def test_no_date_filtering(self): | ||
| collection = self.portal.col_with_date_criterion | ||
| collection.query = [ | ||
| {'i': 'portal_type', | ||
| - 'o': 'plone.app.querystring.operation.selection.is', | ||
| + 'o': 'plone.app.querystring.operation.selection.any', | ||
| 'v': ['Event', 'plone.app.event.dx.event'] | ||
| }, | ||
| {'i': 'start', | ||
|
|
||
|
|