-
-
Notifications
You must be signed in to change notification settings - Fork 76
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-09-01T09:40:22+02:00 Author: Stephan Klinger (staeff) <staeff@users.noreply.github.com> Commit: plone/plone.app.robotframework@00fd30d Update url Link has changed Files changed: M docs/source/happy.rst Repository: plone.app.robotframework Branch: refs/heads/master Date: 2016-09-01T09:42:11+02:00 Author: Stephan Klinger (staeff) <staeff@users.noreply.github.com> Commit: plone/plone.app.robotframework@55e1c7e Update CHANGES.rst Files changed: M CHANGES.rst Repository: plone.app.robotframework Branch: refs/heads/master Date: 2016-09-01T11:15:18+02:00 Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com> Commit: plone/plone.app.robotframework@b71fbdb Merge pull request #62 from plone/staeff-patch-1 Update url Files changed: M CHANGES.rst M docs/source/happy.rst
- Loading branch information
Showing
1 changed file
with
82 additions
and
68 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,90 +1,104 @@ | ||
Repository: Products.CMFPlone | ||
Repository: plone.app.robotframework | ||
|
||
|
||
Branch: refs/heads/5.0.x | ||
Date: 2016-09-01T10:16:11+02:00 | ||
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org> | ||
Commit: https://github.com/plone/Products.CMFPlone/commit/9368e1b14446d820cba48fb434fe71f74ea9c65d | ||
Branch: refs/heads/master | ||
Date: 2016-09-01T09:40:22+02:00 | ||
Author: Stephan Klinger (staeff) <staeff@users.noreply.github.com> | ||
Commit: https://github.com/plone/plone.app.robotframework/commit/00fd30d0ea88604f1c9c94b8d42c11a66988ae7d | ||
|
||
Fixed tests in combination with CMFFormController that includes hotfix. | ||
Update url | ||
|
||
This is from PloneHotfix20160830. | ||
Link has changed | ||
|
||
Test in combination with https://github.com/plone/Products.CMFFormController/pull/9 | ||
Files changed: | ||
M docs/source/happy.rst | ||
|
||
diff --git a/docs/source/happy.rst b/docs/source/happy.rst | ||
index 4be4a2f..b802374 100644 | ||
--- a/docs/source/happy.rst | ||
+++ b/docs/source/happy.rst | ||
@@ -322,7 +322,7 @@ The most important ones are:: | ||
- phantomjs | ||
- safari | ||
|
||
-For more information see: http://robotframework.org/Selenium2Library/doc/Selenium2Library.html#Open%20Browser | ||
+For more information see: http://robotframework.org/Selenium2Library/Selenium2Library.html#Open%20Browser | ||
|
||
In case for Google Chrome, do the following: | ||
|
||
|
||
|
||
Repository: plone.app.robotframework | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2016-09-01T09:42:11+02:00 | ||
Author: Stephan Klinger (staeff) <staeff@users.noreply.github.com> | ||
Commit: https://github.com/plone/plone.app.robotframework/commit/55e1c7eb0a12a99fc6f17df8b59e3c399733a95f | ||
|
||
Update CHANGES.rst | ||
|
||
Files changed: | ||
M CHANGES.rst | ||
|
||
diff --git a/CHANGES.rst b/CHANGES.rst | ||
index 653f76d..59d2e32 100644 | ||
--- a/CHANGES.rst | ||
+++ b/CHANGES.rst | ||
@@ -14,7 +14,8 @@ New features: | ||
|
||
Bug fixes: | ||
|
||
-- *add item here* | ||
+- Update outdated link | ||
+ [staeff] | ||
|
||
|
||
1.0 (2016-07-15) | ||
|
||
|
||
Repository: plone.app.robotframework | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2016-09-01T11:15:18+02:00 | ||
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com> | ||
Commit: https://github.com/plone/plone.app.robotframework/commit/b71fbdb55bfc98e0d2326cf2beb508bcfcb5adba | ||
|
||
Merge pull request #62 from plone/staeff-patch-1 | ||
|
||
Update url | ||
|
||
Files changed: | ||
M CHANGES.rst | ||
M Products/CMFPlone/tests/testSSOLogin.py | ||
M Products/CMFPlone/tests/testSecurity.py | ||
M docs/source/happy.rst | ||
|
||
diff --git a/CHANGES.rst b/CHANGES.rst | ||
index 5572190..512897a 100644 | ||
index 653f76d..59d2e32 100644 | ||
--- a/CHANGES.rst | ||
+++ b/CHANGES.rst | ||
@@ -19,6 +19,8 @@ New features: | ||
@@ -14,7 +14,8 @@ New features: | ||
|
||
Bug fixes: | ||
|
||
+- Fixed tests in combination with newer CMFFormController which has the hotfix. [maurits] | ||
+ | ||
- Apply security hotfix 20160830 for ``@@plone-root-login``. [maurits] | ||
-- *add item here* | ||
+- Update outdated link | ||
+ [staeff] | ||
|
||
- Apply security hotfix 20160830 for ``isURLInPortal``. [maurits] | ||
diff --git a/Products/CMFPlone/tests/testSSOLogin.py b/Products/CMFPlone/tests/testSSOLogin.py | ||
index 7ab3692..0e908f9 100644 | ||
--- a/Products/CMFPlone/tests/testSSOLogin.py | ||
+++ b/Products/CMFPlone/tests/testSSOLogin.py | ||
@@ -35,11 +35,19 @@ def afterSetUp(self): | ||
portal.acl_users.portal_role_manager.doAssignRoleToPrincipal( | ||
TEST_USER_ID, role) | ||
|
||
- registry = self.login_portal.portal_registry | ||
- | ||
# Configure the login portal to allow logins from our sites. | ||
- registry['plone.allow_external_login_sites'] = (self.portal.absolute_url(), | ||
- self.another_portal.absolute_url()) | ||
+ login_registry = self.login_portal.portal_registry | ||
+ login_registry['plone.allow_external_login_sites'] = ( | ||
+ self.portal.absolute_url(), | ||
+ self.another_portal.absolute_url()) | ||
+ | ||
+ # The normal portal needs to allow logins from the login portal, | ||
+ # otherwise the redirect_to action on login or logout will refuse to | ||
+ # redirect externally. This may need to be done on another_portal too, | ||
+ # but for the current tests this is not needed. | ||
+ portal_registry = self.portal.portal_registry | ||
+ portal_registry['plone.allow_external_login_sites'] = ( | ||
+ self.login_portal.absolute_url(), ) | ||
1.0 (2016-07-15) | ||
diff --git a/docs/source/happy.rst b/docs/source/happy.rst | ||
index 4be4a2f..b802374 100644 | ||
--- a/docs/source/happy.rst | ||
+++ b/docs/source/happy.rst | ||
@@ -322,7 +322,7 @@ The most important ones are:: | ||
- phantomjs | ||
- safari | ||
|
||
# Configure our sites to use the login portal for logins and logouts | ||
login_portal_url = self.login_portal.absolute_url() | ||
diff --git a/Products/CMFPlone/tests/testSecurity.py b/Products/CMFPlone/tests/testSecurity.py | ||
index e31e15c..853a548 100644 | ||
--- a/Products/CMFPlone/tests/testSecurity.py | ||
+++ b/Products/CMFPlone/tests/testSecurity.py | ||
@@ -154,10 +154,20 @@ def test_atat_does_not_return_anything(self): | ||
self.assertEqual(404, res.status) | ||
-For more information see: http://robotframework.org/Selenium2Library/doc/Selenium2Library.html#Open%20Browser | ||
+For more information see: http://robotframework.org/Selenium2Library/Selenium2Library.html#Open%20Browser | ||
|
||
def test_go_back(self): | ||
- res = self.publish('/plone/front-page/go_back?last_referer=http://${request}', | ||
- basic=SITE_OWNER_NAME + ':' + SITE_OWNER_PASSWORD) | ||
+ res = self.publish( | ||
+ '/plone/front-page/go_back?last_referer=http://${request}', | ||
+ basic=SITE_OWNER_NAME + ':' + SITE_OWNER_PASSWORD) | ||
+ # This used to show the request as location, so something like: | ||
+ # http://<h3>form</h3><table>... and then all kinds of data from the | ||
+ # request. This was fixed in PloneHotfix20121106. For this request | ||
+ # you then got redirected to url http://${request} which your browser | ||
+ # obviously does not know how to handle. | ||
+ # | ||
+ # In PloneHotfix20160830 this fix was kept, but additionally Plone | ||
+ # refuses to redirect to external sites by default. | ||
self.assertEqual(302, res.status) | ||
- self.assertEqual('http://${request}', res.headers['location'][:17]) | ||
+ self.assertEqual(res.headers['location'], | ||
+ self.portal.absolute_url() + '/front-page') | ||
In case for Google Chrome, do the following: | ||
|
||
def test_getFolderContents(self): | ||
res = self.publish('/plone/getFolderContents') | ||
|
||
|