Skip to content

Commit

Permalink
[fc] Repository: Products.PlonePAS
Browse files Browse the repository at this point in the history
Branch: refs/heads/master
Date: 2022-10-06T06:46:42+02:00
Author: David Glick (davisagli) <david@glicksoftware.com>
Commit: plone/Products.PlonePAS@e624ea9

Fix admin password used in tests

Files changed:
M src/Products/PlonePAS/tests/test_setup.py
Repository: Products.PlonePAS

Branch: refs/heads/master
Date: 2022-10-06T06:47:45+02:00
Author: David Glick (davisagli) <david@glicksoftware.com>
Commit: plone/Products.PlonePAS@711659f

changelog

Files changed:
A news/70.bugfix
Repository: Products.PlonePAS

Branch: refs/heads/master
Date: 2022-10-06T09:52:06+02:00
Author: David Glick (davisagli) <david@glicksoftware.com>
Commit: plone/Products.PlonePAS@99982d7

Merge pull request #70 from plone/test-pw

Fix admin password used in tests

Files changed:
A news/70.bugfix
M src/Products/PlonePAS/tests/test_setup.py
  • Loading branch information
davisagli committed Oct 6, 2022
1 parent 07f32b8 commit 9bf437c
Showing 1 changed file with 19 additions and 21 deletions.
40 changes: 19 additions & 21 deletions last_commit.txt
Original file line number Diff line number Diff line change
@@ -1,50 +1,48 @@
Repository: plone.app.users
Repository: Products.PlonePAS


Branch: refs/heads/master
Date: 2022-10-06T09:04:25+02:00
Date: 2022-10-06T06:46:42+02:00
Author: David Glick (davisagli) <david@glicksoftware.com>
Commit: https://github.com/plone/plone.app.users/commit/a7236fc39a8d447d969f236c4400f53cf93d9523
Commit: https://github.com/plone/Products.PlonePAS/commit/e624ea9977925b1218064f3efe85efdc44d668ae

Fix admin password in tests
Fix admin password used in tests

Files changed:
M plone/app/users/tests/registration_forms.rst
M plone/app/users/tests/userdata_prefs_user_details.rst
M src/Products/PlonePAS/tests/test_setup.py

b"diff --git a/plone/app/users/tests/registration_forms.rst b/plone/app/users/tests/registration_forms.rst\nindex d134cee..e891896 100644\n--- a/plone/app/users/tests/registration_forms.rst\n+++ b/plone/app/users/tests/registration_forms.rst\n@@ -302,7 +302,7 @@ Testing the flexible user registration\n >>> unsetMailHost()\n >>> browser.open('http://nohost/plone/login_form')\n >>> browser.getControl('Login Name').value = 'admin'\n- >>> browser.getControl('Password').value = TEST_USER_PASSWORD\n+ >>> browser.getControl('Password').value = SITE_OWNER_PASSWORD\n >>> browser.getControl('Log in').click()\n >>> browser.open('http://nohost/plone/@@security-controlpanel')\n >>> browser.getControl('Let users select their own passwords').selected = True\n@@ -358,7 +358,7 @@ Testing the flexible user registration\n Ensure that the user has, in fact, been added.\n >>> browser.open('http://nohost/plone/login_form')\n >>> browser.getControl('Login Name').value = 'admin'\n- >>> browser.getControl('Password').value = TEST_USER_PASSWORD\n+ >>> browser.getControl('Password').value = SITE_OWNER_PASSWORD\n >>> browser.getControl('Log in').click()\n >>> browser.open('http://nohost/plone/@@usergroup-userprefs')\n >>> 'user5pas' in browser.contents\n@@ -409,7 +409,7 @@ Testing the flexible user registration\n Ensure that the user has, in fact, been added.\n >>> browser.open('http://nohost/plone/login_form')\n >>> browser.getControl('Login Name').value = 'admin'\n- >>> browser.getControl('Password').value = TEST_USER_PASSWORD\n+ >>> browser.getControl('Password').value = SITE_OWNER_PASSWORD\n >>> browser.getControl('Log in').click()\n >>> browser.open('http://nohost/plone/@@usergroup-userprefs')\n >>> 'user6pas' in browser.contents\ndiff --git a/plone/app/users/tests/userdata_prefs_user_details.rst b/plone/app/users/tests/userdata_prefs_user_details.rst\nindex 2696b92..dcc7e45 100644\n--- a/plone/app/users/tests/userdata_prefs_user_details.rst\n+++ b/plone/app/users/tests/userdata_prefs_user_details.rst\n@@ -4,9 +4,9 @@ Admin modifies user information thru 'Users and groups'\n Set Up\n ======\n \n+ >>> from plone.app.testing import SITE_OWNER_PASSWORD\n >>> from plone.app.testing import TEST_USER_ID\n >>> from plone.app.testing import TEST_USER_NAME\n- >>> from plone.app.testing import TEST_USER_PASSWORD\n >>> from plone.testing.z2 import Browser\n \n >>> import transaction\n@@ -26,7 +26,7 @@ So let's login as Plone admin:\n >>> browser.open('http://nohost/plone/')\n >>> browser.getLink('Log in').click()\n >>> browser.getControl('Login Name').value = 'admin'\n- >>> browser.getControl('Password').value = TEST_USER_PASSWORD\n+ >>> browser.getControl('Password').value = SITE_OWNER_PASSWORD\n >>> browser.getControl('Log in').click()\n \n Let's see if we can navigate to the user information form in Users\n"
b'diff --git a/src/Products/PlonePAS/tests/test_setup.py b/src/Products/PlonePAS/tests/test_setup.py\nindex b4bd24a7..c8085927 100644\n--- a/src/Products/PlonePAS/tests/test_setup.py\n+++ b/src/Products/PlonePAS/tests/test_setup.py\n@@ -116,7 +116,7 @@ def test_zope_root_cookie_login(self):\n hooks.setSite(None)\n zope.login(self.root_acl_users, pa_testing.SITE_OWNER_NAME)\n self.app.REQUEST.form["__ac_name"] = pa_testing.SITE_OWNER_NAME\n- self.app.REQUEST.form["__ac_password"] = pa_testing.TEST_USER_PASSWORD\n+ self.app.REQUEST.form["__ac_password"] = pa_testing.SITE_OWNER_PASSWORD\n cookie_plugin.login()\n \n # Submit the login form in the browser\n@@ -124,7 +124,7 @@ def test_zope_root_cookie_login(self):\n login_form.getControl(name="__ac_name").value = pa_testing.SITE_OWNER_NAME\n login_form.getControl(\n name="__ac_password"\n- ).value = pa_testing.TEST_USER_PASSWORD\n+ ).value = pa_testing.SITE_OWNER_PASSWORD\n login_form.controls[-1].click()\n self.assertEqual(\n browser.headers["Status"].lower(),\n'

Repository: plone.app.users
Repository: Products.PlonePAS


Branch: refs/heads/master
Date: 2022-10-06T09:05:36+02:00
Date: 2022-10-06T06:47:45+02:00
Author: David Glick (davisagli) <david@glicksoftware.com>
Commit: https://github.com/plone/plone.app.users/commit/6d0548e050e03665e15e5c96ad5cd240d9472930
Commit: https://github.com/plone/Products.PlonePAS/commit/711659f2dbeb55bd1503f1f3aef0451e13c8a39c

changelog

Files changed:
A news/113.bugfix
A news/70.bugfix

b'diff --git a/news/113.bugfix b/news/113.bugfix\nnew file mode 100644\nindex 00000000..f0b24986\n--- /dev/null\n+++ b/news/113.bugfix\n@@ -0,0 +1 @@\n+- Fix admin password in tests. [davisagli]\n'
b'diff --git a/news/70.bugfix b/news/70.bugfix\nnew file mode 100644\nindex 00000000..93725d7f\n--- /dev/null\n+++ b/news/70.bugfix\n@@ -0,0 +1 @@\n+- Fix admin password used in tests. [davisagli]\n'

Repository: plone.app.users
Repository: Products.PlonePAS


Branch: refs/heads/master
Date: 2022-10-06T09:51:55+02:00
Date: 2022-10-06T09:52:06+02:00
Author: David Glick (davisagli) <david@glicksoftware.com>
Commit: https://github.com/plone/plone.app.users/commit/34ce3a8c589da4cd349b312387610e9052a101f2
Commit: https://github.com/plone/Products.PlonePAS/commit/99982d7722dd0c8287fd002f73a7f99234a7173e

Merge pull request #113 from plone/test-pw
Merge pull request #70 from plone/test-pw

Fix admin password in tests
Fix admin password used in tests

Files changed:
A news/113.bugfix
M plone/app/users/tests/registration_forms.rst
M plone/app/users/tests/userdata_prefs_user_details.rst
A news/70.bugfix
M src/Products/PlonePAS/tests/test_setup.py

b"diff --git a/news/113.bugfix b/news/113.bugfix\nnew file mode 100644\nindex 00000000..f0b24986\n--- /dev/null\n+++ b/news/113.bugfix\n@@ -0,0 +1 @@\n+- Fix admin password in tests. [davisagli]\ndiff --git a/plone/app/users/tests/registration_forms.rst b/plone/app/users/tests/registration_forms.rst\nindex d134cee5..e8918964 100644\n--- a/plone/app/users/tests/registration_forms.rst\n+++ b/plone/app/users/tests/registration_forms.rst\n@@ -302,7 +302,7 @@ Testing the flexible user registration\n >>> unsetMailHost()\n >>> browser.open('http://nohost/plone/login_form')\n >>> browser.getControl('Login Name').value = 'admin'\n- >>> browser.getControl('Password').value = TEST_USER_PASSWORD\n+ >>> browser.getControl('Password').value = SITE_OWNER_PASSWORD\n >>> browser.getControl('Log in').click()\n >>> browser.open('http://nohost/plone/@@security-controlpanel')\n >>> browser.getControl('Let users select their own passwords').selected = True\n@@ -358,7 +358,7 @@ Testing the flexible user registration\n Ensure that the user has, in fact, been added.\n >>> browser.open('http://nohost/plone/login_form')\n >>> browser.getControl('Login Name').value = 'admin'\n- >>> browser.getControl('Password').value = TEST_USER_PASSWORD\n+ >>> browser.getControl('Password').value = SITE_OWNER_PASSWORD\n >>> browser.getControl('Log in').click()\n >>> browser.open('http://nohost/plone/@@usergroup-userprefs')\n >>> 'user5pas' in browser.contents\n@@ -409,7 +409,7 @@ Testing the flexible user registration\n Ensure that the user has, in fact, been added.\n >>> browser.open('http://nohost/plone/login_form')\n >>> browser.getControl('Login Name').value = 'admin'\n- >>> browser.getControl('Password').value = TEST_USER_PASSWORD\n+ >>> browser.getControl('Password').value = SITE_OWNER_PASSWORD\n >>> browser.getControl('Log in').click()\n >>> browser.open('http://nohost/plone/@@usergroup-userprefs')\n >>> 'user6pas' in browser.contents\ndiff --git a/plone/app/users/tests/userdata_prefs_user_details.rst b/plone/app/users/tests/userdata_prefs_user_details.rst\nindex 2696b925..dcc7e459 100644\n--- a/plone/app/users/tests/userdata_prefs_user_details.rst\n+++ b/plone/app/users/tests/userdata_prefs_user_details.rst\n@@ -4,9 +4,9 @@ Admin modifies user information thru 'Users and groups'\n Set Up\n ======\n \n+ >>> from plone.app.testing import SITE_OWNER_PASSWORD\n >>> from plone.app.testing import TEST_USER_ID\n >>> from plone.app.testing import TEST_USER_NAME\n- >>> from plone.app.testing import TEST_USER_PASSWORD\n >>> from plone.testing.z2 import Browser\n \n >>> import transaction\n@@ -26,7 +26,7 @@ So let's login as Plone admin:\n >>> browser.open('http://nohost/plone/')\n >>> browser.getLink('Log in').click()\n >>> browser.getControl('Login Name').value = 'admin'\n- >>> browser.getControl('Password').value = TEST_USER_PASSWORD\n+ >>> browser.getControl('Password').value = SITE_OWNER_PASSWORD\n >>> browser.getControl('Log in').click()\n \n Let's see if we can navigate to the user information form in Users\n"
b'diff --git a/news/70.bugfix b/news/70.bugfix\nnew file mode 100644\nindex 00000000..93725d7f\n--- /dev/null\n+++ b/news/70.bugfix\n@@ -0,0 +1 @@\n+- Fix admin password used in tests. [davisagli]\ndiff --git a/src/Products/PlonePAS/tests/test_setup.py b/src/Products/PlonePAS/tests/test_setup.py\nindex b4bd24a7..c8085927 100644\n--- a/src/Products/PlonePAS/tests/test_setup.py\n+++ b/src/Products/PlonePAS/tests/test_setup.py\n@@ -116,7 +116,7 @@ def test_zope_root_cookie_login(self):\n hooks.setSite(None)\n zope.login(self.root_acl_users, pa_testing.SITE_OWNER_NAME)\n self.app.REQUEST.form["__ac_name"] = pa_testing.SITE_OWNER_NAME\n- self.app.REQUEST.form["__ac_password"] = pa_testing.TEST_USER_PASSWORD\n+ self.app.REQUEST.form["__ac_password"] = pa_testing.SITE_OWNER_PASSWORD\n cookie_plugin.login()\n \n # Submit the login form in the browser\n@@ -124,7 +124,7 @@ def test_zope_root_cookie_login(self):\n login_form.getControl(name="__ac_name").value = pa_testing.SITE_OWNER_NAME\n login_form.getControl(\n name="__ac_password"\n- ).value = pa_testing.TEST_USER_PASSWORD\n+ ).value = pa_testing.SITE_OWNER_PASSWORD\n login_form.controls[-1].click()\n self.assertEqual(\n browser.headers["Status"].lower(),\n'

0 comments on commit 9bf437c

Please sign in to comment.