From d475586df43a74d30eb2f75d4bc1e00d2c3ca826 Mon Sep 17 00:00:00 2001
From: Ivan Tyagov <ivan@nexedi.com>
Date: Mon, 5 Jul 2010 11:17:50 +0000
Subject: [PATCH] Finish / alter work started in r36856. Fix tests so in an
empty system first will open respective Web Section (something which will
guarantee that a default Knowledge Pad is created in background) then try to
add gadget to it.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@36858 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_km_zuite/testAdvancedSearch.xml | 4 ++--
.../erp5_km_zuite/testCreateNewFile.xml | 4 ++--
.../erp5_km_zuite/testCreateNewLink.xml | 4 ++--
.../erp5_km_zuite/testCreatePerson.xml | 4 ++--
.../testDocumentDownloadWidget.xml | 2 +-
.../portal_tests/erp5_km_zuite/testFooter.xml | 2 +-
.../erp5_km_zuite/testLatestContentGadget.xml | 18 +++++++++++++++++-
.../erp5_km_zuite/testMyDocumentsGadget.xml | 6 +-----
.../testSetUnSetDefaultWebPageOnWebSection.xml | 4 +---
.../erp5_km_zuite/testSubsections.xml | 3 +--
.../erp5_km_zuite/testTopSearchBoxClicking.xml | 3 +--
.../testTopSearchBoxHittingEnter.xml | 4 ++--
.../erp5_km_zuite/testWebSiteBrowserGadget.xml | 2 +-
bt5/erp5_km_ui_test/bt/revision | 2 +-
14 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testAdvancedSearch.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testAdvancedSearch.xml
index cc21aa8a58..296cb14a07 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testAdvancedSearch.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testAdvancedSearch.xml
@@ -58,7 +58,7 @@
\n
<tr>\n
<td>openAndWait</td>\n
- <td>${base_url}/web_site_module/km_test_web_site/view</td>\n
+ <td>${base_url}/web_site_module/km_test_web_site</td>\n
<td></td>\n
</tr>\n
<tr>\n
@@ -73,7 +73,7 @@
</tr> \n
<tr>\n
<td>open</td>\n
- <td>${base_url}/web_site_module/km_test_web_site/view</td>\n
+ <td>${base_url}/web_site_module/km_test_web_site</td>\n
<td></td>\n
</tr>\n
<tr>\n
diff --git a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreateNewFile.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreateNewFile.xml
index 0372da05ef..3a885fa549 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreateNewFile.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreateNewFile.xml
@@ -58,7 +58,7 @@
\n
<tr>\n
<td>openAndWait</td>\n
- <td>${base_url}/web_site_module/km_test_web_site/view</td>\n
+ <td>${base_url}/web_site_module/km_test_web_site</td>\n
<td></td>\n
</tr>\n
<tr>\n
@@ -153,7 +153,7 @@
</tr> \n
<tr>\n
<td>openAndWait</td>\n
- <td>${base_url}/web_site_module/km_test_web_site/view</td>\n
+ <td>${base_url}/web_site_module/km_test_web_site</td>\n
<td></td>\n
</tr>\n
<tr>\n
diff --git a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreateNewLink.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreateNewLink.xml
index b2b5a6bf18..e8ed826e63 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreateNewLink.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreateNewLink.xml
@@ -56,7 +56,7 @@
\n
<tr>\n
<td>openAndWait</td>\n
- <td>${base_url}/web_site_module/km_test_web_site/view</td>\n
+ <td>${base_url}/web_site_module/km_test_web_site</td>\n
<td></td>\n
</tr>\n
<tr>\n
@@ -137,7 +137,7 @@
<!-- Test bad link -->\n
<tr>\n
<td>openAndWait</td>\n
- <td>${base_url}/web_site_module/km_test_web_site/en</td>\n
+ <td>${base_url}/web_site_module/km_test_web_site</td>\n
<td></td>\n
</tr>\n
<tr>\n
diff --git a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreatePerson.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreatePerson.xml
index 4c792468f2..c8d82b4b70 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreatePerson.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testCreatePerson.xml
@@ -58,7 +58,7 @@
\n
<tr>\n
<td>openAndWait</td>\n
- <td>${base_url}/web_site_module/km_test_web_site/view</td>\n
+ <td>${base_url}/web_site_module/km_test_web_site</td>\n
<td></td>\n
</tr>\n
<tr>\n
@@ -109,7 +109,7 @@
</tr>\n
<tr>\n
<td>openAndWait</td>\n
- <td>${base_url}/web_site_module/km_test_web_site/view</td>\n
+ <td>${base_url}/web_site_module/km_test_web_site</td>\n
<td></td>\n
</tr>\n
\n
diff --git a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testDocumentDownloadWidget.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testDocumentDownloadWidget.xml
index 83ab321170..f34858b4ff 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testDocumentDownloadWidget.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testDocumentDownloadWidget.xml
@@ -58,7 +58,7 @@
\n
<tr>\n
<td>openAndWait</td>\n
- <td>${base_url}/web_site_module/km_test_web_site/view</td>\n
+ <td>${base_url}/web_site_module/km_test_web_site</td>\n
<td></td>\n
</tr>\n
<tr>\n
diff --git a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testFooter.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testFooter.xml
index 2d935c1838..b3dc75943a 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testFooter.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testFooter.xml
@@ -58,7 +58,7 @@
\n
<tr>\n
<td>openAndWait</td>\n
- <td>${base_url}/web_site_module/km_test_web_site/view</td>\n
+ <td>${base_url}/web_site_module/km_test_web_site</td>\n
<td></td>\n
</tr>\n
\n
diff --git a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testLatestContentGadget.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testLatestContentGadget.xml
index edea8f5fdb..626ec780ab 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testLatestContentGadget.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testLatestContentGadget.xml
@@ -58,7 +58,7 @@
\n
<tr>\n
<td>openAndWait</td>\n
- <td>${base_url}/web_site_module/km_test_web_site/view</td>\n
+ <td>${base_url}/web_site_module/km_test_web_site</td>\n
<td></td>\n
</tr>\n
\n
@@ -139,6 +139,22 @@
</tr>\n
\n
<!-- Add Latest Content Gadget -->\n
+<tr>\n
+ <td>openAndWait</td>\n
+ <td>${base_url}/web_site_module/km_test_web_site/1/view</td>\n
+ <td></td>\n
+</tr>\n
+<tr>\n
+ <td>openAndWait</td>\n
+ <td>${base_url}/Zuite_waitForActivities</td>\n
+ <td></td>\n
+</tr>\n
+<tr>\n
+ <td>verifyTextPresent</td>\n
+ <td>Done.</td>\n
+ <td></td>\n
+</tr>\n
+\n
<tr>\n
<td>openAndWait</td>\n
<td>${base_url}/web_site_module/km_test_web_site/1/Zuite_AddGadgetToActivePad?gadget_relative_url=portal_gadgets/km_latest_documents&mode=web_section&default_pad_group=default_section_pad</td>\n
diff --git a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testMyDocumentsGadget.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testMyDocumentsGadget.xml
index ee119e5919..b0ba40beb3 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testMyDocumentsGadget.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testMyDocumentsGadget.xml
@@ -58,7 +58,7 @@
\n
<tr>\n
<td>openAndWait</td>\n
- <td>${base_url}/web_site_module/km_test_web_site/view</td>\n
+ <td>${base_url}/web_site_module/km_test_web_site</td>\n
<td></td>\n
</tr>\n
<tr>\n
@@ -141,7 +141,6 @@
<td>Converted</td>\n
<td></td>\n
</tr>\n
-\n
<!-- add "My Documents" gadget -->\n
<tr>\n
<td>openAndWait</td>\n
@@ -158,11 +157,8 @@
<td>selenium.isTextPresent("TioLive Spreadsheet")</td>\n
<td>10000</td> \n
</tr>\n
-\n
<!-- XXX: add "Profile" gadget -->\n
\n
-\n
-\n
<tal:block metal:use-macro="here/KMZuite_CommonTemplate/macros/deleteKMWebSite" />\n
\n
</tbody></table>\n
diff --git a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testSetUnSetDefaultWebPageOnWebSection.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testSetUnSetDefaultWebPageOnWebSection.xml
index 0c788f7218..cafddaed8d 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testSetUnSetDefaultWebPageOnWebSection.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testSetUnSetDefaultWebPageOnWebSection.xml
@@ -58,10 +58,9 @@
\n
<tr>\n
<td>openAndWait</td>\n
- <td>${base_url}/web_site_module/km_test_web_site/view</td>\n
+ <td>${base_url}/web_site_module/km_test_web_site</td>\n
<td></td>\n
</tr>\n
-\n
<tr>\n
<td>clickAndWait</td>\n
<td>link=Section 1</td>\n
@@ -169,7 +168,6 @@
<td></td>\n
</tr>\n
\n
-\n
<tal:block metal:use-macro="here/KMZuite_CommonTemplate/macros/deleteKMWebSite" />\n
\n
</tbody></table>\n
diff --git a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testSubsections.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testSubsections.xml
index 533455e7b4..c85977d5db 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testSubsections.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testSubsections.xml
@@ -58,10 +58,9 @@
\n
<tr>\n
<td>openAndWait</td>\n
- <td>${base_url}/web_site_module/km_test_web_site/view</td>\n
+ <td>${base_url}/web_site_module/km_test_web_site</td>\n
<td></td>\n
</tr>\n
-\n
<tr>\n
<td>verifyElementPresent</td>\n
<td>link=Section 1</td>\n
diff --git a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testTopSearchBoxClicking.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testTopSearchBoxClicking.xml
index 6b74cd9e68..5bc18b5c63 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testTopSearchBoxClicking.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testTopSearchBoxClicking.xml
@@ -57,7 +57,7 @@
\n
<tr>\n
<td>openAndWait</td>\n
- <td>${base_url}/web_site_module/km_test_web_site/view</td>\n
+ <td>${base_url}/web_site_module/km_test_web_site</td>\n
<td></td>\n
</tr>\n
<tr>\n
@@ -85,7 +85,6 @@
<td>//tr[@id=\'listbox_data_line_0\']//span[@class=\'search_result_title\']</td>\n
<td>test_km_web_site_page</td>\n
</tr>\n
-\n
<!-- Test listbox sub search -->\n
<tr>\n
<td>verifyValue</td>\n
diff --git a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testTopSearchBoxHittingEnter.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testTopSearchBoxHittingEnter.xml
index 976af8b41c..dafb6534ed 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testTopSearchBoxHittingEnter.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testTopSearchBoxHittingEnter.xml
@@ -58,7 +58,7 @@
\n
<tr>\n
<td>open</td>\n
- <td>${base_url}/web_site_module/km_test_web_site/view</td>\n
+ <td>${base_url}/web_site_module/km_test_web_site</td>\n
<td></td>\n
</tr>\n
<tr>\n
@@ -75,7 +75,7 @@
</tr>\n
<tr>\n
<td>open</td>\n
- <td>${base_url}/web_site_module/km_test_web_site/en</td>\n
+ <td>${base_url}/web_site_module/km_test_web_site</td>\n
<td></td>\n
</tr>\n
<tr>\n
diff --git a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testWebSiteBrowserGadget.xml b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testWebSiteBrowserGadget.xml
index f5943d6a46..08908f1199 100644
--- a/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testWebSiteBrowserGadget.xml
+++ b/bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testWebSiteBrowserGadget.xml
@@ -58,7 +58,7 @@
\n
<tr>\n
<td>openAndWait</td>\n
- <td>${base_url}/web_site_module/km_test_web_site/view</td>\n
+ <td>${base_url}/web_site_module/km_test_web_site</td>\n
<td></td>\n
</tr>\n
<!-- add "My Documents" gadget -->\n
diff --git a/bt5/erp5_km_ui_test/bt/revision b/bt5/erp5_km_ui_test/bt/revision
index c147342cbe..9d1ce53f8c 100644
--- a/bt5/erp5_km_ui_test/bt/revision
+++ b/bt5/erp5_km_ui_test/bt/revision
@@ -1 +1 @@
-81
\ No newline at end of file
+82
\ No newline at end of file
--
2.30.9