diff --git a/bt5/erp5_configurator_standard_ui_test/PathTemplateItem/portal_tests/configurator_standard_zuite/testStandardConfigurationProcess.xml b/bt5/erp5_configurator_standard_ui_test/PathTemplateItem/portal_tests/configurator_standard_zuite/testStandardConfigurationProcess.xml index 574f3b8d9b7bd209ebd0b82577ceaf9bfeb7676f..4fa338934be7505568f3cb29bb0965dd812ec9a5 100644 --- a/bt5/erp5_configurator_standard_ui_test/PathTemplateItem/portal_tests/configurator_standard_zuite/testStandardConfigurationProcess.xml +++ b/bt5/erp5_configurator_standard_ui_test/PathTemplateItem/portal_tests/configurator_standard_zuite/testStandardConfigurationProcess.xml @@ -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 diff --git a/bt5/erp5_configurator_standard_ui_test/PathTemplateItem/portal_tests/configurator_standard_zuite/testStandardConsultingConfigurationProcess.xml b/bt5/erp5_configurator_standard_ui_test/PathTemplateItem/portal_tests/configurator_standard_zuite/testStandardConsultingConfigurationProcess.xml index f277cab32da8139d2fe7f057d2cdbdf71aa132c1..1bd0d627ee022744f82047d7e8bfd765984a69db 100644 --- a/bt5/erp5_configurator_standard_ui_test/PathTemplateItem/portal_tests/configurator_standard_zuite/testStandardConsultingConfigurationProcess.xml +++ b/bt5/erp5_configurator_standard_ui_test/PathTemplateItem/portal_tests/configurator_standard_zuite/testStandardConsultingConfigurationProcess.xml @@ -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 diff --git a/bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_assertEndConfiguration.xml b/bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_assertEndConfiguration.xml new file mode 100644 index 0000000000000000000000000000000000000000..ad0ec9cc42f0439c18ce88f2a09bf7a311d78d1e --- /dev/null +++ b/bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_assertEndConfiguration.xml @@ -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> diff --git a/bt5/erp5_configurator_standard_ui_test/bt/revision b/bt5/erp5_configurator_standard_ui_test/bt/revision index 9ecf271983f3ae6d3519c5a189b10c5c576db411..3114067d5df4da46d3b2492476013a8bbc42108e 100644 --- a/bt5/erp5_configurator_standard_ui_test/bt/revision +++ b/bt5/erp5_configurator_standard_ui_test/bt/revision @@ -1 +1 @@ -660 \ No newline at end of file +664 \ No newline at end of file