slapos_erp5_ui_test: fixup

master/bt5/slapos_erp5_ui_test/PathTemplateItem/portal_tests/renderjs_oss_zuite/testSlapOSJSRenderJSOSS0ServiceWorker.zpt

@@ -14,7 +14,6 @@
     </thead>
     <tbody tal:define="web_site_id python: 'renderjs_oss'">
       <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />
-      <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/set_default_available_language"/>
       <tr>
         <td colspan="3"><b tal:content="python: 'Clone web site'"></b></td>
       </tr>
@@ -40,10 +39,10 @@
         <td>name=Base_createCloneDocument:method</td>
         <td></td>
       </tr>
-      <tr tal:define="portal_type_translation python: here.Base_translateString('Web Site', lang=lang);
+      <tr tal:define="portal_type_translation python: here.Base_translateString('Web Site', lang='en');
                         dummy python: context.REQUEST.set('mapping', {'portal_type': portal_type_translation})">
         <td>verifyTextPresent</td>
-        <td tal:content="python: '%s' % (here.Base_translateString('Created Clone ${portal_type}.', mapping=context.REQUEST.get('mapping', {}), lang=lang))"></td>
+        <td tal:content="python: '%s' % (here.Base_translateString('Created Clone ${portal_type}.', mapping=context.REQUEST.get('mapping', {}), lang='en'))"></td>
         <td></td>
       </tr>
       <tr>
@@ -54,10 +53,10 @@
       <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities" />
       <tr>
         <td>open</td>
-        <td>${base_url}/web_site_module/${install_url}/#/?page=service_worker_test</td>
+        <td>${base_url}/web_site_module/${install_url}/#/?page=test_service_worker</td>
         <td></td>
       </tr>
-      <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/wait_for_app_loaded" />
+      <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_app_loaded" />
       <tr>
         <td>assertTextPresent</td>
         <td>Has SW: false</td>
@@ -80,4 +79,4 @@
   </table>
 </body>
 
-</html>
+</html>
\ No newline at end of file

master/bt5/slapos_erp5_ui_test/PathTemplateItem/portal_tests/renderjs_oss_zuite/testSlapOSJSRenderJSOSSBasicNavigation.zpt

@@ -12,83 +12,46 @@
         <td rowspan="1" colspan="3">Test RenderJS Front Page</td>
       </tr>
     </thead>
-    <tbody>
-      <tal:block tal:define="global web_site_id python: 'renderjs_oss'">
-        <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_init_base" />
-        <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/set_default_available_language"/>
-        <!-- Logout  -->
-        <tr>
-          <td>open</td>
-          <td tal:content="python:'${base_url}/web_site_module/%s/WebSite_logout' % web_site_id">.../WebSite_logout</td>
-          <td></td>
-        </tr>
-        <tr>
-          <td colspan="3"><b> Login as demo_manager_functional_user</b></td>
-        </tr>
-        <tr>
-          <td>open</td>
-          <td tal:content="python:'${base_url}/web_site_module/%s/' % web_site_id"></td>
-          <td></td>
-        </tr>
-        <tr>
-          <td>waitForElementPresent</td>
-          <td>__ac_name</td>
-          <td></td>
-        </tr>
-        <tr>
-          <td>assertElementPresent</td>
-          <td>__ac_name</td>
-          <td></td>
-        </tr>
-        <tr>
-          <td>type</td>
-          <td>__ac_name</td>
-          <td>demo_manager_functional_user</td>
-        </tr>
-        <tr>
-          <td>type</td>
-          <td>__ac_password</td>
-          <td>czz4yt36mshT*</td>
-        </tr>
-        <tr>
-          <td>waitForElementPresent</td>
-          <td tal:content="python: '//input[@value=\'%s\']' % (here.Base_translateString('Login', lang=lang))"></td>
-          <td></td>
-        </tr>
-        <tr>
-          <td>assertElementPresent</td>
-          <td tal:content="python: '//input[@value=\'%s\']' % (here.Base_translateString('Login', lang=lang))"></td>
-          <td></td>
-        </tr>
-        <tr>
-          <td>clickAndWait</td>
-          <td tal:content="python: '//input[@value=\'%s\']' % (here.Base_translateString('Login', lang=lang))"></td>
-          <td></td>
-        </tr>
-        <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/wait_for_app_loaded" />
+    <tbody tal:define="user_configuration python: context.ERP5Site_generateTestUserConfiguration()">
 
-        <tr>
-          <td>waitForElementPresent</td>
-          <td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_erp5_page_slapos_access.html\')]//h1[contains(text(), \'%s\')]' % here.web_page_module.slapos_admin_front_page.getTitle()"></td>
-          <td></td>
-        </tr>
-        <tr>
-          <td>assertElementPresent</td>
-          <td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_erp5_page_slapos_access.html\')]//h1[contains(text(), \'%s\')]' % here.web_page_module.slapos_admin_front_page.getTitle()"></td>
-          <td></td>
-        </tr>
-        <tr>
-         <td>waitForElementPresent</td>
-         <td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_erp5_panel.html\')]//a[text()=\'Ticket Activity\']'"></td>
-         <td></td>
-        </tr>
-        <tr>
-          <td>assertElementPresent</td>
-          <td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_erp5_panel.html\')]//a[text()=\'Ticket Activity\']'"></td>
-          <td></td>
-        </tr>                 
+      <tal:block tal:define="init_configuration python: {'scenario': 'customer'}">
+        <tal:block metal:use-macro="here/Zuite_SlapOSPanelTemplate/macros/slapos_init" />
       </tal:block>
+
+      <tr>
+        <td>open</td>
+        <td>${base_url}/web_site_module/renderjs_oss/#?editable=1</td>
+        <td></td>
+      </tr>
+      <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_app_loaded" />
+
+      <!-- I think we should have yet a new use type of user which is cloud administrator
+        or accountant here. For now use manager is enough.
+      -->
+      <tal:block tal:define="login_configuration python: {'user': user_configuration['manager_login'], 'password': user_configuration['passwd']}">
+        <tal:block metal:use-macro="here/Zuite_SlapOSPanelTemplate/macros/login" />
+      </tal:block>
+      <tr>
+        <td>waitForElementPresent</td>
+        <td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_erp5_page_slapos_access.html\')]//h1[contains(text(), \'%s\')]' % here.web_page_module.slapos_admin_front_page.getTitle()"></td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_erp5_page_slapos_access.html\')]//h1[contains(text(), \'%s\')]' % here.web_page_module.slapos_admin_front_page.getTitle()"></td>
+        <td></td>
+      </tr>
+      <tr>
+       <td>waitForElementPresent</td>
+       <td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_erp5_panel.html\')]//a[text()=\'Ticket Activity\']'"></td>
+       <td></td>
+      </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_erp5_panel.html\')]//a[text()=\'Ticket Activity\']'"></td>
+        <td></td>
+      </tr>                 
     </tbody>
   </table>
 </body>
-</html>
+</html>
\ No newline at end of file

master/bt5/slapos_erp5_ui_test/TestTemplateItem/portal_components/test.erp5.testFunctionalSlapOSRenderJSOSSUIHalStyle.py

@@ -42,14 +42,6 @@ class TestSlapOSRenderJSOSSUIHalStyle(SlapOSTestCaseMixin, ERP5TypeFunctionalTes
     self.portal.web_site_module.renderjs_oss.fixConsistency()
     self.tic()
 
-  def getBusinessTemplateList(self):
-    bt5_list = SlapOSTestCaseMixin.getBusinessTemplateList(self)
-    bt5_list.extend(
-      'slapos_erp5_ui_test',
-    )
-    return bt5_list
-
-
 def test_suite():
   suite = unittest.TestSuite()
   suite.addTest(unittest.makeSuite(TestSlapOSRenderJSOSSUIHalStyle))