-
-
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.
[fc] Repository: plone.app.robotframework
Branch: refs/heads/master Date: 2016-07-05T14:38:36+02:00 Author: Maurits van Rees (mauritsvanrees) <[email protected]> Commit: plone/plone.app.robotframework@1b23806 Replaced deprecated `Fail Unless Equal` with `Should Be Equal` in test. Files changed: M CHANGES.rst M src/plone/app/robotframework/tests/test_content_library.robot Repository: plone.app.robotframework Branch: refs/heads/master Date: 2016-07-05T14:40:58+02:00 Author: Maurits van Rees (mauritsvanrees) <[email protected]> Commit: plone/plone.app.robotframework@22ca0ba Update robotframework to 3.0, s2screenshots to 0.7.0. Those versions are used in coredev 4.3 and higher. Files changed: M CHANGES.rst M versions-staging.cfg M versions.cfg Repository: plone.app.robotframework Branch: refs/heads/master Date: 2016-07-05T17:02:10+02:00 Author: Maurits van Rees (mauritsvanrees) <[email protected]> Commit: plone/plone.app.robotframework@eee6db1 Merge pull request #60 from plone/robotframework-3 Test with robotframework 3 Files changed: M CHANGES.rst M src/plone/app/robotframework/tests/test_content_library.robot M versions-staging.cfg M versions.cfg
- Loading branch information
1 parent
10b8de4
commit 2efd6a0
Showing
1 changed file
with
187 additions
and
23 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,31 +1,195 @@ | ||
| Repository: plone.app.contentlisting | ||
| Repository: plone.app.robotframework | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2016-07-05T12:17:23+02:00 | ||
| Author: Jens W. Klein (jensens) <[email protected]> | ||
| Commit: https://github.com/plone/plone.app.contentlisting/commit/0f55a56c2f4861eacc991ae0e23afcbc1c9d885a | ||
| Date: 2016-07-05T14:38:36+02:00 | ||
| Author: Maurits van Rees (mauritsvanrees) <[email protected]> | ||
| Commit: https://github.com/plone/plone.app.robotframework/commit/1b2380636e519979f36bc49c56d9928e5719b331 | ||
|
|
||
| RichText values have no size | ||
| Replaced deprecated `Fail Unless Equal` with `Should Be Equal` in test. | ||
|
|
||
| Files changed: | ||
| M plone/app/contentlisting/realobject.py | ||
|
|
||
| diff --git a/plone/app/contentlisting/realobject.py b/plone/app/contentlisting/realobject.py | ||
| index b71cea7..78857ff 100644 | ||
| --- a/plone/app/contentlisting/realobject.py | ||
| +++ b/plone/app/contentlisting/realobject.py | ||
| @@ -70,7 +70,10 @@ def getSize(self): | ||
| primary_field_info = IPrimaryFieldInfo(obj) | ||
| if primary_field_info is None or not primary_field_info.value: | ||
| return 0 | ||
| - return obj.getObjSize(None, primary_field_info.value.size) | ||
| + return obj.getObjSize( | ||
| + None, | ||
| + getattr(primary_field_info.value, 'size', 0) | ||
| + ) | ||
|
|
||
| def review_state(self): | ||
| obj = self.getObject() | ||
| M CHANGES.rst | ||
| M src/plone/app/robotframework/tests/test_content_library.robot | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index 9563427..868bcae 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -25,7 +25,8 @@ New features: | ||
|
|
||
| Bug fixes: | ||
|
|
||
| -- *add item here* | ||
| +- Replaced deprecated ``Fail Unless Equal`` with ``Should Be Equal`` | ||
| + in test. [maurits] | ||
|
|
||
|
|
||
| 0.9.16 (2016-06-07) | ||
| diff --git a/src/plone/app/robotframework/tests/test_content_library.robot b/src/plone/app/robotframework/tests/test_content_library.robot | ||
| index 92706f9..bd783d7 100644 | ||
| --- a/src/plone/app/robotframework/tests/test_content_library.robot | ||
| +++ b/src/plone/app/robotframework/tests/test_content_library.robot | ||
| @@ -49,7 +49,7 @@ Test path to uid resolving | ||
| ${uid} = Create content type=Document id=example-document | ||
| ... title=Example document | ||
| ${result_uid} = Path to UID /plone/example-document | ||
| - Fail unless equal ${uid} ${result_uid} | ||
| + Should Be Equal ${uid} ${result_uid} | ||
|
|
||
| Test fire transition | ||
| Enable autologin as Contributor Reviewer | ||
|
|
||
|
|
||
| Repository: plone.app.robotframework | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2016-07-05T14:40:58+02:00 | ||
| Author: Maurits van Rees (mauritsvanrees) <[email protected]> | ||
| Commit: https://github.com/plone/plone.app.robotframework/commit/22ca0ba4d32a14eef625289b2620b83a2e1f179c | ||
|
|
||
| Update robotframework to 3.0, s2screenshots to 0.7.0. | ||
|
|
||
| Those versions are used in coredev 4.3 and higher. | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M versions-staging.cfg | ||
| M versions.cfg | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index 868bcae..8f38c3c 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -10,6 +10,8 @@ Breaking changes: | ||
|
|
||
| New features: | ||
|
|
||
| +- Test with robotframework version 3.0. [maurits] | ||
| + | ||
| - Do not use ``run_on_failure`` from ``Selenium2Library``. This | ||
| interferes with ``Wait until keyword succeeds``: an initial failure | ||
| is seen as total failure instead of checking the retries of this | ||
| diff --git a/versions-staging.cfg b/versions-staging.cfg | ||
| index 3edfd54..ac59316 100644 | ||
| --- a/versions-staging.cfg | ||
| +++ b/versions-staging.cfg | ||
| @@ -2,9 +2,9 @@ | ||
| [versions] | ||
| Pygments = 2.0.2 | ||
| plone.app.robotframework = 0.9.16 | ||
| -robotframework = 2.9.2 | ||
| +robotframework = 3.0 | ||
| robotframework-selenium2library = 1.7.4 | ||
| -robotframework-selenium2screenshots = 0.6.0 | ||
| +robotframework-selenium2screenshots = 0.7.0 | ||
| robotsuite = 1.7.0 | ||
| selenium = 2.53.6 | ||
| sphinxcontrib-robotframework = 0.5.1 | ||
| diff --git a/versions.cfg b/versions.cfg | ||
| index 3edfd54..ac59316 100644 | ||
| --- a/versions.cfg | ||
| +++ b/versions.cfg | ||
| @@ -2,9 +2,9 @@ | ||
| [versions] | ||
| Pygments = 2.0.2 | ||
| plone.app.robotframework = 0.9.16 | ||
| -robotframework = 2.9.2 | ||
| +robotframework = 3.0 | ||
| robotframework-selenium2library = 1.7.4 | ||
| -robotframework-selenium2screenshots = 0.6.0 | ||
| +robotframework-selenium2screenshots = 0.7.0 | ||
| robotsuite = 1.7.0 | ||
| selenium = 2.53.6 | ||
| sphinxcontrib-robotframework = 0.5.1 | ||
|
|
||
|
|
||
| Repository: plone.app.robotframework | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2016-07-05T17:02:10+02:00 | ||
| Author: Maurits van Rees (mauritsvanrees) <[email protected]> | ||
| Commit: https://github.com/plone/plone.app.robotframework/commit/eee6db1d70b0dd7f17c5d32e64de77dd6bad81a5 | ||
|
|
||
| Merge pull request #60 from plone/robotframework-3 | ||
|
|
||
| Test with robotframework 3 | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M src/plone/app/robotframework/tests/test_content_library.robot | ||
| M versions-staging.cfg | ||
| M versions.cfg | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index 9563427..8f38c3c 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -10,6 +10,8 @@ Breaking changes: | ||
|
|
||
| New features: | ||
|
|
||
| +- Test with robotframework version 3.0. [maurits] | ||
| + | ||
| - Do not use ``run_on_failure`` from ``Selenium2Library``. This | ||
| interferes with ``Wait until keyword succeeds``: an initial failure | ||
| is seen as total failure instead of checking the retries of this | ||
| @@ -25,7 +27,8 @@ New features: | ||
|
|
||
| Bug fixes: | ||
|
|
||
| -- *add item here* | ||
| +- Replaced deprecated ``Fail Unless Equal`` with ``Should Be Equal`` | ||
| + in test. [maurits] | ||
|
|
||
|
|
||
| 0.9.16 (2016-06-07) | ||
| diff --git a/src/plone/app/robotframework/tests/test_content_library.robot b/src/plone/app/robotframework/tests/test_content_library.robot | ||
| index 92706f9..bd783d7 100644 | ||
| --- a/src/plone/app/robotframework/tests/test_content_library.robot | ||
| +++ b/src/plone/app/robotframework/tests/test_content_library.robot | ||
| @@ -49,7 +49,7 @@ Test path to uid resolving | ||
| ${uid} = Create content type=Document id=example-document | ||
| ... title=Example document | ||
| ${result_uid} = Path to UID /plone/example-document | ||
| - Fail unless equal ${uid} ${result_uid} | ||
| + Should Be Equal ${uid} ${result_uid} | ||
|
|
||
| Test fire transition | ||
| Enable autologin as Contributor Reviewer | ||
| diff --git a/versions-staging.cfg b/versions-staging.cfg | ||
| index 3edfd54..ac59316 100644 | ||
| --- a/versions-staging.cfg | ||
| +++ b/versions-staging.cfg | ||
| @@ -2,9 +2,9 @@ | ||
| [versions] | ||
| Pygments = 2.0.2 | ||
| plone.app.robotframework = 0.9.16 | ||
| -robotframework = 2.9.2 | ||
| +robotframework = 3.0 | ||
| robotframework-selenium2library = 1.7.4 | ||
| -robotframework-selenium2screenshots = 0.6.0 | ||
| +robotframework-selenium2screenshots = 0.7.0 | ||
| robotsuite = 1.7.0 | ||
| selenium = 2.53.6 | ||
| sphinxcontrib-robotframework = 0.5.1 | ||
| diff --git a/versions.cfg b/versions.cfg | ||
| index 3edfd54..ac59316 100644 | ||
| --- a/versions.cfg | ||
| +++ b/versions.cfg | ||
| @@ -2,9 +2,9 @@ | ||
| [versions] | ||
| Pygments = 2.0.2 | ||
| plone.app.robotframework = 0.9.16 | ||
| -robotframework = 2.9.2 | ||
| +robotframework = 3.0 | ||
| robotframework-selenium2library = 1.7.4 | ||
| -robotframework-selenium2screenshots = 0.6.0 | ||
| +robotframework-selenium2screenshots = 0.7.0 | ||
| robotsuite = 1.7.0 | ||
| selenium = 2.53.6 | ||
| sphinxcontrib-robotframework = 0.5.1 | ||
|
|
||
|
|