improve functional tests

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44268 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testGadgetInUNGDocs.xml

@@ -53,6 +53,7 @@
         <td>${base_url}/ERP5Site_cleanUpUNGKnowledgePadList</td>\n
         <td></td>\n
       </tr>\n
+      <tal:block metal:use-macro="here/Zuite_CommonTemplateForUNG/macros/login" />\n
       <tr>\n
         <td>verifyTextPresent</td>\n
         <td>Please wait until your tab is being prepared.</td>\n
@@ -64,9 +65,9 @@
         <td></td>\n
       </tr>\n
       <tr>\n
-        <td>verifyTextPresent</td>\n
+        <td>verifyText</td>\n
+        <td>//a[@id="add-gadgets"]/span</td>\n
         <td>Add gadgets</td>\n
-        <td></td>\n
       </tr>\n
       <tr>\n
         <td>click</td>\n

bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGDocs.xml

@@ -48,11 +48,57 @@
       <tr><td rowspan="1" colspan="3" tal:content="template/getId"/></tr>\n
     </thead><tbody>\n
       <tal:block metal:use-macro="here/Zuite_CommonTemplateForUNG/macros/init" />\n
+      <tal:block metal:use-macro="here/Zuite_CommonTemplateForUNG/macros/login" />\n
       <tr>\n
         <td>openAndWait</td>\n
         <td>${ung_url}/ERP5Site_createNewWebDocument?template=web_illustration_template</td>\n
         <td></td>\n
       </tr>\n
+      <tr>\n
+        <td>verifyText</td>\n
+        <td>//a[@name="document_title"]</td>\n
+        <td>Web Illustration</td>\n
+      </tr>\n
+      <tr>\n
+        <td>verifyText</td>\n
+        <td>//a[@name="document_state"]</td>\n
+        <td>Draft</td>\n
+      </tr>\n
+      <tr>\n
+        <td>click</td>\n
+        <td>//a[@name="document_title"]</td>\n
+        <td></td>\n
+      </tr>\n
+      <tr>\n
+        <td>verifyText</td>\n
+        <td>//span[@id="ui-dialog-title-edit_document"]</td>\n
+        <td>Rename Document</td>\n
+      </tr>\n
+      <tr>\n
+        <td>verifyText</td>\n
+        <td>//p[@id="more_properties"]</td>\n
+        <td>Edit More Properties</td>\n
+      </tr>\n
+      <tr>\n
+        <td>click</td>\n
+        <td>//p[@id="more_properties"]</td>\n
+        <td></td>\n
+      </tr>\n
+      <tr>\n
+        <td>verifyText</td>\n
+        <td>//label[@for="reference"]</td>\n
+        <td>Reference:</td>\n
+      </tr>\n
+      <tr>\n
+        <td>click</td>\n
+        <td>//span[@class="ui-icon ui-icon-closethick"]</td>\n
+        <td></td>\n
+      </tr>\n
+      <tr>\n
+        <td>clickAndWait</td>\n
+        <td>//a[@class="ung_docs"]</td>\n
+        <td></td>\n
+      </tr>\n
     </tbody>\n
   </table>\n
 </body>\n

bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGLogin.xml

@@ -48,10 +48,16 @@
       <tr><td rowspan="1" colspan="3" tal:content="template/getId"/></tr>\n
     </thead><tbody>\n
       <tal:block metal:use-macro="here/Zuite_CommonTemplateForUNG/macros/init" />\n
+      <tal:block metal:use-macro="here/Zuite_CommonTemplateForUNG/macros/login" />\n
       <tr>\n
-        <td>verifyTextPresent</td>\n
+        <td>verifyText</td>\n
+        <td>//a[@class="tree-open"]</td>\n
         <td>All Documents</td>\n
-        <td></td>\n
+      </tr>\n
+      <tr>\n
+        <td>verifyText</td>\n
+        <td>//a[@id="settings"]</td>\n
+        <td>Settings</td>\n
       </tr>\n
       <tr>\n
         <td>verifyTextPresent</td>\n

bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGSettings.xml

@@ -48,6 +48,7 @@
       <tr><td rowspan="1" colspan="3" tal:content="template/getId"/></tr>\n
     </thead><tbody>\n
       <tal:block metal:use-macro="here/Zuite_CommonTemplateForUNG/macros/init" />\n
+      <tal:block metal:use-macro="here/Zuite_CommonTemplateForUNG/macros/login" />\n
       <tr>\n
         <td>verifyTextNotPresent</td>\n
         <td>Text Format</td>\n

bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/Zuite_CommonTemplateForUNG.xml

@@ -45,6 +45,8 @@
       <td>${base_url}/web_site_module/ung</td>\n
       <td>ung_url</td>\n
     </tr>\n
+  </tal:block>\n
+  <tal:block metal:define-macro="login">\n
     <tr>\n
         <td>openAndWait</td>\n
         <td>${ung_url}/WebSite_logout</td>\n

bt5/erp5_web_ung_ui_test/bt/revision

-4
\ No newline at end of file
+5
\ No newline at end of file