Configure the validity_period as part of a separate GS profile, inste…

…ad of manually doing it in the test
collective · Aug 1, 2019 · 780ef9a · 780ef9a
1 parent bf797af
commit 780ef9a
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 63 deletions.
diff --git a/collective/pwexpiry/configure.zcml b/collective/pwexpiry/configure.zcml
@@ -52,6 +52,14 @@
       provides="Products.GenericSetup.interfaces.EXTENSION"
       />
 
+  <genericsetup:registerProfile
+      name="robot_testing"
+      title="collective.pwexpiry: robot_testing"
+      directory="profiles/robot_testing"
+      description="Profile used for robot tests (Do not import)."
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
   <utility factory=".setuphandlers.HiddenProfiles" name="collective.pwexpiry" />
 
     <subscriber

diff --git a/collective/pwexpiry/profiles/robot_testing/metadata.xml b/collective/pwexpiry/profiles/robot_testing/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<metadata>
+    <version>0001</version>
+</metadata>
diff --git a/collective/pwexpiry/profiles/robot_testing/registry.xml b/collective/pwexpiry/profiles/robot_testing/registry.xml
@@ -0,0 +1,18 @@
+<registry>
+    <record name="collective.pwexpiry.validity_period">
+        <field type="plone.registry.field.Int">
+            <title>Number of days for password validity. (set to 0 to disable)</title>
+        </field>
+        <value>0</value>
+    </record>
+
+    <record name="plone.enable_user_pwd_choice" interface="Products.CMFPlone.interfaces.controlpanel.ISecuritySchema" field="enable_user_pwd_choice">
+      <field type="plone.registry.field.Bool">
+        <default>False</default>
+        <description xmlns:ns0="http://xml.zope.org/namespaces/i18n" ns0:domain="plone" ns0:translate="">If not selected, a URL will be generated and e-mailed. Users are instructed to follow the link to reach a page where they can change their password and complete the registration process; this also verifies that they have entered a valid email address.</description>
+        <required>False</required>
+        <title xmlns:ns0="http://xml.zope.org/namespaces/i18n" ns0:domain="plone" ns0:translate="">Let users select their own passwords</title>
+      </field>
+      <value>True</value>
+    </record>
+</registry>
diff --git a/collective/pwexpiry/setuphandlers.py b/collective/pwexpiry/setuphandlers.py
@@ -23,6 +23,7 @@ def getNonInstallableProfiles(self):
             u"collective.pwexpiry:plone4",
             u"collective.pwexpiry:old_skins",
             u"collective.pwexpiry:uninstall",
+            u"collective.pwexpiry:robot_testing",
         ]
 
 

diff --git a/collective/pwexpiry/testing.py b/collective/pwexpiry/testing.py
@@ -56,15 +56,36 @@ def tearDownZope(self, app):
         pass
 
 
+class PwExpiryRobotLayer(PwExpiryLayer):
+    """
+    Testing layer for collective.pwexpiry robot tests
+    """
+
+    def setUpPloneSite(self, portal):
+        """
+        Set up Plone
+        """
+        # import default profile
+        applyProfile(portal, "collective.pwexpiry:default")
+        applyProfile(portal, "collective.pwexpiry:robot_testing")
+
+        # Create test content
+        # 1. Login as user with Manager privilages
+        setRoles(portal, TEST_USER_ID, ["Manager"])
+        login(portal, TEST_USER_NAME)
+
+
 FIXTURE = PwExpiryLayer()
+ROBOT_FIXTURE = PwExpiryRobotLayer()
+
 INTEGRATION_TESTING = IntegrationTesting(
     bases=(FIXTURE,), name="PwExpiryLayer:Integration"
 )
 FUNCTIONAL_TESTING = FunctionalTesting(
     bases=(FIXTURE,), name="PwExpiryLayer:Functional"
 )
 ROBOT_TESTING = FunctionalTesting(
-    bases=(FIXTURE, AUTOLOGIN_LIBRARY_FIXTURE, z2.ZSERVER_FIXTURE),
+    bases=(ROBOT_FIXTURE, AUTOLOGIN_LIBRARY_FIXTURE, z2.ZSERVER_FIXTURE),
     name="PwExpiryLayer:Robot",
 )
 

diff --git a/collective/pwexpiry/tests/pwexpiryp4_keywords.robot b/collective/pwexpiry/tests/pwexpiryp4_keywords.robot
@@ -41,16 +41,6 @@ Go to Configuration Registry
 
 Setup PWexpiry Use Username Login
     Start Browser and Log In as Site Owner
-    Go to Security Settings
-    Select Checkbox  id=form.enable_user_pwd_choice
-    Click Button  id=form.actions.save
-    Go to Configuration Registry
-    Input Text  id=q  validity_period
-    Click Button  Filter
-    Click Link  collective pwexpiry validity_period
-    Wait Until Element Is Visible  id=form-widgets-value
-    Input Text  id=form-widgets-value  0
-    Click Button  id=form-buttons-save
     Go to Users and Groups
     Click Button  name=form.button.AddUser
     Input Text  id=form.fullname  Test User 1
@@ -64,16 +54,8 @@ Setup PWexpiry Use Username Login
 Setup PWexpiry Use Email Login
     Start Browser and Log In as Site Owner
     Go to Security Settings
-    Select Checkbox  id=form.enable_user_pwd_choice
     Select Checkbox  id=form.use_email_as_login
     Click Button  id=form.actions.save
-    Go to Configuration Registry
-    Input Text  id=q  validity_period
-    Click Button  Filter
-    Click Link  collective pwexpiry validity_period
-    Wait Until Element Is Visible  id=form-widgets-value
-    Input Text  id=form-widgets-value  0
-    Click Button  id=form-buttons-save
     Go to Users and Groups
     Click Button  name=form.button.AddUser
     Input Text  id=form.fullname  Test User 1

diff --git a/collective/pwexpiry/tests/pwexpiryp52_keywords.robot b/collective/pwexpiry/tests/pwexpiryp52_keywords.robot
@@ -44,18 +44,6 @@ Plone52 Log out
 
 Setup PWexpiry Use Username Login
     Start Browser and Log In as Site Owner
-    Go to Security Settings
-    Select Checkbox  id=form-widgets-enable_user_pwd_choice-0
-    Click Button  id=form-buttons-save
-    Go to Configuration Registry
-    Input Text  id=q  validity_period
-    Press Key  id=q  \\13
-    Wait Until Element Is Not Visible  css:div#plone-loader
-    Click Link  collective pwexpiry validity_period
-    Wait Until Element Is Not Visible  css:div#plone-loader
-    Input Text  id=form-widgets-value  0
-    Press Key  id=form-widgets-value  \\13
-    Wait Until Element Is Not Visible  css:div#plone-loader
     Go to Users and Groups
     Click Button  id=add-new-user
     Wait Until Element Is Not Visible  css:div#plone-loader
@@ -71,18 +59,8 @@ Setup PWexpiry Use Username Login
 Setup PWexpiry Use Email Login
     Start Browser and Log In as Site Owner
     Go to Security Settings
-    Select Checkbox  id=form-widgets-enable_user_pwd_choice-0
     Select Checkbox  id=form-widgets-use_email_as_login-0
     Click Button  id=form-buttons-save
-    Go to Configuration Registry
-    Input Text  id=q  validity_period
-    Press Key  id=q  \\13
-    Wait Until Element Is Not Visible  css:div#plone-loader
-    Click Link  collective pwexpiry validity_period
-    Wait Until Element Is Not Visible  css:div#plone-loader
-    Input Text  id=form-widgets-value  0
-    Press Key  id=form-widgets-value  \\13
-    Wait Until Element Is Not Visible  css:div#plone-loader
     Go to Users and Groups
     Click Button  id=add-new-user
     Wait Until Element Is Not Visible  css:div#plone-loader

diff --git a/collective/pwexpiry/tests/pwexpiryp5_keywords.robot b/collective/pwexpiry/tests/pwexpiryp5_keywords.robot
@@ -40,18 +40,6 @@ Go to Configuration Registry
 
 Setup PWexpiry Use Username Login
     Start Browser and Log In as Site Owner
-    Go to Security Settings
-    Select Checkbox  id=form-widgets-enable_user_pwd_choice-0
-    Click Button  id=form-buttons-save
-    Go to Configuration Registry
-    Input Text  id=q  validity_period
-    Press Key  id=q  \\13
-    Wait Until Element Is Not Visible  css:div#plone-loader
-    Click Link  collective pwexpiry validity_period
-    Wait Until Element Is Not Visible  css:div#plone-loader
-    Input Text  id=form-widgets-value  0
-    Press Key  id=form-widgets-value  \\13
-    Wait Until Element Is Not Visible  css:div#plone-loader
     Go to Users and Groups
     Click Button  id=add-new-user
     Wait Until Element Is Not Visible  css:div#plone-loader
@@ -67,18 +55,8 @@ Setup PWexpiry Use Username Login
 Setup PWexpiry Use Email Login
     Start Browser and Log In as Site Owner
     Go to Security Settings
-    Select Checkbox  id=form-widgets-enable_user_pwd_choice-0
     Select Checkbox  id=form-widgets-use_email_as_login-0
     Click Button  id=form-buttons-save
-    Go to Configuration Registry
-    Input Text  id=q  validity_period
-    Press Key  id=q  \\13
-    Wait Until Element Is Not Visible  css:div#plone-loader
-    Click Link  collective pwexpiry validity_period
-    Wait Until Element Is Not Visible  css:div#plone-loader
-    Input Text  id=form-widgets-value  0
-    Press Key  id=form-widgets-value  \\13
-    Wait Until Element Is Not Visible  css:div#plone-loader
     Go to Users and Groups
     Click Button  id=add-new-user
     Wait Until Element Is Not Visible  css:div#plone-loader