[Erp5-report] r42604 lucas - in /erp5/trunk/bt5/erp5_configurator_standard_ui_test: PathTem...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Jan 21 21:06:52 CET 2011
Author: lucas
Date: Fri Jan 21 21:06:52 2011
New Revision: 42604
URL: http://svn.erp5.org?rev=42604&view=rev
Log:
Once the portal activities is not subscribed to timer service, we need to call the macro wait_for_activities and then call the script to check if the configuration is finished.
Added:
erp5/trunk/bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_assertEndConfiguration.xml
Modified:
erp5/trunk/bt5/erp5_configurator_standard_ui_test/PathTemplateItem/portal_tests/configurator_standard_zuite/testStandardConfigurationProcess.xml
erp5/trunk/bt5/erp5_configurator_standard_ui_test/PathTemplateItem/portal_tests/configurator_standard_zuite/testStandardConsultingConfigurationProcess.xml
erp5/trunk/bt5/erp5_configurator_standard_ui_test/bt/revision
Modified: erp5/trunk/bt5/erp5_configurator_standard_ui_test/PathTemplateItem/portal_tests/configurator_standard_zuite/testStandardConfigurationProcess.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_configurator_standard_ui_test/PathTemplateItem/portal_tests/configurator_standard_zuite/testStandardConfigurationProcess.xml?rev=42604&r1=42603&r2=42604&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_configurator_standard_ui_test/PathTemplateItem/portal_tests/configurator_standard_zuite/testStandardConfigurationProcess.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_configurator_standard_ui_test/PathTemplateItem/portal_tests/configurator_standard_zuite/testStandardConfigurationProcess.xml [utf8] Fri Jan 21 21:06:52 2011
@@ -519,28 +519,20 @@
<td></td>\n
</tr>\n
<tr>\n
- <td>waitForCondition</td>\n
- <td>selenium.isTextPresent("Configuration is over. Enjoy your new ERP5 system!")</td>\n
- <td>1000000</td> <!-- set timeout reasonably as it takes time to finish installation-->\n
-</tr>\n
-<tr>\n
- <td>verifyTextPresent</td>\n
- <td>Please click link below.</td>\n
- <td></td>\n
-</tr>\n
-<tr>\n
- <td>verifyTextPresent</td>\n
- <td>You will be redirected to a form in which you can login using</td>\n
+ <td>setTimeout</td>\n
+ <td>1200000</td>\n
<td></td>\n
</tr>\n
+<span metal:use-macro="container/Zuite_CommonTemplate/macros/wait_for_activities">\n
+Wait for activities</span>\n
<tr>\n
- <td>verifyTextPresent</td>\n
- <td>one of yours newly created ERP5 user accounts.</td>\n
+ <td>openAndWait</td>\n
+ <td>${base_url}/Zuite_assertEndConfiguration</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>verifyTextPresent</td>\n
- <td>Start using your new ERP5 system</td>\n
+ <td>True</td>\n
<td></td>\n
</tr>\n
\n
Modified: erp5/trunk/bt5/erp5_configurator_standard_ui_test/PathTemplateItem/portal_tests/configurator_standard_zuite/testStandardConsultingConfigurationProcess.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_configurator_standard_ui_test/PathTemplateItem/portal_tests/configurator_standard_zuite/testStandardConsultingConfigurationProcess.xml?rev=42604&r1=42603&r2=42604&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_configurator_standard_ui_test/PathTemplateItem/portal_tests/configurator_standard_zuite/testStandardConsultingConfigurationProcess.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_configurator_standard_ui_test/PathTemplateItem/portal_tests/configurator_standard_zuite/testStandardConsultingConfigurationProcess.xml [utf8] Fri Jan 21 21:06:52 2011
@@ -558,28 +558,20 @@
<td></td>\n
</tr>\n
<tr>\n
- <td>waitForCondition</td>\n
- <td>selenium.isTextPresent("Configuration is over. Enjoy your new ERP5 system!")</td>\n
- <td>1000000</td> <!-- set timeout reasonably as it takes time to finish installation-->\n
-</tr>\n
-<tr>\n
- <td>verifyTextPresent</td>\n
- <td>Please click link below.</td>\n
- <td></td>\n
-</tr>\n
-<tr>\n
- <td>verifyTextPresent</td>\n
- <td>You will be redirected to a form in which you can login using</td>\n
+ <td>setTimeout</td>\n
+ <td>1200000</td>\n
<td></td>\n
</tr>\n
+<span metal:use-macro="container/Zuite_CommonTemplate/macros/wait_for_activities">\n
+Wait for activities</span>\n
<tr>\n
- <td>verifyTextPresent</td>\n
- <td>one of yours newly created ERP5 user accounts.</td>\n
+ <td>openAndWait</td>\n
+ <td>${base_url}/Zuite_assertEndConfiguration</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>verifyTextPresent</td>\n
- <td>Start using your new ERP5 system</td>\n
+ <td>True</td>\n
<td></td>\n
</tr>\n
\n
Added: erp5/trunk/bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_assertEndConfiguration.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_assertEndConfiguration.xml?rev=42604&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_assertEndConfiguration.xml (added)
+++ erp5/trunk/bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_assertEndConfiguration.xml [utf8] Fri Jan 21 21:06:52 2011
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>portal = context.getPortalObject()\n
+html_status_report = str(portal.portal_configurator.getInstallationStatusReport(active_process_id=2))\n
+message_list = ["Configuration is over. Enjoy your new ERP5 system!",\n
+ "Please click link below.",\n
+ "You will be redirected to a form in which you can login using",\n
+ "one of yours newly created ERP5 user accounts."]\n
+\n
+for message in message_list:\n
+ if not message in html_status_report:\n
+ return \'False\'\n
+\n
+return \'True\'\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>Zuite_assertEndConfiguration</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_configurator_standard_ui_test/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_configurator_standard_ui_test/bt/revision?rev=42604&r1=42603&r2=42604&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_configurator_standard_ui_test/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_configurator_standard_ui_test/bt/revision [utf8] Fri Jan 21 21:06:52 2011
@@ -1 +1 @@
-660
\ No newline at end of file
+664
\ No newline at end of file
More information about the Erp5-report
mailing list