From 663a55d42753213e49d0e52ab366b816c3cbc821 Mon Sep 17 00:00:00 2001 From: Gabriel Monnerat <gabriel@tiolive.com> Date: Wed, 16 Mar 2011 17:34:32 +0000 Subject: [PATCH] refactor to remove code duplicated git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44366 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../ung_zuite/testUNGDocsWithERP5User.xml | 46 +----------------- .../portal_tests/ung_zuite/testUNGLogin.xml | 46 +----------------- .../Zuite_CommonTemplateForUNG.xml | 47 +++++++++++++++++++ bt5/erp5_web_ung_ui_test/bt/revision | 2 +- 4 files changed, 50 insertions(+), 91 deletions(-) diff --git a/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGDocsWithERP5User.xml b/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGDocsWithERP5User.xml index 7d6a923c57..d1099847d6 100644 --- a/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGDocsWithERP5User.xml +++ b/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGDocsWithERP5User.xml @@ -53,51 +53,7 @@ <td>${ung_url}/WebSite_logout</td>\n <td></td>\n </tr>\n - <tr>\n - <td>click</td>\n - <td>//td[@id="new-account-form"]</td>\n - <td></td>\n - </tr>\n - <tr>\n - <td>type</td>\n - <td>//input[@name="firstname"]</td>\n - <td>Gabriel</td>\n - </tr>\n - <tr>\n - <td>type</td>\n - <td>//input[@name="lastname"]</td>\n - <td>Monnerat</td>\n - </tr>\n - <tr>\n - <td>type</td>\n - <td>//input[@name="email"]</td>\n - <td>example@example.com</td>\n - </tr>\n - <tr>\n - <td>type</td>\n - <td>//input[@name="login_name"]</td>\n - <td>ung_user</td>\n - </tr>\n - <tr>\n - <td>type</td>\n - <td>//input[@name="password"]</td>\n - <td>1234</td>\n - </tr>\n - <tr>\n - <td>type</td>\n - <td>//input[@name="confirm"]</td>\n - <td>1234</td>\n - </tr>\n - <tr>\n - <td>click</td>\n - <td>//input[@value="Create Account"]</td>\n - <td></td>\n - </tr>\n - <tr>\n - <td>waitForPageToLoad</td>\n - <td>30000</td>\n - <td></td>\n - </tr>\n + <tal:block metal:use-macro="here/Zuite_CommonTemplateForUNG/macros/create-user" />\n <tr>\n <td>type</td>\n <td>//input[@name="__ac_name"]</td>\n diff --git a/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGLogin.xml b/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGLogin.xml index fc256168a3..6bc0fe8ef6 100644 --- a/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGLogin.xml +++ b/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGLogin.xml @@ -104,51 +104,7 @@ <td>//td[@id="back-login"]</td>\n <td></td>\n </tr>\n - <tr>\n - <td>click</td>\n - <td>//td[@id="new-account-form"]</td>\n - <td></td>\n - </tr>\n - <tr>\n - <td>type</td>\n - <td>//input[@name="firstname"]</td>\n - <td>Gabriel</td>\n - </tr>\n - <tr>\n - <td>type</td>\n - <td>//input[@name="lastname"]</td>\n - <td>Monnerat</td>\n - </tr>\n - <tr>\n - <td>type</td>\n - <td>//input[@name="email"]</td>\n - <td>example@example.com</td>\n - </tr>\n - <tr>\n - <td>type</td>\n - <td>//input[@name="login_name"]</td>\n - <td>ung_user</td>\n - </tr>\n - <tr>\n - <td>type</td>\n - <td>//input[@name="password"]</td>\n - <td>1234</td>\n - </tr>\n - <tr>\n - <td>type</td>\n - <td>//input[@name="confirm"]</td>\n - <td>1234</td>\n - </tr>\n - <tr>\n - <td>click</td>\n - <td>//input[@value="Create Account"]</td>\n - <td></td>\n - </tr>\n - <tr>\n - <td>waitForPageToLoad</td>\n - <td>30000</td>\n - <td></td>\n - </tr>\n + <tal:block metal:use-macro="here/Zuite_CommonTemplateForUNG/macros/create-user" />\n <tr>\n <td>type</td>\n <td>//input[@name="__ac_name"]</td>\n diff --git a/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/Zuite_CommonTemplateForUNG.xml b/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/Zuite_CommonTemplateForUNG.xml index cecaccd19e..513ca86981 100644 --- a/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/Zuite_CommonTemplateForUNG.xml +++ b/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/Zuite_CommonTemplateForUNG.xml @@ -73,6 +73,53 @@ <td></td>\n </tr>\n </tal:block>\n + <tal:block metal:define-macro="create-user">\n + <tr>\n + <td>click</td>\n + <td>//td[@id="new-account-form"]</td>\n + <td></td>\n + </tr>\n + <tr>\n + <td>type</td>\n + <td>//input[@name="firstname"]</td>\n + <td>Gabriel</td>\n + </tr>\n + <tr>\n + <td>type</td>\n + <td>//input[@name="lastname"]</td>\n + <td>Monnerat</td>\n + </tr>\n + <tr>\n + <td>type</td>\n + <td>//input[@name="email"]</td>\n + <td>example@example.com</td>\n + </tr>\n + <tr>\n + <td>type</td>\n + <td>//input[@name="login_name"]</td>\n + <td>ung_user</td>\n + </tr>\n + <tr>\n + <td>type</td>\n + <td>//input[@name="password"]</td>\n + <td>1234</td>\n + </tr>\n + <tr>\n + <td>type</td>\n + <td>//input[@name="confirm"]</td>\n + <td>1234</td>\n + </tr>\n + <tr>\n + <td>click</td>\n + <td>//input[@value="Create Account"]</td>\n + <td></td>\n + </tr>\n + <tr>\n + <td>waitForPageToLoad</td>\n + <td>30000</td>\n + <td></td>\n + </tr>\n + </tal:block>\n </tal:block> ]]></unicode> </value> diff --git a/bt5/erp5_web_ung_ui_test/bt/revision b/bt5/erp5_web_ung_ui_test/bt/revision index 3f10ffe7a4..19c7bdba7b 100644 --- a/bt5/erp5_web_ung_ui_test/bt/revision +++ b/bt5/erp5_web_ung_ui_test/bt/revision @@ -1 +1 @@ -15 \ No newline at end of file +16 \ No newline at end of file -- 2.30.9