@globisnv/cypress-core 0.0.3 → 0.0.5

package/dist/commands/GLO_commands.js

@@ -181,18 +181,12 @@ Cypress.Commands.add('GLO_oktaLogin', (company, urlType, skipvNavCheck) => {
         const target = globisUrlTypes.includes(urlType) ? 'globis_online' : 'online';
         url = url.replace(target, urlType);
     }
-    if (cypressWebsocketLoader) {
-        cy.WS_visitWithSpy(url);
-    }
-    else {
-        cy.visit(url);
-    }
+    // Stateless Okta login redirects server side before any Servoy client boots, so there is no
+    // websocket to wait for on the first visit — the connection is only asserted after the Okta
+    // round trip (see waitForWebSocketAfterOkta). The spy itself is attached globally on every
+    // AUT page load (see websocketDetector.ts), which covers this server-side redirect too.
+    cy.visit(url);
     cy.task('log', 'Redirect to okta url');
-    if (cypressWebsocketLoader) {
-        cy.on('window:before:load', (win) => {
-            attachWebSocketSpy(win);
-        });
-    }
     cy.origin(Cypress.expose('oktaUrl'), () => {
         cy.get('.o-form-input', { timeout: 60000 })
             .find('[autocomplete="username"]')

package/dist/websocketDetector.js

@@ -1,4 +1,4 @@
-import { cypressWebsocketDebug, extraParams } from './tsHelper.js';
+import { cypressWebsocketDebug, cypressWebsocketLoader, extraParams } from './tsHelper.js';
 /** Module-level flag controlling auto-dismissal of Info dialogs. Disabled by default; set via WS_toggleDialogHandler or env wsEnableDialogHandler=true. */
 let wsDialogHandlerEnabled = extraParams.wsEnableDialogHandler === 'true';
 // ─── Cypress action tracking for metric labels ────────────────────────────────
@@ -71,13 +71,16 @@ after(() => {
         Cypress.log({ name: 'WSMetrics', displayName: '📊 WSMetrics', message: msg });
     });
 });
-Cypress.Commands.add('WS_visitWithSpy', (url) => {
-    const enableSpy = () => ({
-        onBeforeLoad(win) {
-            attachWebSocketSpy(win);
-        }
+// Attaches to every AUT page load, not just the one triggered by the WS_visitWithSpy call below —
+// GLO_logout redirects to the login page itself (app-triggered, not via cy.visit), and that load
+// needs the spy too or its websocket connects unpatched (same problem GLO_oktaLogin's redirect has).
+if (cypressWebsocketLoader) {
+    Cypress.on('window:before:load', (win) => {
+        attachWebSocketSpy(win);
     });
-    cy.visit(url, enableSpy());
+}
+Cypress.Commands.add('WS_visitWithSpy', (url) => {
+    cy.visit(url);
     cy.window().then((win) => {
         cy.wrap(win.wsMessages).as('wsMessages');
     });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@globisnv/cypress-core",
-    "version": "0.0.3",
+    "version": "0.0.5",
     "description": "Core building blocks for Globis Cypress E2E tests",
     "license": "UNLICENSED",
     "type": "module",