@capillarytech/cap-ui-utils 3.1.0 → 3.1.1

package/e2e/services/lockService.ts

@@ -48,15 +48,20 @@ class LockService {
         } catch {
             return false; // vanished meanwhile — nothing to clean
         }
-        if (Date.now() - mtimeMs > STALE_LOCK_TTL_MS) return true;
+        // Probe the owner's liveness FIRST — a live owner must never lose its lock,
+        // regardless of age (slow cluster, retried publish, debug SETTLE_MS pauses).
+        // The TTL only applies when the owner is dead, unknown, or a reused pid.
         const match = /^Test-(\d+)-\d+$/.exec(owner.trim());
-        if (!match) return false; // unknown owner format — only TTL applies
+        if (!match) return Date.now() - mtimeMs > STALE_LOCK_TTL_MS; // unknown format — TTL only
         try {
             process.kill(Number(match[1]), 0); // signal 0 = liveness probe, sends nothing
-            return false;
+            return false; // owner alive — never steal
         } catch (error) {
-            // ESRCH: no such process → stale. EPERM: process exists but is not ours.
-            return (error as NodeJS.ErrnoException).code !== 'EPERM';
+            // ESRCH: no such process → stale. EPERM: exists but not ours → TTL fallback (pid reuse).
+            if ((error as NodeJS.ErrnoException).code === 'EPERM') {
+                return Date.now() - mtimeMs > STALE_LOCK_TTL_MS;
+            }
+            return true;
         }
     }
 

package/e2e/utils/elementUtil.ts

@@ -15,7 +15,7 @@ class ElementUtils {
         await browser.pause(2000)
         await element.waitForDisplayed({ timeout: 90000})
         try{
-           await element.waitForClickable({ timeout: 60000, interval:1000, timeoutMsg:await element.getHTML(false)+" is still not clickable" })
+           await element.waitForClickable({ timeout: 60000, interval:1000, timeoutMsg:"element is still not clickable" })
            await element.click()
         }
         catch(error){
@@ -193,7 +193,7 @@ class ElementUtils {
     async enterText(element:WebdriverIO.Element, textToEnter){
             await browser.pause(1000)
             // browser.execute('arguments[0].style.outline = "#f00 solid 4px";', element);
-            await element.waitForEnabled({ timeout: 40000, interval:1000, timeoutMsg:await element.getHTML(false)+" is still not editable" })
+            await element.waitForEnabled({ timeout: 40000, interval:1000, timeoutMsg:"element is still not editable" })
             await element.setValue(textToEnter)
     }
 
@@ -206,7 +206,7 @@ class ElementUtils {
       await element.waitForEnabled({
         timeout: 40000,
         interval: 1000,
-        timeoutMsg: await element.getHTML(false) + " is still not editable"
+        timeoutMsg: "element is still not editable"
       });
       await element.addValue(textToEnter);
     }
@@ -327,7 +327,7 @@ class ElementUtils {
       await target.waitForEnabled({
         timeout: 40000,
         interval: 1000,
-        timeoutMsg: await target.getHTML(false) + " is still not editable"
+        timeoutMsg: "element is still not editable"
       });
       await browser.execute((el: any, val: string) => {
         const desc = Object.getOwnPropertyDescriptor(window.HTMLInputElement.prototype, "value");
@@ -343,7 +343,7 @@ class ElementUtils {
     }
 
    async switchToUrl(url: string){
-      await browser.switchWindow('url')
+      await browser.switchWindow(url)
      }
 
    async waitUntilDisplayed(element:WebdriverIO.Element, awaitedText, timeout=30000){
@@ -378,7 +378,7 @@ class ElementUtils {
         await browser.pause(1000);
         let isDisplayed = await element.isDisplayed();
         if (isDisplayed) {
-         await element.waitForClickable({ timeout: 40000, interval:1000, timeoutMsg:await element.getHTML(false)+" is still not clickable" })
+         await element.waitForClickable({ timeout: 40000, interval:1000, timeoutMsg:"element is still not clickable" })
          await element.click()
         }
     }
@@ -431,7 +431,7 @@ class ElementUtils {
             await element.waitForEnabled({
                 timeout: 40000,
                 interval: 1000,
-                timeoutMsg: await element.getHTML(false) + " is still not editable"
+                timeoutMsg: "element is still not editable"
             });
             await element.setValue(textToEnter);
         }
@@ -455,7 +455,7 @@ class ElementUtils {
             await element.waitForClickable({ 
                 timeout: 40000, 
                 interval: 1000, 
-                timeoutMsg: await element.getHTML(false) + " is still not interactable for hover"
+                timeoutMsg: "element is still not interactable for hover"
             });
     
             // Perform the hover action

package/e2e/utils/logCollectorUtil.ts

@@ -33,10 +33,17 @@ class LogCollectorUtil {
             "time": exeTime.toString(), "validataionMessage": validationMessage,
             "total": this.callCount}}}}  
             const messagePayload ={"result" : message}
-            const response = await request.
-            post('/logger')
-            .send(messagePayload)
-            console.log('API Response',response.body);
+            try {
+                const response = await request
+                    .post('/logger')
+                    .timeout({ deadline: 10000 })
+                    .send(messagePayload)
+                console.log('API Response', response.body);
+            } catch (err) {
+                // The in-pod log collector can be slow or absent (e.g. skipLogCollector);
+                // a logging failure must never fail the test itself.
+                console.log('logCollector POST failed (non-fatal):', (err as Error).message);
+            }
             console.log('Message', message)
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capillarytech/cap-ui-utils",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "Utility functions shared accross all the modules",
   "main": "index.js",
   "scripts": {

package/e2e/services/locks/beeTemplateReady.signal

@@ -1 +0,0 @@
-ready