From de8f8942488b5190d6a19e8a81954fc2e81d7d39 Mon Sep 17 00:00:00 2001
From: Xiaowu Zhang <xiaowu.zhang@tiolive.com>
Date: Wed, 2 Dec 2015 11:17:58 +0000
Subject: [PATCH] erp5_web_renderjs_ui_test: clear search query before continue
---
.../renderjs_ui_listbox_zuite/testSort.xml | 2 +
.../testSortItemAutoBuild.xml | 2 +
.../testSortItemDelete.xml | 3 ++
.../testSortWithPager.xml | 3 ++
.../testSortWithPreviousNext.xml | 3 ++
.../Zuite_CommonTemplateForRenderjsUi.xml | 37 +++++++++++++++++++
6 files changed, 50 insertions(+)
diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSort.xml b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSort.xml
index be67106f06..31a037a879 100644
--- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSort.xml
+++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSort.xml
@@ -109,6 +109,8 @@
<td></td>\n
</tr>\n
\n
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/clear_query" />\n
+\n
<tr>\n
<td>waitForElementPresent</td>\n
<td>//form[@class=\'sort_form\']</td>\n
diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortItemAutoBuild.xml b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortItemAutoBuild.xml
index f67c7bf480..d2b331c4a1 100644
--- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortItemAutoBuild.xml
+++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortItemAutoBuild.xml
@@ -107,6 +107,8 @@
<td></td>\n
</tr>\n
\n
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/clear_query" />\n
+\n
<tr>\n
<td>waitForElementPresent</td>\n
<td>//form[@class=\'sort_form\']</td>\n
diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortItemDelete.xml b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortItemDelete.xml
index 2174112324..07490fccb9 100644
--- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortItemDelete.xml
+++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortItemDelete.xml
@@ -107,6 +107,9 @@
<td></td>\n
</tr>\n
\n
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/clear_query" />\n
+\n
+\n
<tr>\n
<td>waitForElementPresent</td>\n
<td>//form[@class=\'sort_form\']</td>\n
diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortWithPager.xml b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortWithPager.xml
index 6b66af2bc8..8208c8c177 100644
--- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortWithPager.xml
+++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortWithPager.xml
@@ -106,6 +106,9 @@
<td></td>\n
</tr>\n
\n
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/clear_query" />\n
+\n
+\n
<tr>\n
<td>waitForElementPresent</td>\n
<td>//form[@class=\'sort_form\']</td>\n
diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortWithPreviousNext.xml b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortWithPreviousNext.xml
index a54ac987a3..6d2d64ecf7 100644
--- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortWithPreviousNext.xml
+++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortWithPreviousNext.xml
@@ -106,6 +106,9 @@
<td></td>\n
</tr>\n
\n
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/clear_query" />\n
+\n
+\n
<tr>\n
<td>waitForElementPresent</td>\n
<td>//form[@class=\'sort_form\']</td>\n
diff --git a/bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Zuite_CommonTemplateForRenderjsUi.xml b/bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Zuite_CommonTemplateForRenderjsUi.xml
index 3d7a623655..95299693e9 100644
--- a/bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Zuite_CommonTemplateForRenderjsUi.xml
+++ b/bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Zuite_CommonTemplateForRenderjsUi.xml
@@ -87,6 +87,43 @@
<td></td>\n
</tr>\n
</tal:block>\n
+ \n
+ \n
+ \n
+ <tal:block metal:define-macro="clear_query">\n
+ \n
+ <tr>\n
+ <td>waitForElementPresent</td>\n
+ <td>//a[@data-i18n=\'Previous\']</td>\n
+ <td></td>\n
+ </tr>\n
+\n
+ <tr>\n
+ <td>type</td>\n
+ <td>search</td>\n
+ <td></td>\n
+ </tr>\n
+\n
+ <tr>\n
+ <td>click</td>\n
+ <td>//div[@data-gadget-scope=\'erp5_searchfield\']//input[@value=\'header-submit\' and @type=\'submit\']</td>\n
+ <td></td>\n
+ </tr>\n
+ \n
+ <tr>\n
+ <td>waitForElementNotPresent</td>\n
+ <td>//a[@data-i18n=\'Previous\']</td>\n
+ <td></td>\n
+ </tr>\n
+ \n
+ <tr>\n
+ <td>waitForElementPresent</td>\n
+ <td>//a[@data-i18n=\'Previous\']</td>\n
+ <td></td>\n
+ </tr>\n
+ \n
+ \n
+ </tal:block>\n
\n
\n
</tal:block>
--
2.30.9