@mablhq/mabl-cli 1.13.28 → 1.16.5

package/api/featureSet.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FeatureSet = exports.FindImplementationVersion = void 0;
+const runnerType_1 = require("../browserLauncher/runnerType");
+const PLAYWRIGHT_FEATURE_FLAG = 'nodejs_execution_engine_playwright';
+const SMARTER_WAIT_FEATURE_FLAG = 'smarter_wait';
+var FindImplementationVersion;
+(function (FindImplementationVersion) {
+    FindImplementationVersion[FindImplementationVersion["V1"] = 0] = "V1";
+    FindImplementationVersion[FindImplementationVersion["SmartFind"] = 1] = "SmartFind";
+})(FindImplementationVersion = exports.FindImplementationVersion || (exports.FindImplementationVersion = {}));
+class FeatureSet {
+    constructor(featureFlags) {
+        this.featureFlags = featureFlags;
+    }
+    getRunnerType() {
+        return this.featureFlags.has(PLAYWRIGHT_FEATURE_FLAG)
+            ? runnerType_1.RunnerType.Playwright
+            : runnerType_1.RunnerType.Puppeteer;
+    }
+    getFindImplementationVersion() {
+        return this.featureFlags.has(SMARTER_WAIT_FEATURE_FLAG)
+            ? FindImplementationVersion.SmartFind
+            : FindImplementationVersion.V1;
+    }
+}
+exports.FeatureSet = FeatureSet;

package/api/mablApiClient.js

@@ -26,9 +26,7 @@ const mablApi_1 = require("../mablApi");
 const cliConfigProvider_1 = require("../providers/cliConfigProvider");
 const basicApiClient_1 = require("./basicApiClient");
 const queryString = __importStar(require("query-string"));
-const logUtils_1 = require("../util/logUtils");
-const runnerType_1 = require("../browserLauncher/runnerType");
-const PLAYWRIGHT_FEATURE_FLAG = 'nodejs_execution_engine_playwright';
+const featureSet_1 = require("./featureSet");
 class MablApiClient extends basicApiClient_1.BasicApiClient {
     constructor(options) {
         super(options);
@@ -237,12 +235,20 @@ class MablApiClient extends basicApiClient_1.BasicApiClient {
     }
     async getTestFindSummaries(testId, environmentId) {
         try {
-            return await this.makeGetRequest(`${env_1.BASE_API_URL}/findSummary?journey_id=${testId}&environment_id=${environmentId}`);
+            return await this.makeGetRequest(`${env_1.BASE_API_URL}/findSummary?journey_id=${testId}&environment_id=${environmentId}`).then((result) => { var _a; return (_a = result.findsummaries) !== null && _a !== void 0 ? _a : []; });
         }
         catch (error) {
             throw toApiError(`Failed to get test find summaries results`, error);
         }
     }
+    async getTestFindModels(testId, environmentId) {
+        try {
+            return await this.makeGetRequest(`${env_1.BASE_API_URL}/findModel/test/${testId}?environment_id=${environmentId}`).then((result) => { var _a; return (_a = result.findModels) !== null && _a !== void 0 ? _a : []; });
+        }
+        catch (error) {
+            throw toApiError(`Failed to get test find model results`, error);
+        }
+    }
     async getTestOverrides(testId, environmentId, selectorOverrideLimit = 10) {
         try {
             return await this.makeGetRequest(`${env_1.BASE_API_URL}/tests/testScripts/${testId}/overrides?environment_id=${environmentId}&selector_override_limit=${selectorOverrideLimit}`).then((result) => { var _a; return (_a = result.overrides) !== null && _a !== void 0 ? _a : []; });
@@ -687,23 +693,18 @@ class MablApiClient extends basicApiClient_1.BasicApiClient {
             timeout: 3600000,
         });
     }
-    async getRunnerTypeFromFeatureFlag(organizationId) {
-        var _a, _b;
-        if (organizationId === undefined) {
-            organizationId = (_a = (await this.getSelf()).preferences) === null || _a === void 0 ? void 0 : _a.default_workspace_id;
-        }
-        if (organizationId !== undefined) {
-            try {
-                const workspace = await this.getWorkspace(organizationId);
-                const account = await this.getAccount(workspace.account_id);
-                return ((_b = account.effective_features) === null || _b === void 0 ? void 0 : _b.includes(PLAYWRIGHT_FEATURE_FLAG)) ? runnerType_1.RunnerType.Playwright
-                    : runnerType_1.RunnerType.Puppeteer;
-            }
-            catch (ex) {
-                logUtils_1.logInternal(`Unable to get the playwright feature flag (${ex})`);
-            }
+    async getEffectiveFeaturesByWorkspaceId(workspaceId) {
+        try {
+            const workspace = await this.getWorkspace(workspaceId);
+            const account = await this.getAccount(workspace.account_id);
+            const features = account.effective_features
+                ? new Set(account.effective_features)
+                : new Set();
+            return new featureSet_1.FeatureSet(features);
+        }
+        catch (error) {
+            throw toApiError(`Failed to get feature flags for workspace ${workspaceId}`, error);
         }
-        return runnerType_1.RunnerType.Puppeteer;
     }
 }
 exports.MablApiClient = MablApiClient;

package/browserLauncher/playwrightBrowserLauncher/playwrightBrowserLauncher.js

@@ -7,6 +7,7 @@ exports.PlaywrightBrowserLauncher = void 0;
 const test_1 = require("@playwright/test");
 const path_1 = __importDefault(require("path"));
 const playwrightBrowser_1 = require("./playwrightBrowser");
+const BROWSER_LAUNCH_TIMEOUT_MS = 60000;
 class PlaywrightBrowserLauncher {
     async connect(options, currentDownloadPath) {
         const browser = await test_1.chromium.connect(options.browserWSEndpoint);
@@ -35,6 +36,7 @@ class PlaywrightBrowserLauncher {
             isMobile: (_a = options.defaultDeviceDescriptor) === null || _a === void 0 ? void 0 : _a.isMobile,
             deviceScaleFactor: (_b = options.defaultDeviceDescriptor) === null || _b === void 0 ? void 0 : _b.deviceScaleFactor,
             hasTouch: (_c = options.defaultDeviceDescriptor) === null || _c === void 0 ? void 0 : _c.hasTouch,
+            timeout: BROWSER_LAUNCH_TIMEOUT_MS,
         });
         return new playwrightBrowser_1.PlaywrightBrowser(defaultContext, path_1.default.join(options.downloadPath, 'final'), '');
     }

package/browserLauncher/playwrightBrowserLauncher/playwrightDom.js

@@ -26,6 +26,7 @@ const utils_1 = require("../utils");
 const logUtils_1 = require("../../util/logUtils");
 const elementHandle_1 = require("../elementHandle");
 const testsUtil_1 = require("../../commands/tests/testsUtil");
+const pureUtil_1 = require("../../util/pureUtil");
 exports.NAVIGATION_ERROR_MESSAGE = 'waiting for scheduled navigations to finish';
 class PlaywrightJsHandle {
     constructor(handle, page) {
@@ -267,5 +268,16 @@ class PlaywrightElementHandle extends PlaywrightJsHandle {
         var _a;
         return ((_a = this.cdpSession) !== null && _a !== void 0 ? _a : this.page.getCdpSession()).send(method, paramArgs);
     }
+    getTagName() {
+        return this.element.evaluate((el) => el.tagName.toLowerCase());
+    }
+    async getAttribute(attributeName) {
+        const result = await this.element.evaluate((el, attributeName) => el.getAttribute(attributeName), attributeName);
+        return pureUtil_1.isNullish(result) ? undefined : result;
+    }
+    async getInnerText() {
+        const result = await this.element.evaluate((el) => el.innerText);
+        return pureUtil_1.isNullish(result) ? undefined : result;
+    }
 }
 exports.PlaywrightElementHandle = PlaywrightElementHandle;

package/browserLauncher/puppeteerBrowserLauncher/puppeteerElementHandle.js

@@ -5,6 +5,7 @@ const puppeteerJsHandle_1 = require("./puppeteerJsHandle");
 const utils_1 = require("../utils");
 const testsUtil_1 = require("../../commands/tests/testsUtil");
 const elementHandle_1 = require("../elementHandle");
+const pureUtil_1 = require("../../util/pureUtil");
 const msBetweenClicks = 100;
 class PuppeteerElementHandle extends puppeteerJsHandle_1.PuppeteerJsHandle {
     constructor(element, parentPage) {
@@ -123,5 +124,16 @@ class PuppeteerElementHandle extends puppeteerJsHandle_1.PuppeteerJsHandle {
     getValue() {
         return this.element.evaluate((el) => el.value);
     }
+    async getInnerText() {
+        const result = await this.element.evaluate((el) => el.innerText);
+        return pureUtil_1.isNullish(result) ? undefined : result;
+    }
+    getTagName() {
+        return this.element.evaluate((el) => el.tagName.toLowerCase());
+    }
+    async getAttribute(attributeName) {
+        const result = await this.element.evaluate((el, attributeName) => el.getAttribute(attributeName), attributeName);
+        return pureUtil_1.isNullish(result) ? undefined : result;
+    }
 }
 exports.PuppeteerElementHandle = PuppeteerElementHandle;

package/commands/tests/executionUtil.js

@@ -15,7 +15,12 @@ async function runTheTestInNewWindow(test, flows, branchName, url, credentialsId
     const authConfig = await new authenticationProvider_1.AuthenticationProvider().getAuthConfigWithAutoRenew();
     const browserPreferences = testsUtil_1.generateChromiumPreferencesFile();
     const browserPreferencesDirectory = await testsUtil_1.prepareChromePreferencesDirectory(browserPreferences);
-    const runnerType = await (await mablApiClientFactory_1.MablApiClientFactory.createApiClient()).getRunnerTypeFromFeatureFlag(test.organization_id);
+    const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClient();
+    if (!test.organization_id) {
+        throw new Error('The test workspace ID is required, but it is not set.');
+    }
+    const featureFlags = await apiClient.getEffectiveFeaturesByWorkspaceId(test.organization_id);
+    const runnerType = featureFlags.getRunnerType();
     const trainingBrowser = await testsUtil_1.createBrowserWithAuthedExtension(authConfig.accessToken, width || exports.DEFAULT_BROWSER_WIDTH, height || exports.DEFAULT_BROWSER_HEIGHT, browserPreferencesDirectory, {
         runnerType,
     });

package/commands/tests/testsUtil.js

@@ -158,6 +158,8 @@ async function launchBrowserInstance(chromePath, launchArgs, userDataDir, headle
                 messaging_1.mablEventEmitter.log(error.message);
             });
         }
+        messaging_1.mablEventEmitter.log('Browser launch failed', Date.now(), logLineMessaging_1.LogLineColor.red);
+        messaging_1.mablEventEmitter.log(error.message);
     }
     return browser;
 }