[erp5_dms_ui_test, erp5_km_ui_test] Fix outdated functional tests.

bt5/erp5_dms_ui_test/PathTemplateItem/portal_tests/dms_zuite/testContributeAndEmbedImageWithFCKEditor.zpt

@@ -77,7 +77,7 @@ Wait for activities</span>
   <td></td>
 </tr>
   <td>waitForElementPresent</td>
-  <td>//select[@name="select_action"]</td>
+  <td>//option[contains(@value, "publish_action")]</td>
   <td></td>
 <tr>
   <td>selectAndWait</td>

bt5/erp5_dms_ui_test/PathTemplateItem/portal_tests/dms_zuite/testContributeTab.zpt

@@ -77,7 +77,7 @@ Wait for activities</span>
 </tr>
 <tr>
   <td>verifyTextPresent</td>
-  <td>Converting</td>
+  <td>Converted</td>
   <td></td>
 </tr>
 <tr>
@@ -305,7 +305,7 @@ Wait for activities</span>
 </tr>
 <tr>
   <td>verifyTextPresent</td>
-  <td>Converting</td>
+  <td>Converted</td>
   <td></td>
 </tr>
 
@@ -362,7 +362,7 @@ Wait for activities</span>
 </tr>
 <tr>
   <td>verifyTextPresent</td>
-  <td>Converting</td>
+  <td>Converted</td>
   <td></td>
 </tr>
 

bt5/erp5_dms_ui_test/SkinTemplateItem/portal_skins/erp5_dms_ui_test/Zuite_setupDMS.py

@@ -34,5 +34,13 @@ for gadget in context.portal_gadgets.objectValues():
     gadget.visible()
     gadget.public()
 
+# Reject the tiolive logo image if it is published. This image
+# is used by testContributeAndEmbedImageWithFCKEditor
+tiolive_logo_image = context.portal_catalog.getResultValue(
+  reference='tiolive-ERP5.Freedom.TioLive.Logo',
+  validation_state='published')
+if tiolive_logo_image is not None and tiolive_logo_image.getValidationState() == 'published':
+  tiolive_logo_image.reject()
+
 print "Done"
 return printed

bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCheckPDFThumbnail.zpt

@@ -86,179 +86,27 @@
   <td>PDF</td>
   <td></td>
 </tr>
-<!-- Check PDF thumbnail preview works -->
+<!-- Check PDFJS preview appears -->
 <tr>
   <td>clickAndWait</td>
   <td>link=Preview</td>
   <td></td>
 </tr>
 <tr>
-  <td>verifyText</td>
-  <td>//span[@class="listbox-current-page-start-number"]</td>
-  <td>1</td>
-</tr>
-<tr>
-  <td>verifyText</td>
-  <td>//span[@class="listbox-current-page-stop-number"]</td>
-  <td>10</td>
-</tr>
-<tr>
-  <td>verifyText</td>
-  <td>//span[@class="listbox-current-page-total-number"]</td>
-  <td>16 records</td>
-</tr>
-<tr>
-  <td>verifyElementPresent</td>
-  <td>//img[@title='Thumbnail']</td>
-  <td></td>
-</tr>
-<!-- Check PDF thumbnail preview navigation-->
-<tr>
-  <td>clickAndWait</td>
-  <td>//button[@class="listbox_next_page"]</td>
-  <td></td>
-</tr>
-<tr>
-  <td>verifyText</td>
-  <td>//span[@class="listbox-current-page-start-number"]</td>
-  <td>11</td>
-</tr>
-<tr>
-  <td>verifyText</td>
-  <td>//span[@class="listbox-current-page-stop-number"]</td>
-  <td>16</td>
-</tr>
-<tr>
-  <td>verifyText</td>
-  <td>//span[@class="listbox-current-page-total-number"]</td>
-  <td>16 records</td>
-</tr>
-<tr>
-  <td>verifyElementPresent</td>
-  <td>//img[@title='Thumbnail']</td>
-  <td></td>
-</tr>
-<tr>
-  <td>clickAndWait</td>
-  <td>//button[@class="listbox_previous_page"]</td>
-  <td></td>
-</tr>
-<tr>
-  <td>verifyText</td>
-  <td>//span[@class="listbox-current-page-start-number"]</td>
-  <td>1</td>
-</tr>
-<tr>
-  <td>verifyText</td>
-  <td>//span[@class="listbox-current-page-stop-number"]</td>
-  <td>10</td>
-</tr>
-<tr>
-  <td>verifyText</td>
-  <td>//span[@class="listbox-current-page-total-number"]</td>
-  <td>16 records</td>
-</tr>
-<tr>
-  <td>verifyElementPresent</td>
-  <td>//img[@title='Thumbnail']</td>
-  <td></td>
-</tr>
-
-<!-- Go to PDF default big preview -->
-<tr>
-  <td>clickAndWait</td>
-  <td>//tr[@class="listbox-data-line-1 DataB"]/td/div/a/img[@title='Thumbnail']</td>
-  <td></td>
-</tr>
-<tr>
-  <td>verifyValue</td>
-  <td>//input[@name="pdf_selection_index"]</td>
-  <td>2</td>
-</tr>
-<tr>
-  <td>verifyElementPresent</td>
-  <td>//img[@alt='First']</td>
+  <td>waitForElementPresent</td>
+  <td>//div[@id='pageContainer1']</td>
   <td></td>
 </tr>
 <tr>
-  <td>verifyElementPresent</td>
-  <td>//img[@alt='Previous']</td>
+  <td>isElementPresent</td>
+  <td>//button[@id='zoomOut']</td>
   <td></td>
 </tr>
 <tr>
-  <td>verifyElementPresent</td>
-  <td>//img[@alt='Next']</td>
+  <td>isElementPresent</td>
+  <td>//button[@id='zoomIn']</td>
   <td></td>
 </tr>
-<tr>
-  <td>verifyElementPresent</td>
-  <td>//img[@alt='Last']</td>
-  <td></td>
-</tr>
-<tr>
-  <td>verifyElementPresent</td>
-  <td>//div[@class='pdf-preview-content']/img</td>
-  <td></td>
-</tr>
-
-<!-- Check if PDF thumbnail navigation works -->
-<tr>
-  <td>clickAndWait</td>
-  <td>//img[@alt='Next']</td>
-  <td></td>
-</tr>
-<tr>
-  <td>verifyValue</td>
-  <td>//input[@name="pdf_selection_index"]</td>
-  <td>3</td>
-</tr>
-<tr>
-  <td>clickAndWait</td>
-  <td>//img[@alt='First']</td>
-  <td></td>
-</tr>
-<tr>
-  <td>verifyValue</td>
-  <td>//input[@name="pdf_selection_index"]</td>
-  <td>1</td>
-</tr>
-<tr>
-  <td>clickAndWait</td>
-  <td>//img[@alt='Last']</td>
-  <td></td>
-</tr>
-<tr>
-  <td>verifyValue</td>
-  <td>//input[@name="pdf_selection_index"]</td>
-  <td>16</td>
-</tr>
-<tr>
-  <td>clickAndWait</td>
-  <td>//img[@alt='First']</td>
-  <td></td>
-</tr>
-<tr>
-  <td>verifyValue</td>
-  <td>//input[@name="pdf_selection_index"]</td>
-  <td>1</td>
-</tr>
-<!-- Type in test -->
-<tr>
-  <td>type</td>
-  <td>//input[@name="pdf_selection_index"]</td>
-  <td>5</td>
-</tr>
-<tr>
-  <td>keyPressAndWait</td>
-  <td>//input[@name="pdf_selection_index"]</td>
-  <td>\13</td>
-</tr>
-<tr>
-  <td>verifyValue</td>
-  <td>//input[@name="pdf_selection_index"]</td>
-  <td>5</td>
-</tr>
-
 <tal:block metal:use-macro="here/KMZuite_CommonTemplate/macros/deleteKMWebSite" />
 
 </tbody></table>