slapos_jio_ui_test: use assert to stop the test in case of timeout

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJS0ServiceWorker.zpt

@@ -30,6 +30,11 @@
         <td>name=Base_createCloneDocument:method</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>name=Base_createCloneDocument:method</td>
+        <td></td>
+      </tr>
       <tr>
         <td>clickAndWait</td>
         <td>name=Base_createCloneDocument:method</td>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSAccount.zpt

@@ -146,6 +146,11 @@
         <td>//input[@id="default_address_city" and @value="My New City"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@id="default_address_city" and @value="My New City"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>verifyValue</td>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSAccountCertificate.zpt

@@ -53,11 +53,21 @@
         <td>//textarea[@name="certificate"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//textarea[@name="certificate"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>waitForElementPresent</td>
         <td>//textarea[@name="key"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//textarea[@name="key"]</td>
+        <td></td>
+      </tr>
 
       <tal:block define="header python: 'Request New Certificate'; ">
         <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/assert_page_header" />
@@ -185,11 +195,21 @@
         <td>//textarea[@name="certificate"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//textarea[@name="certificate"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>waitForElementPresent</td>
         <td>//textarea[@name="key"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//textarea[@name="key"]</td>
+        <td></td>
+      </tr>
 
       <tal:block define="header python: 'Request New Certificate'; ">
         <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/assert_page_header" />

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSAccountChangeCurrentPassword.zpt

@@ -62,7 +62,12 @@
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
+        <td>//input[@name="__ac_name"]</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>assertElementPresent</td>
         <td>//input[@name="__ac_password"]</td>
         <td></td>
       </tr>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSAccountForceReLogin.zpt

@@ -34,13 +34,23 @@ function redirect us to the login page -->
         <td tal:content="python: '//label[contains(text(), \'%s\')]' % (here.Base_translateString('Login', lang=lang))"></td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td tal:content="python: '//label[contains(text(), \'%s\')]' % (here.Base_translateString('Login', lang=lang))"></td>
+        <td></td>
+      </tr>
       <tr>
         <td>waitForElementPresent</td>
         <td>//input[@name="__ac_name"]</td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
+        <td>//input[@name="__ac_name"]</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>assertElementPresent</td>
         <td>//input[@name="__ac_password"]</td>
         <td></td>
       </tr>
@@ -66,18 +76,33 @@ function redirect us to the login page -->
         <td>//a[@data-i18n="Login Account"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[@data-i18n="Login Account"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>waitForElementPresent</td>
         <td>//a[@data-i18n="Tickets"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[@data-i18n="Tickets"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>waitForElementPresent</td>
         <td>//a[@data-i18n="Invoices"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[@data-i18n="Invoices"]</td>
+        <td></td>
+      </tr>
 
       <!-- Account Tab -->
       <tr>
@@ -91,98 +116,109 @@ function redirect us to the login page -->
         <td>//button[@data-i18n="Save"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//button[@data-i18n="Save"]</td>
+        <td></td>
+      </tr>
+
       <tr>
         <td>waitForElementPresent</td>
         <td>//a[@data-i18n="Add Login"]</td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
+        <td>//a[@data-i18n="Add Login"]</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>assertElementPresent</td>
         <td>//a[@data-i18n="Add Organisation"]</td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td>//a[@data-i18n="Token"]</td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td>//a[@data-i18n="Request Certificate"]</td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td>//a[@data-i18n="Revoke Certificate"]</td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td tal:content="python: '//label[contains(text(), \'%s\')]' % (here.Base_translateString('First Name', lang=lang))"></td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td tal:content="python: '//label[contains(text(), \'%s\')]' % (here.Base_translateString('Last Name', lang=lang))"></td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td tal:content="python: '//label[contains(text(), \'%s\')]' % (here.Base_translateString('Email', lang=lang))"></td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td>//input[@value="Demo User"]</td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td>//input[@value="Functional"]</td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td>//input[@value="demo@nexedi.com"]</td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td tal:content="python: '//h1[contains(text(), \'%s\')]' % (here.Base_translateString('Logins', lang=lang))"></td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td tal:content="python: '//a[contains(text(), \'%s\')]' % (here.Base_translateString('Reference', lang=lang))"></td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td tal:content="python: '//a[contains(text(), \'%s\')]' % (here.Base_translateString('Type', lang=lang))"></td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td tal:content="python: '//h1[contains(text(), \'%s\')]' % (here.Base_translateString('Organisation', lang=lang))"></td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td tal:content="python: '//th[contains(text(), \'%s\')]' % (here.Base_translateString('Title', lang=lang))"></td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td tal:content="python: '//a[contains(text(), \'%s\')]' % (here.Base_translateString('Reference', lang=lang))"></td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td tal:content="python: '//label[contains(text(), \'%s\')]' % (here.Base_translateString('Email', lang=lang))"></td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td tal:content="python: '//th[contains(text(), \'%s\')]' % (here.Base_translateString('Status', lang=lang))"></td>
         <td></td>
       </tr>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSAccountLogin.zpt

@@ -125,13 +125,23 @@
         <td tal:content="python: '//label[contains(text(), \'%s\')]' % (here.Base_translateString('Login', lang=lang))"></td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td tal:content="python: '//label[contains(text(), \'%s\')]' % (here.Base_translateString('Login', lang=lang))"></td>
+        <td></td>
+      </tr>
       <tr>
         <td>waitForElementPresent</td>
         <td>//input[@name="__ac_name"]</td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
+        <td>//input[@name="__ac_name"]</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>assertElementPresent</td>
         <td>//input[@name="__ac_password"]</td>
         <td></td>
       </tr>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSAccountRemoveCurrentLogin.zpt

@@ -77,7 +77,12 @@
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
+        <td>//input[@name="__ac_name"]</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>assertElementPresent</td>
         <td>//input[@name="__ac_password"]</td>
         <td></td>
       </tr>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSBasicNavigation.zpt

@@ -30,58 +30,63 @@
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
+        <td>//button[@data-i18n='Menu']</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>assertElementPresent</td>
         <td>//a[@data-i18n='Dashboard']</td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td>//a[@data-i18n='Login Account']</td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td>//a[@data-i18n='Tickets']</td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td>//a[@data-i18n='Sites']</td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td>//a[@data-i18n='Projects']</td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td>//a[@data-i18n='Invoices']</td>
         <td></td>
       </tr>
 
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td>//a[@data-i18n='Services']</td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td>//a[@data-i18n='Servers']</td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td>//a[@data-i18n='Networks']</td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td>//a[@data-i18n='Language']</td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td>//a[@data-i18n='Logout']</td>
         <td></td>
       </tr>
@@ -263,16 +268,31 @@
         <td>//button[@data-i18n='Menu']</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//button[@data-i18n='Menu']</td>
+        <td></td>
+      </tr>
       <tr>
         <td>waitForElementPresent</td>
         <td>//a[@data-i18n='Dashboard']</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[@data-i18n='Dashboard']</td>
+        <td></td>
+      </tr>
       <tr>
         <td>waitForElementPresent</td>
         <td>//a[@data-i18n='Login Account']</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[@data-i18n='Login Account']</td>
+        <td></td>
+      </tr>
 
       <tal:block define="person_name python: 'Demo User Functional'">
         <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/access_menu_item_account" />

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSInvoice.zpt

@@ -31,15 +31,20 @@
         <td>//a[@data-i18n="Login Account"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[@data-i18n="Login Account"]</td>
+        <td></td>
+      </tr>
 
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td>//a[@data-i18n="Tickets"]</td>
         <td></td>
       </tr>
 
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td>//a[@data-i18n="Invoices"]</td>
         <td></td>
       </tr>
@@ -65,6 +70,11 @@
         <td>//p[@data-date='2019-10-20']</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//p[@data-date='2019-10-20']</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//p[@data-date='2019-10-20']</td>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSNetwork.zpt

@@ -79,6 +79,11 @@
         <td>//a[text()="TEST-SLAPOSJS-NETWORK 1"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-NETWORK 1"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-NETWORK 1"]</td>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSNetworkSharedByOrganisation.zpt

@@ -46,6 +46,11 @@
         <td>//a[text()="TEST-SLAPOSJS-NETWORK-BY-ORGANISATION 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-NETWORK-BY-ORGANISATION 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-NETWORK-BY-ORGANISATION 0"]</td>
@@ -74,6 +79,11 @@
         <td>//select[@name="destination_section"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//select[@name="destination_section"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>select</td>
@@ -104,6 +114,11 @@
         <td>//a[text()="TEST-SLAPOSJS-NETWORK-BY-ORGANISATION 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-NETWORK-BY-ORGANISATION 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-NETWORK-BY-ORGANISATION 0"]</td>
@@ -120,6 +135,11 @@
         <td>TEST-SLAPOSJS-ORGANISATION-TO-SHARE-NETWORK 0</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertTextPresent</td>
+        <td>TEST-SLAPOSJS-ORGANISATION-TO-SHARE-NETWORK 0</td>
+        <td></td>
+      </tr>
 
       <tal:block define="person_name python: 'Demo User Functional'">
         <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/access_menu_item_account" />
@@ -135,6 +155,11 @@
         <td>//a[text()="TEST-SLAPOSJS-ORGANISATION-TO-SHARE-NETWORK 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-ORGANISATION-TO-SHARE-NETWORK 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-ORGANISATION-TO-SHARE-NETWORK 0"]</td>
@@ -175,6 +200,11 @@
   <td>//p[@id="invitation_link"]</td>
   <td></td>
 </tr>
+<tr>
+  <td>assertElementPresent</td>
+  <td>//p[@id="invitation_link"]</td>
+  <td></td>
+</tr>
 
 <tr>
     <td>storeText</td>
@@ -247,6 +277,11 @@
   <td>TEST-SLAPOSJS-ORGANISATION-TO-SHARE-NETWORK 0</td>
   <td></td>
 </tr>
+<tr>
+  <td>assertTextPresent</td>
+  <td>TEST-SLAPOSJS-ORGANISATION-TO-SHARE-NETWORK 0</td>
+  <td></td>
+</tr>
 
 <tal:block define="menu_item python: 'Networks'; header menu_item">
   <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/access_menu_item" />
@@ -263,6 +298,11 @@
   <td>//a[text()="TEST-SLAPOSJS-NETWORK-BY-ORGANISATION 0"]</td>
   <td></td>
 </tr>
+<tr>
+  <td>assertElementPresent</td>
+  <td>//a[text()="TEST-SLAPOSJS-NETWORK-BY-ORGANISATION 0"]</td>
+  <td></td>
+</tr>
 <tr>
   <td>click</td>
   <td>//a[text()="TEST-SLAPOSJS-NETWORK-BY-ORGANISATION 0"]</td>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSNetworkSharedByProject.zpt

@@ -46,6 +46,11 @@
         <td>//a[text()="TEST-SLAPOSJS-NETWORK-BY-PROJECT 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-NETWORK-BY-PROJECT 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-NETWORK-BY-PROJECT 0"]</td>
@@ -74,6 +79,11 @@
         <td>//select[@name="destination_project"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//select[@name="destination_project"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>select</td>
@@ -104,6 +114,11 @@
         <td>//a[text()="TEST-SLAPOSJS-NETWORK-BY-PROJECT 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-NETWORK-BY-PROJECT 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-NETWORK-BY-PROJECT 0"]</td>
@@ -120,6 +135,11 @@
         <td>TEST-SLAPOSJS-PROJECT-TO-SHARE-NETWORK 0</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertTextPresent</td>
+        <td>TEST-SLAPOSJS-PROJECT-TO-SHARE-NETWORK 0</td>
+        <td></td>
+      </tr>
 
       <tal:block define="menu_item python: 'Projects'; header menu_item">
         <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/access_menu_item" />
@@ -135,6 +155,11 @@
         <td>//a[text()="TEST-SLAPOSJS-PROJECT-TO-SHARE-NETWORK 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-PROJECT-TO-SHARE-NETWORK 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-PROJECT-TO-SHARE-NETWORK 0"]</td>
@@ -175,6 +200,11 @@
   <td>//p[@id="invitation_link"]</td>
   <td></td>
 </tr>
+<tr>
+  <td>assertElementPresent</td>
+  <td>//p[@id="invitation_link"]</td>
+  <td></td>
+</tr>
 
 <tr>
     <td>storeText</td>
@@ -242,6 +272,11 @@
   <td>TEST-SLAPOSJS-PROJECT-TO-SHARE-NETWORK 0</td>
   <td></td>
 </tr>
+<tr>
+  <td>assertTextPresent</td>
+  <td>TEST-SLAPOSJS-PROJECT-TO-SHARE-NETWORK 0</td>
+  <td></td>
+</tr>
 
 <tal:block define="menu_item python: 'Networks'; header menu_item">
   <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/access_menu_item" />
@@ -258,6 +293,12 @@
   <td>//a[text()="TEST-SLAPOSJS-NETWORK-BY-PROJECT 0"]</td>
   <td></td>
 </tr>
+<tr>
+  <td>assertElementPresent</td>
+  <td>//a[text()="TEST-SLAPOSJS-NETWORK-BY-PROJECT 0"]</td>
+  <td></td>
+</tr>
+
 <tr>
   <td>click</td>
   <td>//a[text()="TEST-SLAPOSJS-NETWORK-BY-PROJECT 0"]</td>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSOrganisationInvitation.zpt

@@ -93,6 +93,11 @@
         <td>//p[@id="invitation_link"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//p[@id="invitation_link"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>storeText</td>
@@ -197,6 +202,11 @@
         <td>demo_test_organisation_from_testSlapOSJSOrganisationInvitation</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertTextPresent</td>
+        <td>demo_test_organisation_from_testSlapOSJSOrganisationInvitation</td>
+        <td></td>
+      </tr>
 
       <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_logout" />
 

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSProject.zpt

@@ -57,6 +57,11 @@
         <td>//a[text()="TEST-SLAPOSJS-PROJECT 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-PROJECT 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-PROJECT 0"]</td>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSProjectInvitation.zpt

@@ -50,6 +50,11 @@
         <td>//p[@id="invitation_link"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//p[@id="invitation_link"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>storeText</td>
@@ -151,6 +156,11 @@
         <td>TEST-SLAPOSJS-PROJECT-INVITATION 0</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertTextPresent</td>
+        <td>TEST-SLAPOSJS-PROJECT-INVITATION 0</td>
+        <td></td>
+      </tr>
 
       <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_logout" />
 

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSRegularisationRequest.zpt

@@ -53,6 +53,11 @@
         <td>//a[text()='Account regularisation expected for "Demo User Functional"']</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()='Account regularisation expected for "Demo User Functional"']</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()='Account regularisation expected for "Demo User Functional"']</td>
@@ -69,6 +74,11 @@
         <td>//div[contains(@data-gadget-url, 'gadget_slapos_event_discussion_entry.html')]//div[@class="slapos-event-discussion-message-header"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//div[contains(@data-gadget-url, 'gadget_slapos_event_discussion_entry.html')]//div[@class="slapos-event-discussion-message-header"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>verifyTextPresent</td>
         <td>Demo User Functional</td>
@@ -93,6 +103,11 @@
         <td>//textarea[@id="text_content"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//textarea[@id="text_content"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>type</td>
         <td>//textarea[@id="text_content"]</td>
@@ -106,6 +121,11 @@
         <td>Account regularisation expected for "Demo User Functional"</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertTextPresent</td>
+        <td>Account regularisation expected for "Demo User Functional"</td>
+        <td></td>
+      </tr>
 
       <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page" />
 
@@ -123,6 +143,11 @@
         <td>//a[text()='Account regularisation expected for "Demo User Functional"']</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()='Account regularisation expected for "Demo User Functional"']</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()='Account regularisation expected for "Demo User Functional"']</td>
@@ -138,6 +163,11 @@
         <td>//div[contains(@data-gadget-url, 'gadget_slapos_event_discussion_entry.html')]//div[@class="slapos-event-discussion-message-header"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//div[contains(@data-gadget-url, 'gadget_slapos_event_discussion_entry.html')]//div[@class="slapos-event-discussion-message-header"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>verifyTextPresent</td>
         <td>TEST-SLAPOSJS-SUPPORT-REQUEST NEW MESSAGE</td>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSResetPasswordByMail.zpt

@@ -33,11 +33,21 @@
         <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>waitForElementPresent</td>
         <td tal:content="python: '//a[text()=\'%s\']' % (here.Base_translateString('I forgot my password!', lang=lang))"></td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td tal:content="python: '//a[text()=\'%s\']' % (here.Base_translateString('I forgot my password!', lang=lang))"></td>
+        <td></td>
+      </tr>
       <tr>
         <td>clickAndWait</td>
         <td tal:content="python: '//a[text()=\'%s\']' % (here.Base_translateString('I forgot my password!', lang=lang))"></td>
@@ -49,12 +59,22 @@
         <td tal:content="python: '//input[@value=\'%s\']' % (here.Base_translateString('Validate', lang=lang))"></td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td tal:content="python: '//input[@value=\'%s\']' % (here.Base_translateString('Validate', lang=lang))"></td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>waitForElementPresent</td>
         <td>//input[@name='user_login']</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@name='user_login']</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>type</td>
@@ -117,6 +137,11 @@
         <td>//input[@name='password']</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@name='password']</td>
+        <td></td>
+      </tr>
       <tr>
         <td>type</td>
         <td>//input[@name='password']</td>
@@ -127,6 +152,11 @@
         <td>//input[@name='password_confirm']</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@name='password_confirm']</td>
+        <td></td>
+      </tr>
       <tr>
         <td>type</td>
         <td>//input[@name='password_confirm']</td>
@@ -160,12 +190,22 @@
         <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>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>
@@ -181,6 +221,11 @@
         <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>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServer.zpt

@@ -39,6 +39,11 @@
         <td>//a[text()="TEST-SLAPOSJS-COMPUTER 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-COMPUTER 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-COMPUTER 0"]</td>
@@ -84,6 +89,11 @@
         <td>//td/a[text()="Frontend"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//td/a[text()="Frontend"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//td/a[text()="Frontend"]</td>
@@ -122,17 +132,31 @@
         <td tal:content="python: '//label[text()=\'%s\']' % (here.Base_translateString('Software Release to be Installed', lang=lang))"></td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td tal:content="python: '//label[text()=\'%s\']' % (here.Base_translateString('Software Release to be Installed', lang=lang))"></td>
+        <td></td>
+      </tr>
       <tr>
         <td>waitForElementPresent</td>
         <td tal:content="python: '//label[text()=\'%s\']' % (here.Base_translateString('Target Compute Node Title', lang=lang))"></td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td tal:content="python: '//label[text()=\'%s\']' % (here.Base_translateString('Target Compute Node Title', lang=lang))"></td>
+        <td></td>
+      </tr>
       <tr>
         <td>waitForElementPresent</td>
         <td>//p[text()="TEST-SLAPOSJS-COMPUTER 0"]</td>
         <td></td>
       </tr>
-
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//p[text()="TEST-SLAPOSJS-COMPUTER 0"]</td>
+        <td></td>
+      </tr>
 
       <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/click_proceed" />
 
@@ -150,6 +174,11 @@
         <td>//a[text()="TEST-SLAPOSJS-COMPUTER 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-COMPUTER 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-COMPUTER 0"]</td>
@@ -185,6 +214,11 @@
         <td>//a[text()="TEST-SLAPOSJS-COMPUTER 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-COMPUTER 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-COMPUTER 0"]</td>
@@ -263,6 +297,11 @@
         <td>//a[text()="TEST-SLAPOSJS-COMPUTER 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-COMPUTER 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-COMPUTER 0"]</td>
@@ -423,7 +462,12 @@
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
+        <td>//textarea[@name="certificate"]</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>assertElementPresent</td>
         <td>//textarea[@name="key"]</td>
         <td></td>
       </tr>
@@ -447,6 +491,11 @@
         <td>//select[@id="allocation_scope"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//select[@id="allocation_scope"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>select</td>
         <td>//select[@id="allocation_scope"]</td>
@@ -460,6 +509,11 @@
         <td>//textarea[@id="subject_list"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//textarea[@id="subject_list"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>type</td>
         <td>//textarea[@id="subject_list"]</td>
@@ -494,6 +548,11 @@
         <td>//a[text()="TEST-SLAPOSJS-COMPUTER 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-COMPUTER 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-COMPUTER 0"]</td>
@@ -514,6 +573,11 @@
         <td>//select[@id="allocation_scope"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//select[@id="allocation_scope"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>select</td>
         <td>//select[@id="allocation_scope"]</td>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServerSharedByOrganisation.zpt

@@ -44,6 +44,11 @@
         <td>//a[text()="TEST-SLAPOSJS-COMPUTER-SHARED-BY-ORGANISATION 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-COMPUTER-SHARED-BY-ORGANISATION 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-COMPUTER-SHARED-BY-ORGANISATION 0"]</td>
@@ -54,6 +59,11 @@
         <td tal:content="python: '//a[@data-i18n=\'%s\']' % (here.Base_translateString('Compute Node: ${title}', mapping=context.REQUEST.get('mapping', {}), lang=lang))"></td>
         <td></td>
       </tr>
+      <tr tal:define="dummy python: context.REQUEST.set('mapping', {'title': 'TEST-SLAPOSJS-COMPUTER-SHARED-BY-ORGANISATION 0'})">
+        <td>assertElementPresent</td>
+        <td tal:content="python: '//a[@data-i18n=\'%s\']' % (here.Base_translateString('Compute Node: ${title}', mapping=context.REQUEST.get('mapping', {}), lang=lang))"></td>
+        <td></td>
+      </tr>
 
       <tr>
         <td colspan="3"><b tal:content="python: 'Transfer Compute Node to a Organisation'"> Menu Item </b></td>
@@ -72,6 +82,11 @@
         <td>//select[@name="destination_section"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//select[@name="destination_section"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>select</td>
@@ -102,6 +117,11 @@
         <td>//a[text()="TEST-SLAPOSJS-COMPUTER-SHARED-BY-ORGANISATION 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-COMPUTER-SHARED-BY-ORGANISATION 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-COMPUTER-SHARED-BY-ORGANISATION 0"]</td>
@@ -118,6 +138,11 @@
         <td>TEST-SLAPOSJS-COMPUTER-SHARED-BY-ORGANISATION 0</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertTextPresent</td>
+        <td>TEST-SLAPOSJS-COMPUTER-SHARED-BY-ORGANISATION 0</td>
+        <td></td>
+      </tr>
 
       <tal:block define="person_name python: 'Demo User Functional'">
         <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/access_menu_item_account" />
@@ -133,6 +158,11 @@
         <td>//a[text()="TEST-SLAPOSJS-ORGANISATION-TO-SHARE-COMPUTER 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-ORGANISATION-TO-SHARE-COMPUTER 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-ORGANISATION-TO-SHARE-COMPUTER 0"]</td>
@@ -173,6 +203,11 @@
   <td>//p[@id="invitation_link"]</td>
   <td></td>
 </tr>
+<tr>
+  <td>assertElementPresent</td>
+  <td>//p[@id="invitation_link"]</td>
+  <td></td>
+</tr>
 
 <tr>
     <td>storeText</td>
@@ -245,6 +280,11 @@
   <td>TEST-SLAPOSJS-ORGANISATION-TO-SHARE-COMPUTER 0</td>
   <td></td>
 </tr>
+<tr>
+  <td>assertTextPresent</td>
+  <td>TEST-SLAPOSJS-ORGANISATION-TO-SHARE-COMPUTER 0</td>
+  <td></td>
+</tr>
 
 <tal:block define="menu_item python: 'Servers'; header menu_item">
   <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/access_menu_item" />
@@ -261,6 +301,11 @@
   <td>//a[text()="TEST-SLAPOSJS-COMPUTER-SHARED-BY-ORGANISATION 0"]</td>
   <td></td>
 </tr>
+<tr>
+  <td>assertElementPresent</td>
+  <td>//a[text()="TEST-SLAPOSJS-COMPUTER-SHARED-BY-ORGANISATION 0"]</td>
+  <td></td>
+</tr>
 <tr>
   <td>click</td>
   <td>//a[text()="TEST-SLAPOSJS-COMPUTER-SHARED-BY-ORGANISATION 0"]</td>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServerSharedByProject.zpt

@@ -45,6 +45,11 @@
         <td>//select[@name="destination_project"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//select[@name="destination_project"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>select</td>
@@ -75,6 +80,11 @@
         <td>//a[text()="TEST-SLAPOSJS-COMPUTER-SHARED-BY-PROJECT 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-COMPUTER-SHARED-BY-PROJECT 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-COMPUTER-SHARED-BY-PROJECT 0"]</td>
@@ -91,6 +101,11 @@
         <td>TEST-SLAPOSJS-PROJECT-TO-SHARE-COMPUTER 0</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertTextPresent</td>
+        <td>TEST-SLAPOSJS-PROJECT-TO-SHARE-COMPUTER 0</td>
+        <td></td>
+      </tr>
 
       <tal:block define="menu_item python: 'Projects'; header menu_item">
         <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/access_menu_item" />
@@ -106,6 +121,11 @@
         <td>//a[text()="TEST-SLAPOSJS-PROJECT-TO-SHARE-COMPUTER 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-PROJECT-TO-SHARE-COMPUTER 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-PROJECT-TO-SHARE-COMPUTER 0"]</td>
@@ -146,6 +166,11 @@
   <td>//p[@id="invitation_link"]</td>
   <td></td>
 </tr>
+<tr>
+  <td>assertElementPresent</td>
+  <td>//p[@id="invitation_link"]</td>
+  <td></td>
+</tr>
 
 <tr>
     <td>storeText</td>
@@ -213,6 +238,11 @@
   <td>TEST-SLAPOSJS-PROJECT-TO-SHARE-COMPUTER 0</td>
   <td></td>
 </tr>
+<tr>
+  <td>assertTextPresent</td>
+  <td>TEST-SLAPOSJS-PROJECT-TO-SHARE-COMPUTER 0</td>
+  <td></td>
+</tr>
 
 <tal:block define="menu_item python: 'Servers'; header menu_item">
   <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/access_menu_item" />
@@ -229,6 +259,11 @@
   <td>//a[text()="TEST-SLAPOSJS-COMPUTER-SHARED-BY-PROJECT 0"]</td>
   <td></td>
 </tr>
+<tr>
+  <td>assertElementPresent</td>
+  <td>//a[text()="TEST-SLAPOSJS-COMPUTER-SHARED-BY-PROJECT 0"]</td>
+  <td></td>
+</tr>
 <tr>
   <td>click</td>
   <td>//a[text()="TEST-SLAPOSJS-COMPUTER-SHARED-BY-PROJECT 0"]</td>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSService.zpt

@@ -57,6 +57,11 @@
         <td>//input[@id="title"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@id="title"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>type</td>
@@ -103,6 +108,11 @@
         <td>//input[@name="//domain"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@name="//domain"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>type</td>
@@ -145,6 +155,11 @@
         <td>//a[text()="TEST-SLAPOSJS-SERVICE-FRONTEND 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-SERVICE-FRONTEND 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-SERVICE-FRONTEND 0"]</td>
@@ -155,6 +170,11 @@
         <td tal:content="python: '//a[@data-i18n= \'%s\']' % (here.Base_translateString('Instance Tree: ${title}', mapping=context.REQUEST.get('mapping', {}), lang=lang))"></td>
         <td></td>
       </tr>
+      <tr tal:define="dummy python: context.REQUEST.set('mapping', {'title': 'TEST-SLAPOSJS-SERVICE-FRONTEND 0'})">
+        <td>assertElementPresent</td>
+        <td tal:content="python: '//a[@data-i18n= \'%s\']' % (here.Base_translateString('Instance Tree: ${title}', mapping=context.REQUEST.get('mapping', {}), lang=lang))"></td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>waitForElementPresent</td>
@@ -194,6 +214,11 @@
         <td>//input[@name="//domain"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@name="//domain"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>verifyValue</td>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServiceDuplicatedRequest.zpt

@@ -58,6 +58,11 @@
         <td>//input[@id="title"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@id="title"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>type</td>
@@ -104,6 +109,11 @@
         <td>//input[@name="//public-ipv4"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@name="//public-ipv4"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>type</td>
@@ -134,6 +144,11 @@
         <td>//a[text()="TEST-SLAPOSJS-SERVICE-FRONTEND 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-SERVICE-FRONTEND 0"]</td>
+        <td></td>
+      </tr>
 
       <tal:block define="menu_action python: 'Add'">
         <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/click_submenu_action" />
@@ -166,6 +181,11 @@
         <td>//input[@id="title"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@id="title"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>type</td>
@@ -212,6 +232,11 @@
         <td>//input[@name="//public-ipv4"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@name="//public-ipv4"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>type</td>
@@ -240,6 +265,11 @@
         <td>//a[text()="TEST-SLAPOSJS-SERVICE-FRONTEND 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-SERVICE-FRONTEND 0"]</td>
+        <td></td>
+      </tr>
 
       <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_logout" />
 

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServiceJSONSerialisation.zpt

@@ -57,6 +57,11 @@
         <td>//input[@id="title"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@id="title"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>type</td>
@@ -102,6 +107,11 @@
         <td>//input[@name="ADD//kvm-partition-dict"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@name="ADD//kvm-partition-dict"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>type</td>
@@ -114,6 +124,11 @@
         <td>//button[@name="//kvm-partition-dict"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//button[@name="//kvm-partition-dict"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>click</td>
@@ -126,6 +141,11 @@
         <td>//input[@name="//kvm-partition-dict/KVM-CLUSTER-INSTANCE-0/disk-size"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@name="//kvm-partition-dict/KVM-CLUSTER-INSTANCE-0/disk-size"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>type</td>
@@ -138,6 +158,11 @@
         <td>//select[@name="//kvm-partition-dict/KVM-CLUSTER-INSTANCE-0/boot-image-url-select"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//select[@name="//kvm-partition-dict/KVM-CLUSTER-INSTANCE-0/boot-image-url-select"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>select</td>
@@ -149,6 +174,11 @@
         <td>//input[@name="ADD//kvm-partition-dict"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@name="ADD//kvm-partition-dict"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>type</td>
@@ -161,6 +191,11 @@
         <td>//button[@name="//kvm-partition-dict"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//button[@name="//kvm-partition-dict"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>click</td>
@@ -173,6 +208,11 @@
         <td>//input[@name="//kvm-partition-dict/KVM-CLUSTER-INSTANCE-1/disk-size"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@name="//kvm-partition-dict/KVM-CLUSTER-INSTANCE-1/disk-size"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>type</td>
@@ -204,6 +244,11 @@
         <td>//a[text()="TEST-SLAPOSJS-SERVICE-KVM-CLUSTER 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-SERVICE-KVM-CLUSTER 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-SERVICE-KVM-CLUSTER 0"]</td>
@@ -214,6 +259,11 @@
         <td tal:content="python: '//a[@data-i18n= \'%s\']' % (here.Base_translateString('Instance Tree: ${title}', mapping=context.REQUEST.get('mapping', {}), lang=lang))"></td>
         <td></td>
       </tr>
+      <tr tal:define="dummy python: context.REQUEST.set('mapping', {'title': 'TEST-SLAPOSJS-SERVICE-KVM-CLUSTER 0'})">
+        <td>assertElementPresent</td>
+        <td tal:content="python: '//a[@data-i18n= \'%s\']' % (here.Base_translateString('Instance Tree: ${title}', mapping=context.REQUEST.get('mapping', {}), lang=lang))"></td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>waitForElementPresent</td>
@@ -257,6 +307,11 @@
         <td>//span[@class="bt_close CLOSE//kvm-partition-dict/KVM-CLUSTER-INSTANCE-1"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//span[@class="bt_close CLOSE//kvm-partition-dict/KVM-CLUSTER-INSTANCE-1"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>click</td>
@@ -292,6 +347,11 @@
         <td>//a[text()="TEST-SLAPOSJS-SERVICE-KVM-CLUSTER 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-SERVICE-KVM-CLUSTER 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-SERVICE-KVM-CLUSTER 0"]</td>
@@ -303,6 +363,11 @@
         <td tal:content="python: '//a[@data-i18n= \'%s\']' % (here.Base_translateString('Instance Tree: ${title}', mapping=context.REQUEST.get('mapping', {}), lang=lang))"></td>
         <td></td>
       </tr>
+      <tr tal:define="dummy python: context.REQUEST.set('mapping', {'title': 'TEST-SLAPOSJS-SERVICE-KVM-CLUSTER 0'})">
+        <td>assertElementPresent</td>
+        <td tal:content="python: '//a[@data-i18n= \'%s\']' % (here.Base_translateString('Instance Tree: ${title}', mapping=context.REQUEST.get('mapping', {}), lang=lang))"></td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>waitForElementPresent</td>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServiceSharedByOrganisation.zpt

@@ -67,6 +67,11 @@
         <td>//td/a[text()="Frontend"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//td/a[text()="Frontend"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//td/a[text()="Frontend"]</td>
@@ -115,6 +120,11 @@
         <td>//input[@id="title"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@id="title"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>type</td>
@@ -161,6 +171,11 @@
         <td>//input[@name="//public-ipv4"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@name="//public-ipv4"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>type</td>
@@ -192,6 +207,11 @@
         <td>//a[text()="TEST-SLAPOSJS-SERVICE-SHARED-BY-ORGANISATION 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-SERVICE-SHARED-BY-ORGANISATION 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-SERVICE-SHARED-BY-ORGANISATION 0"]</td>
@@ -202,6 +222,11 @@
         <td tal:content="python: '//a[@data-i18n= \'%s\']' % (here.Base_translateString('Instance Tree: ${title}', mapping=context.REQUEST.get('mapping', {}), lang=lang))"></td>
         <td></td>
       </tr>
+      <tr tal:define="dummy python: context.REQUEST.set('mapping', {'title': 'TEST-SLAPOSJS-SERVICE-SHARED-BY-ORGANISATION 0'})">
+        <td>assertElementPresent</td>
+        <td tal:content="python: '//a[@data-i18n= \'%s\']' % (here.Base_translateString('Instance Tree: ${title}', mapping=context.REQUEST.get('mapping', {}), lang=lang))"></td>
+        <td></td>
+      </tr>
 
       <tr>
         <td colspan="3"><b tal:content="python: 'Transfer Service to a Organisation'"> Menu Item </b></td>
@@ -220,6 +245,11 @@
         <td>//select[@name="destination"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//select[@name="destination"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>select</td>
@@ -250,6 +280,11 @@
         <td>//a[text()="TEST-SLAPOSJS-SERVICE-SHARED-BY-ORGANISATION 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-SERVICE-SHARED-BY-ORGANISATION 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-SERVICE-SHARED-BY-ORGANISATION 0"]</td>
@@ -266,6 +301,11 @@
         <td>TEST-SLAPOSJS-ORGANISATION-TO-SHARE-SERVICE 0</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertTextPresent</td>
+        <td>TEST-SLAPOSJS-ORGANISATION-TO-SHARE-SERVICE 0</td>
+        <td></td>
+      </tr>
 
       <tal:block define="person_name python: 'Demo User Functional'">
         <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/access_menu_item_account" />
@@ -281,6 +321,11 @@
         <td>//a[text()="TEST-SLAPOSJS-ORGANISATION-TO-SHARE-SERVICE 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-ORGANISATION-TO-SHARE-SERVICE 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-ORGANISATION-TO-SHARE-SERVICE 0"]</td>
@@ -321,6 +366,11 @@
   <td>//p[@id="invitation_link"]</td>
   <td></td>
 </tr>
+<tr>
+  <td>assertElementPresent</td>
+  <td>//p[@id="invitation_link"]</td>
+  <td></td>
+</tr>
 
 <tr>
     <td>storeText</td>
@@ -393,6 +443,11 @@
   <td>TEST-SLAPOSJS-ORGANISATION-TO-SHARE-SERVICE 0</td>
   <td></td>
 </tr>
+<tr>
+  <td>assertTextPresent</td>
+  <td>TEST-SLAPOSJS-ORGANISATION-TO-SHARE-SERVICE 0</td>
+  <td></td>
+</tr>
 
 <tal:block define="menu_item python: 'Services'; header menu_item">
   <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/access_menu_item" />
@@ -409,6 +464,11 @@
   <td>//a[text()="TEST-SLAPOSJS-SERVICE-SHARED-BY-ORGANISATION 0"]</td>
   <td></td>
 </tr>
+<tr>
+  <td>assertElementPresent</td>
+  <td>//a[text()="TEST-SLAPOSJS-SERVICE-SHARED-BY-ORGANISATION 0"]</td>
+  <td></td>
+</tr>
 <tr>
   <td>click</td>
   <td>//a[text()="TEST-SLAPOSJS-SERVICE-SHARED-BY-ORGANISATION 0"]</td>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServiceSharedByProject.zpt

@@ -67,6 +67,11 @@
         <td>//td/a[text()="Frontend"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//td/a[text()="Frontend"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//td/a[text()="Frontend"]</td>
@@ -115,6 +120,11 @@
         <td>//input[@id="title"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@id="title"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>type</td>
@@ -161,6 +171,11 @@
         <td>//input[@name="//public-ipv4"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@name="//public-ipv4"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>type</td>
@@ -192,6 +207,11 @@
         <td>//a[text()="TEST-SLAPOSJS-SERVICE-SHARED-BY-PROJECT 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-SERVICE-SHARED-BY-PROJECT 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-SERVICE-SHARED-BY-PROJECT 0"]</td>
@@ -202,6 +222,11 @@
         <td tal:content="python: '//a[@data-i18n= \'%s\']' % (here.Base_translateString('Instance Tree: ${title}', mapping=context.REQUEST.get('mapping', {}), lang=lang))"></td>
         <td></td>
       </tr>
+      <tr tal:define="dummy python: context.REQUEST.set('mapping', {'title': 'TEST-SLAPOSJS-SERVICE-SHARED-BY-PROJECT 0'})">
+        <td>assertElementPresent</td>
+        <td tal:content="python: '//a[@data-i18n= \'%s\']' % (here.Base_translateString('Instance Tree: ${title}', mapping=context.REQUEST.get('mapping', {}), lang=lang))"></td>
+        <td></td>
+      </tr>
 
       <tr>
         <td colspan="3"><b tal:content="python: 'Transfer Service to a Project'"> Menu Item </b></td>
@@ -220,6 +245,11 @@
         <td>//select[@name="destination_project"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//select[@name="destination_project"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>select</td>
@@ -250,6 +280,11 @@
         <td>//a[text()="TEST-SLAPOSJS-SERVICE-SHARED-BY-PROJECT 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-SERVICE-SHARED-BY-PROJECT 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-SERVICE-SHARED-BY-PROJECT 0"]</td>
@@ -266,6 +301,11 @@
         <td>TEST-SLAPOSJS-SERVICE-SHARED-BY-PROJECT 0</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertTextPresent</td>
+        <td>TEST-SLAPOSJS-SERVICE-SHARED-BY-PROJECT 0</td>
+        <td></td>
+      </tr>
 
       <tal:block define="menu_item python: 'Projects'; header menu_item">
         <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/access_menu_item" />
@@ -281,6 +321,11 @@
         <td>//a[text()="TEST-SLAPOSJS-PROJECT-TO-SHARE-SERVICE 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-PROJECT-TO-SHARE-SERVICE 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-PROJECT-TO-SHARE-SERVICE 0"]</td>
@@ -321,6 +366,11 @@
         <td>//p[@id="invitation_link"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//p[@id="invitation_link"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>storeText</td>
@@ -392,6 +442,11 @@
         <td>TEST-SLAPOSJS-PROJECT-TO-SHARE-SERVICE 0</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertTextPresent</td>
+        <td>TEST-SLAPOSJS-PROJECT-TO-SHARE-SERVICE 0</td>
+        <td></td>
+      </tr>
 
       <tal:block define="menu_item python: 'Services'; header menu_item">
         <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/access_menu_item" />
@@ -408,6 +463,11 @@
         <td>//a[text()="TEST-SLAPOSJS-SERVICE-SHARED-BY-PROJECT 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-SERVICE-SHARED-BY-PROJECT 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-SERVICE-SHARED-BY-PROJECT 0"]</td>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServiceSlave.zpt

@@ -57,6 +57,11 @@
         <td>//input[@id="title"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@id="title"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>type</td>
@@ -97,6 +102,11 @@
         <td>//input[@name="//url"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@name="//url"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>type</td>
@@ -127,6 +137,11 @@
         <td>//a[text()="TEST-SLAPOSJS-SERVICE-FRONTEND 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-SERVICE-FRONTEND 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-SERVICE-FRONTEND 0"]</td>
@@ -137,6 +152,11 @@
         <td tal:content="python: '//a[@data-i18n= \'%s\']' % (here.Base_translateString('Instance Tree: ${title}', mapping=context.REQUEST.get('mapping', {}), lang=lang))"></td>
         <td></td>
       </tr>
+      <tr tal:define="dummy python: context.REQUEST.set('mapping', {'title': 'TEST-SLAPOSJS-SERVICE-FRONTEND 0'})">
+        <td>assertElementPresent</td>
+        <td tal:content="python: '//a[@data-i18n= \'%s\']' % (here.Base_translateString('Instance Tree: ${title}', mapping=context.REQUEST.get('mapping', {}), lang=lang))"></td>
+        <td></td>
+      </tr>
 
       <!-- Update Parameters -->
       <!-- Update Add Ticket -->

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSSite.zpt

@@ -83,6 +83,11 @@
         <td>//a[text()="TEST-SLAPOSJS-SET 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-SET 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-SET 0"]</td>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSSubscribe.zpt

@@ -55,11 +55,21 @@
         <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>waitForElementPresent</td>
         <td tal:content="python: '//a[text()=\'%s\']' % (here.Base_translateString(' Create New Account ', lang=lang))"></td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td tal:content="python: '//a[text()=\'%s\']' % (here.Base_translateString(' Create New Account ', lang=lang))"></td>
+        <td></td>
+      </tr>
       <tr>
         <td>clickAndWait</td>
         <td tal:content="python: '//a[text()=\'%s\']' % (here.Base_translateString(' Create New Account ', lang=lang))"></td>
@@ -71,12 +81,12 @@
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td>//input[@name='first_name']</td>
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td>//input[@value='Register']</td>
         <td></td>
       </tr>
@@ -160,6 +170,11 @@
         <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 tal:define="portal_type_translation python: here.Base_translateString('Credential Request', lang=lang);
                         dummy python: context.REQUEST.set('mapping', {'portal_type': portal_type_translation})">
         <td>assertTextPresent</td>
@@ -187,6 +202,11 @@
         <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>
@@ -202,6 +222,11 @@
         <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>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSSubscriptionAccessDenied.zpt

@@ -57,6 +57,11 @@
         <td>//input[@id="title"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@id="title"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>type</td>
@@ -102,6 +107,11 @@
         <td>//input[@name="//public-ipv4"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@name="//public-ipv4"]</td>
+        <td></td>
+      </tr>
 
       <tr>
         <td>type</td>
@@ -132,6 +142,11 @@
         <td>//a[text()="TEST-SLAPOSJS-SERVICE-FRONTEND 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-SERVICE-FRONTEND 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-SERVICE-FRONTEND 0"]</td>
@@ -142,6 +157,11 @@
         <td tal:content="python: '//a[@data-i18n=\'%s\']' % (here.Base_translateString('Instance Tree: ${title}', mapping=context.REQUEST.get('mapping', {}), lang=lang))"></td>
         <td></td>
       </tr>
+      <tr tal:define="dummy python: context.REQUEST.set('mapping', {'title': 'TEST-SLAPOSJS-SERVICE-FRONTEND 0'})">
+        <td>assertElementPresent</td>
+        <td tal:content="python: '//a[@data-i18n=\'%s\']' % (here.Base_translateString('Instance Tree: ${title}', mapping=context.REQUEST.get('mapping', {}), lang=lang))"></td>
+        <td></td>
+      </tr>
       <tr>
         <td>storeLocation</td>
         <td>instance_tree_link</td>
@@ -167,7 +187,12 @@
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</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: '//a[text()=\'%s\']' % (here.Base_translateString(' Create New Account ', lang=lang))"></td>
         <td></td>
       </tr>
@@ -182,7 +207,7 @@
         <td></td>
       </tr>
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td>//input[@name='first_name']</td>
         <td></td>
       </tr>
@@ -191,6 +216,11 @@
         <td tal:content="python: '//input[@value=\'%s\']' % (here.Base_translateString('Register', lang=lang))"></td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td tal:content="python: '//input[@value=\'%s\']' % (here.Base_translateString('Register', lang=lang))"></td>
+        <td></td>
+      </tr>
       <tr>
         <td>type</td>
         <td>//input[@name='first_name']</td>
@@ -271,6 +301,11 @@
         <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 tal:define="portal_type_translation python: here.Base_translateString('Credential Request', lang=lang);
                         dummy python: context.REQUEST.set('mapping', {'portal_type': portal_type_translation})">
         <td>assertTextPresent</td>
@@ -297,6 +332,11 @@
         <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>
@@ -312,6 +352,11 @@
         <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>
@@ -322,11 +367,21 @@
         <td>//button[@data-i18n='Menu']</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//button[@data-i18n='Menu']</td>
+        <td></td>
+      </tr>
       <tr>
         <td>waitForTextPresent</td>
         <td tal:content="python: '%s' % (here.Base_translateString('You are not allowed to access this content', lang=lang))"></td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertTextPresent</td>
+        <td tal:content="python: '%s' % (here.Base_translateString('You are not allowed to access this content', lang=lang))"></td>
+        <td></td>
+      </tr>
       <tr>
         <td>clickAndWait</td>
         <td tal:content="python: '//input[@value=\'%s\']' % (here.Base_translateString('Logout', lang=lang))"></td>
@@ -337,6 +392,11 @@
         <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>
     </tbody>
   </table>
 </body>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSTicket.zpt

@@ -39,6 +39,11 @@
         <td>//input[@id="title"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//input[@id="title"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>type</td>
         <td>//input[@id="title"]</td>
@@ -46,7 +51,7 @@
       </tr>
 
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td>//textarea[@id="description"]</td>
         <td></td>
       </tr>
@@ -57,7 +62,7 @@
       </tr>
 
       <tr>
-        <td>waitForElementPresent</td>
+        <td>assertElementPresent</td>
         <td>//select[@id="resource"]</td>
         <td></td>
       </tr>
@@ -105,6 +110,11 @@
         <td>//a[text()="TEST-SLAPOSJS-SUPPORT-REQUEST 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-SUPPORT-REQUEST 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-SUPPORT-REQUEST 0"]</td>
@@ -125,6 +135,11 @@
         <td>//div[contains(@data-gadget-url, 'gadget_slapos_event_discussion_entry.html')]//div[@class="slapos-event-discussion-message-header"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//div[contains(@data-gadget-url, 'gadget_slapos_event_discussion_entry.html')]//div[@class="slapos-event-discussion-message-header"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>verifyTextPresent</td>
         <td>Demo User Functional</td>
@@ -155,6 +170,11 @@
         <td>//textarea[@id="text_content"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//textarea[@id="text_content"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>type</td>
         <td>//textarea[@id="text_content"]</td>
@@ -185,6 +205,11 @@
         <td>//a[text()="TEST-SLAPOSJS-SUPPORT-REQUEST 0"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//a[text()="TEST-SLAPOSJS-SUPPORT-REQUEST 0"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//a[text()="TEST-SLAPOSJS-SUPPORT-REQUEST 0"]</td>
@@ -205,6 +230,11 @@
         <td>//div[contains(@data-gadget-url, 'gadget_slapos_event_discussion_entry.html')]//div[@class="slapos-event-discussion-message-header"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//div[contains(@data-gadget-url, 'gadget_slapos_event_discussion_entry.html')]//div[@class="slapos-event-discussion-message-header"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>verifyTextPresent</td>
         <td>TEST-SLAPOSJS-SUPPORT-REQUEST NEW MESSAGE</td>

master/bt5/slapos_jio_ui_test/SkinTemplateItem/portal_skins/slapos_ui_test/Zuite_SlapOSCommonTemplate.zpt

@@ -133,6 +133,11 @@
       <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>
@@ -148,6 +153,11 @@
       <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>
@@ -175,6 +185,11 @@
       <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>
@@ -190,6 +205,11 @@
       <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>
@@ -226,28 +246,53 @@
       <td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_slapos_header.html\')]//span[@data-i18n=\'%s\']' % (here.Base_translateString('Dashboard', lang=lang))"></td>
       <td></td>
     </tr>
+    <tr>
+      <td>assertElementPresent</td>
+      <td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_slapos_header.html\')]//span[@data-i18n=\'%s\']' % (here.Base_translateString('Dashboard', lang=lang))"></td>
+      <td></td>
+    </tr>
     <tr>
       <td>waitForElementNotPresent</td>
       <td>//div[contains(@data-gadget-url, 'gadget_erp5_field_listbox.html')]//h1//span[contains(@class, "ui-icon-spinner")]</td>
       <td></td>
     </tr>
+    <tr>
+      <td>assertElementNotPresent</td>
+      <td>//div[contains(@data-gadget-url, 'gadget_erp5_field_listbox.html')]//h1//span[contains(@class, "ui-icon-spinner")]</td>
+      <td></td>
+    </tr>
 
     <tr>
       <td>waitForElementPresent</td>
       <td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_erp5_field_listbox.html\')]//h1[contains(text(), \'%s\')]' % (here.Base_translateString('Sites', lang=lang))"></td>
       <td></td>
     </tr>
+    <tr>
+      <td>assertElementPresent</td>
+      <td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_erp5_field_listbox.html\')]//h1[contains(text(), \'%s\')]' % (here.Base_translateString('Sites', lang=lang))"></td>
+      <td></td>
+    </tr>
     <tr>
       <td>waitForElementPresent</td>
       <td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_erp5_field_listbox.html\')]//h1[contains(text(), \'%s\')]' % (here.Base_translateString('Pending Tickets to Process', lang=lang))"></td>
       <td></td>
     </tr>
+    <tr>
+      <td>assertElementPresent</td>
+      <td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_erp5_field_listbox.html\')]//h1[contains(text(), \'%s\')]' % (here.Base_translateString('Pending Tickets to Process', lang=lang))"></td>
+      <td></td>
+    </tr>
     <!-- Check if map is ok -->
     <tr>
       <td>waitForElementPresent</td>
       <td>//a[@class='leaflet-control-zoom-out']</td>
       <td></td>
     </tr>
+    <tr>
+      <td>assertElementPresent</td>
+      <td>//a[@class='leaflet-control-zoom-out']</td>
+      <td></td>
+    </tr>
   </tal:block>
 
   <tal:block metal:define-macro="slapos_logout">
@@ -259,6 +304,11 @@
       <td>//a[@data-i18n='Logout']</td>
       <td></td>
     </tr>
+    <tr>
+      <td>assertElementPresent</td>
+      <td>//a[@data-i18n='Logout']</td>
+      <td></td>
+    </tr>
     <tr>
       <td>click</td>
       <td>//a[@data-i18n='Logout']</td>
@@ -269,6 +319,11 @@
       <td tal:content="python: '//input[@value=\'%s\']' % (here.Base_translateString('Confirm', lang=lang))"></td>
       <td></td>
     </tr>
+    <tr>
+      <td>assertElementPresent</td>
+      <td tal:content="python: '//input[@value=\'%s\']' % (here.Base_translateString('Confirm', lang=lang))"></td>
+      <td></td>
+    </tr>
     <tr>
       <td>click</td>
       <td tal:content="python: '//input[@value=\'%s\']' % (here.Base_translateString('Confirm', lang=lang))"></td>
@@ -280,6 +335,11 @@
       <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>
   </tal:block>
 
   <tal:block metal:define-macro="access_menu_item_base">
@@ -296,6 +356,11 @@
       <td>//button[@data-i18n='Menu']</td>
       <td></td>
     </tr>
+    <tr>
+      <td>assertElementPresent</td>
+      <td>//button[@data-i18n='Menu']</td>
+      <td></td>
+    </tr>
     <tr>
       <td>click</td>
       <td tal:content="python: '//div[contains(@data-gadget-url, \'%s\')]//a[@data-i18n=\'%s\']' % (panel_gadget_id, menu_item)"></td>
@@ -345,6 +410,11 @@
       <td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_slapos_header.html\')]//a[contains(text(), \'%s\')]' % header_translation"></td>
       <td></td>
     </tr>
+    <tr>
+      <td>assertElementPresent</td>
+      <td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_slapos_header.html\')]//a[contains(text(), \'%s\')]' % header_translation"></td>
+      <td></td>
+    </tr>
     <tr>
       <td>click</td>
       <td tal:content="python: '//div[contains(@data-gadget-url, \'gadget_slapos_header.html\')]//a[contains(text(), \'%s\')]' % header_translation"></td>
@@ -368,6 +438,11 @@
       <td>//button[@data-i18n='Menu']</td>
       <td></td>
     </tr>
+    <tr>
+      <td>assertElementPresent</td>
+      <td>//button[@data-i18n='Menu']</td>
+      <td></td>
+    </tr>
     <tr>
       <td>click</td>
       <td tal:content="python: '//div[contains(@data-gadget-url, \'%s\')]//a[@data-i18n=\'Login Account\']' % panel_gadget_id"></td>
@@ -406,6 +481,11 @@
       <td>//button[@data-i18n='Menu']</td>
       <td></td>
     </tr>
+    <tr>
+      <td>assertElementPresent</td>
+      <td>//button[@data-i18n='Menu']</td>
+      <td></td>
+    </tr>
     <tr>
       <td>click</td>
       <td tal:content="python: '//div[contains(@data-gadget-url, \'%s\')]//a[@data-i18n=\'%s\']' % (panel_gadget_id, menu_item)"></td>
@@ -443,6 +523,11 @@
       <td>//input[@id="title"]</td>
       <td></td>
     </tr>
+    <tr>
+      <td>assertElementPresent</td>
+      <td>//input[@id="title"]</td>
+      <td></td>
+    </tr>
     <tr>
       <td>type</td>
       <td>//input[@id="title"]</td>
@@ -518,6 +603,11 @@
       <td>//div[contains(@data-gadget-url, 'gadget_slapos_header.html')]//a[@data-i18n="Delete"]</td>
       <td></td>
     </tr>
+    <tr>
+      <td>assertElementPresent</td>
+      <td>//div[contains(@data-gadget-url, 'gadget_slapos_header.html')]//a[@data-i18n="Delete"]</td>
+      <td></td>
+    </tr>
     <tr>
       <td>click</td>
       <td>//div[contains(@data-gadget-url, 'gadget_slapos_header.html')]//a[@data-i18n="Delete"]</td>
@@ -541,6 +631,11 @@
         <td>//div[contains(@data-gadget-url, 'gadget_slapos_header.html')]//button[@data-i18n="Proceed"]</td>
         <td></td>
       </tr>
+      <tr>
+        <td>assertElementPresent</td>
+        <td>//div[contains(@data-gadget-url, 'gadget_slapos_header.html')]//button[@data-i18n="Proceed"]</td>
+        <td></td>
+      </tr>
       <tr>
         <td>click</td>
         <td>//div[contains(@data-gadget-url, 'gadget_slapos_header.html')]//button[@data-i18n="Proceed"]</td>
@@ -568,6 +663,11 @@
       <td>//div[contains(@data-gadget-url, 'gadget_slapos_header.html')]//h1//*[contains(@class, "ui-icon-spinner")]</td>
       <td></td>
     </tr>
+    <tr>
+      <td>assertElementNotPresent</td>
+      <td>//div[contains(@data-gadget-url, 'gadget_slapos_header.html')]//h1//*[contains(@class, "ui-icon-spinner")]</td>
+      <td></td>
+    </tr>
     <tr>
       <td colspan="3"><p></p></td>
     </tr>
@@ -863,6 +963,11 @@
       <td>//input[@id="title"]</td>
       <td></td>
     </tr>
+    <tr>
+      <td>assertElementPresent</td>
+      <td>//input[@id="title"]</td>
+      <td></td>
+    </tr>
     <tr>
       <td>type</td>
       <td>//input[@id="title"]</td>
@@ -881,16 +986,31 @@
       <td>//a[text()=" Click here to access your compute_node "]</td>
       <td></td>
     </tr>
+    <tr>
+      <td>assertElementPresent</td>
+      <td>//a[text()=" Click here to access your compute_node "]</td>
+      <td></td>
+    </tr>
     <tr>
       <td>waitForElementPresent</td>
       <td>//textarea[@name="certificate"]</td>
       <td></td>
     </tr>
+    <tr>
+      <td>assertElementPresent</td>
+      <td>//textarea[@name="certificate"]</td>
+      <td></td>
+    </tr>
     <tr>
       <td>waitForElementPresent</td>
       <td>//textarea[@name="key"]</td>
       <td></td>
     </tr>
+    <tr>
+      <td>assertElementPresent</td>
+      <td>//textarea[@name="key"]</td>
+      <td></td>
+    </tr>
     <tr>
       <td>click</td>
       <td>//a[text()=" Click here to access your compute_node "]</td>
@@ -977,6 +1097,11 @@
       <td tal:content="python: '//td/a[text()=\'%s\']' % software_product"></td>
       <td></td>
     </tr>
+    <tr>
+      <td>assertElementPresent</td>
+      <td tal:content="python: '//td/a[text()=\'%s\']' % software_product"></td>
+      <td></td>
+    </tr>
     <tr>
       <td>click</td>
       <td tal:content="python: '//td/a[text()=\'%s\']' % software_product"></td>