@thinkwise/testwise 0.2.21 → 0.2.62

package/page-overrides/ClickOverride.ts

@@ -1,4 +1,4 @@
-import type { Locator } from '@playwright/test';
+import type { Locator, Page } from '@playwright/test';
 import { FlightTracker } from '../helpers/FlightTracker.js';
 import { testwiseConfig } from '../services/ConfigBuilder.js';
 import type { Test } from '../types/Test.js';
@@ -9,26 +9,41 @@ const continueOnError = testwiseConfig().get<boolean>('featureSettings.InflightR
 
 export class ClickOverride {
   private _test: Test;
+  private _page: Page | null = null;
   private flightTracker: FlightTracker = new FlightTracker();
 
   constructor(test: Test) {
     this._test = test.extend({
       page: async ({ page }, use) => {
+        this._page = page;
+
+        const isTrackable = (url: string, resourceType: string) => {
+          const lowerUrl = url.toLowerCase();
+
+          return (
+            resourceType === 'xhr' &&
+            !lowerUrl.includes('/detect_change(') &&
+            !lowerUrl.includes('/set_gui_start_use_log_session') &&
+            !lowerUrl.includes('download_icon') &&
+            !lowerUrl.includes('download_list_bar_grp_icon') &&
+            !lowerUrl.includes('/badge()')
+          );
+        };
+
         const overrideClickMethod = (locator: Locator): Locator => {
           const originalClickMethod = locator.click.bind(locator);
 
           page.on('request', (request) => {
-            if (request.resourceType() === 'xhr') {
+            if (isTrackable(request.url(), request.resourceType())) {
               this.flightTracker.requestsInFlight++;
             }
           });
 
           page.on('response', (response) => {
-            if (response.request().resourceType() === 'xhr') {
+            if (isTrackable(response.request().url(), response.request().resourceType())) {
               if (this.flightTracker.requestsInFlight > 0) {
                 this.flightTracker.requestsInFlight--;
               }
-
               if (this.flightTracker.requestsInFlight === 0) {
                 this.flightTracker.eventEmitter.emit('idle');
               }
@@ -42,75 +57,65 @@ export class ClickOverride {
                 await this.flightTracker.waitToContinue();
               } catch (error) {
                 console.warn('Exception while waiting for inflight requests to finish:', error);
-
+                if (this._page) {
+                  const inflightRequests = await this._page.evaluate(() => {
+                    return performance
+                      .getEntriesByType('resource')
+                      .filter((entry) => {
+                        const res = entry as PerformanceResourceTiming;
+                        return (
+                          res.initiatorType === 'xmlhttprequest' &&
+                          !res.name.includes('/detect_change(') &&
+                          !res.name.includes('/set_gui_start_use_log_session')
+                        );
+                      })
+                      .map((entry) => (entry as PerformanceResourceTiming).name);
+                  });
+                  console.debug('Current inflight XHR requests:', inflightRequests);
+                }
                 if (!continueOnError) throw error;
               }
             }
+            return;
           };
 
-          // Ensure chaining works by overriding methods that return new Locators
-          const originalLocatorMethod = locator.locator.bind(locator);
-          locator.locator = (...args) => overrideClickMethod(originalLocatorMethod(...args));
-
-          // Override the filter method so returned locators also have custom click logic
-          const originalFilterMethod = locator.filter?.bind(locator);
-          locator.filter = (...args) => overrideClickMethod(originalFilterMethod(...args));
-
-          const originalGetByTextMethod = locator.getByText.bind(locator);
-          locator.getByText = (...args) => overrideClickMethod(originalGetByTextMethod(...args));
-
-          const originalGetByTestIdMethod = locator.getByTestId.bind(locator);
-          locator.getByTestId = (...args) => overrideClickMethod(originalGetByTestIdMethod(...args));
-
-          const originalGetByAltTextMethod = locator.getByAltText.bind(locator);
-          locator.getByAltText = (...args) => overrideClickMethod(originalGetByAltTextMethod(...args));
-
-          const originalGetByLabelMethod = locator.getByLabel.bind(locator);
-          locator.getByLabel = (...args) => overrideClickMethod(originalGetByLabelMethod(...args));
-
-          const originalGetByRoleMethod = locator.getByRole.bind(locator);
-          locator.getByRole = (...args) => overrideClickMethod(originalGetByRoleMethod(...args));
-
-          const originalGetByPlaceholderMethod = locator.getByPlaceholder.bind(locator);
-          locator.getByPlaceholder = (...args) => overrideClickMethod(originalGetByPlaceholderMethod(...args));
-
-          const originalGetByTitleMethod = locator.getByTitle.bind(locator);
-          locator.getByTitle = (...args) => overrideClickMethod(originalGetByTitleMethod(...args));
+          const locatorMethods = [
+            'locator',
+            'filter',
+            'getByText',
+            'getByTestId',
+            'getByAltText',
+            'getByLabel',
+            'getByRole',
+            'getByPlaceholder',
+            'getByTitle'
+          ] as const;
+
+          for (const method of locatorMethods) {
+            const original = (locator[method] as (...args: unknown[]) => Locator).bind(locator);
+            (locator as unknown as Record<string, (...args: unknown[]) => Locator>)[method] = (...args: unknown[]) =>
+              overrideClickMethod(original(...args));
+          }
 
           return locator;
         };
 
-        // Override the getByTestId.click method
-        const originalGetByTestId = page.getByTestId.bind(page);
-        page.getByTestId = (...args) => overrideClickMethod(originalGetByTestId(...args));
-
-        // Override the locator.click method
-        const originalLocator = page.locator.bind(page);
-        page.locator = (...args) => overrideClickMethod(originalLocator(...args));
-
-        // Override the getByAltText.click method
-        const originalGetByAltText = page.getByAltText.bind(page);
-        page.getByAltText = (...args) => overrideClickMethod(originalGetByAltText(...args));
-
-        // Override the getByLabel.click method
-        const originalGetByLabel = page.getByLabel.bind(page);
-        page.getByLabel = (...args) => overrideClickMethod(originalGetByLabel(...args));
-
-        // Override the getByRole.click method
-        const originalGetByRole = page.getByRole.bind(page);
-        page.getByRole = (...args) => overrideClickMethod(originalGetByRole(...args));
-
-        // Override the getByPlaceholder.click method
-        const originalGetByPlaceholder = page.getByPlaceholder.bind(page);
-        page.getByPlaceholder = (...args) => overrideClickMethod(originalGetByPlaceholder(...args));
-
-        // Override the getByText.click method
-        const originalGetByText = page.getByText.bind(page);
-        page.getByText = (...args) => overrideClickMethod(originalGetByText(...args));
-
-        // Override the getByTitle.click method
-        const originalGetByTitle = page.getByTitle.bind(page);
-        page.getByTitle = (...args) => overrideClickMethod(originalGetByTitle(...args));
+        const rootMethods = [
+          'locator',
+          'getByTestId',
+          'getByAltText',
+          'getByLabel',
+          'getByRole',
+          'getByPlaceholder',
+          'getByText',
+          'getByTitle'
+        ] as const;
+
+        for (const method of rootMethods) {
+          const original = (page[method] as (...args: unknown[]) => Locator).bind(page);
+          (page as unknown as Record<string, (...args: unknown[]) => Locator>)[method] = (...args: unknown[]) =>
+            overrideClickMethod(original(...args));
+        }
 
         await use(page);
       }

package/types/Universal.ts

@@ -23,4 +23,5 @@ export type UniversalLoginOptions = {
   serviceUrl?: string;
   metaEndpoint?: string;
   config?: UniversalConfigOptions;
+  userPreference?: number;
 };