@bigbinary/neeto-playwright-commons 1.27.1 → 1.27.2

package/index.cjs.js

@@ -542,6 +542,14 @@ class SlackApi {
         this.fetchMessages = (channelId, unixTimestamp) => this.apiRequest("history", { channel: channelId, oldest: unixTimestamp });
         this.createChannel = (channelName) => this.apiRequest("create", { name: channelName });
         this.addUser = (channelId, userId) => this.apiRequest("invite", { channel: channelId, users: userId });
+        this.mockChannelDeleted = (channelId) => this.neetoPlaywrightUtilities.apiRequest({
+            url: "/neeto_slack/api/v1/testing/webhooks",
+            method: "post",
+            data: neetoCist.keysToSnakeCase({
+                eventType: "channel_deleted",
+                notificationChannelId: channelId,
+            }),
+        });
         if (!process.env.SLACK_BOT_TOKEN) {
             throw new Error("SLACK_BOT_TOKEN is not set");
         }
@@ -116908,11 +116916,17 @@ class GooglePage extends IntegrationBase {
                     totpToken = this.totp.generate({ timestamp: Date.now() });
                 }
                 previousToken = totpToken;
+                if (await codeInput.isHidden())
+                    return;
                 await codeInput.fill(totpToken);
                 test.expect(this.totp.validate({ token: totpToken })).not.toBeNull();
                 await this.page.locator(GOOGLE_LOGIN_SELECTORS.totpNext).click();
-                await test.expect(this.page.getByText(GOOGLE_LOGIN_TEXTS.wrongCode)).toBeHidden({ timeout: 10000 });
-                await test.expect(codeInput).toBeHidden({ timeout: 15000 });
+                await Promise.all([
+                    test.expect(codeInput).toBeHidden({ timeout: 20000 }),
+                    test.expect(this.page.getByText(GOOGLE_LOGIN_TEXTS.wrongCode)).toBeHidden({
+                        timeout: 20000,
+                    }),
+                ]);
             }).toPass({ timeout: 2 * 60 * 1000 });
         };
         this.logoutFromGoogle = async () => {
@@ -117109,32 +117123,58 @@ class SlackPage extends IntegrationBase {
             await slackWebappPage.addLocatorHandler(slackWebappPageDataQa(SLACK_DATA_QA_SELECTORS.messagePaneBannerCloseIcon), locator => locator.click(), { times: 1 });
             await slackWebappPage.addLocatorHandler(slackWebappPageDataQa(SLACK_DATA_QA_SELECTORS.permissionBannerCloseIcon), locator => locator.click(), { noWaitAfter: true, times: 2 });
         };
-        this.connectAndVerifyIntegration = async (redirectUrl, customSteps, channelToConfigure = SLACK_DEFAULT_CHANNEL) => {
+        this.initializeSlackPermissionPage = async () => {
             await this.connect();
-            const loginButton = this.page.getByRole("button", {
-                name: this.t("neetoSlack.slack.connect.loginButton"),
-            });
-            const installButton = this.page.locator(SLACK_SELECTORS.installButton);
-            const allowButton = this.page.getByRole("button", {
-                name: SLACK_WEB_TEXTS.allow,
-            });
-            const button = installButton.or(allowButton);
-            if (await loginButton.isVisible()) {
-                await loginButton.click({ delay: 5000 });
-                await this.page.waitForURL(RegExp("(.*)slack.com/.*"));
-            }
             await this.page.waitForLoadState("domcontentloaded", { timeout: 25000 });
-            await test.expect(button).toBeVisible({ timeout: 25000 });
-            await test.expect(button).toBeEnabled({ timeout: 25000 });
-            const currentWorkspace = (await this.page
+            await test.expect(this.allowButton).toBeVisible({ timeout: 25000 });
+            await test.expect(this.allowButton).toBeEnabled({ timeout: 25000 });
+            return await this.page
                 .locator(SLACK_SELECTORS.teamPicketButtonContent)
-                .textContent()) || "";
-            await button.click({ timeout: 25000 });
-            await this.page.waitForURL(redirectUrl);
+                .textContent();
+        };
+        this.navigateToCallbackUrl = async () => {
+            await this.page.goto(this.callbackUrl.replace(/^https:/, "http:"));
+            await this.neetoPlaywrightUtilities.waitForPageLoad();
+        };
+        this.captureCallbackUrl = () => this.page.on("request", (request) => {
+            const url = request.url();
+            if (url.includes("/neeto_slack/api/v2/slack/callbacks") &&
+                url.startsWith("https:")) {
+                this.callbackUrl = url;
+            }
+        });
+        this.connectAndVerifyInDev = async (redirectUrl, channelToConfigure, customSteps) => {
+            this.currentWorkspace = (await this.initializeSlackPermissionPage()) || "";
+            this.captureCallbackUrl();
+            await this.allowButton.click({ timeout: 25000 });
+            await test.expect(this.allowButton).toBeHidden({ timeout: 25000 });
+            await this.page.waitForLoadState("domcontentloaded", { timeout: 20000 });
+            await this.navigateToCallbackUrl();
+            await this.page.waitForURL(redirectUrl, {
+                timeout: 15000,
+            });
+            await this.completeSlackChannelSetup(channelToConfigure, customSteps);
+        };
+        this.connectAndVerifyInStaging = async (redirectUrl, channelToConfigure, customSteps) => {
+            this.currentWorkspace = (await this.initializeSlackPermissionPage()) || "";
+            await this.allowButton.click({ timeout: 25000 });
+            await test.expect(this.allowButton).toBeHidden({ timeout: 25000 });
+            await this.page.waitForLoadState("domcontentloaded", { timeout: 20000 });
+            await this.page.waitForURL(redirectUrl, {
+                timeout: 15000,
+            });
+            await this.completeSlackChannelSetup(channelToConfigure, customSteps);
+        };
+        this.connectAndVerifyIntegration = async (redirectUrl, customSteps, channelToConfigure = SLACK_DEFAULT_CHANNEL) => {
+            IS_DEV_ENV
+                ? await this.connectAndVerifyInDev(redirectUrl, channelToConfigure, customSteps)
+                : await this.connectAndVerifyInStaging(redirectUrl, channelToConfigure, customSteps);
+        };
+        this.completeSlackChannelSetup = async (channelToConfigure, customSteps) => {
             await this.neetoPlaywrightUtilities.waitForPageLoad();
             await test.expect(this.page.getByRole("heading", {
                 name: this.t("neetoSlack.slack.configure.title", {
-                    teamName: currentWorkspace,
+                    teamName: this.currentWorkspace,
                 }),
             })).toBeVisible({ timeout: 10000 });
             await this.neetoPlaywrightUtilities.selectOptionFromDropdown({
@@ -117143,14 +117183,17 @@ class SlackPage extends IntegrationBase {
             await this.page
                 .getByRole("button", { name: this.t("neetoSlack.common.continue") })
                 .click();
-            await this.neetoPlaywrightUtilities.waitForPageLoad();
+            await Promise.all([
+                this.neetoPlaywrightUtilities.waitForPageLoad(),
+                this.neetoPlaywrightUtilities.verifyToast(),
+            ]);
             if (customSteps) {
                 await customSteps();
             }
             else {
                 await test.expect(this.page.getByRole("heading", {
                     name: this.t("neetoSlack.slack.finish.title", {
-                        teamName: currentWorkspace,
+                        teamName: this.currentWorkspace,
                     }),
                 })).toBeVisible();
                 await this.page
@@ -117277,6 +117320,9 @@ class SlackPage extends IntegrationBase {
                 .click();
             await test.expect(channelItem).toBeHidden();
         };
+        this.allowButton = this.page.getByRole("button", {
+            name: SLACK_WEB_TEXTS.allow,
+        });
     }
 }
 
@@ -119409,7 +119455,9 @@ class CustomDomainPage {
             ]);
             await this.neetoPlaywrightUtilities.waitForPageLoad();
             await validateButton.click();
-            await test.expect(this.page.getByTestId(COMMON_SELECTORS.calloutElement)).toBeVisible({ timeout: 15000 });
+            await test.expect
+                .soft(this.page.getByTestId(COMMON_SELECTORS.calloutElement))
+                .toBeVisible({ timeout: 15000 });
             let isCertificateLimitExceeded = false;
             await test.expect(async () => {
                 isCertificateLimitExceeded = await this.isCertificateLimitExceeded();