Merge branch 'master' into MM-50966-in-product-expansion

2023-04-18 12:05:00 -04:00
--- a/e2e-tests/playwright/package-lock.json
+++ b/e2e-tests/playwright/package-lock.json
@@ -8,7 +8,7 @@
            "dependencies": {
                "@percy/cli": "1.18.0",
                "@percy/playwright": "1.0.4",
-                "@playwright/test": "1.30.0",
+                "@playwright/test": "1.32.3",
                "async-wait-until": "2.0.12",
                "chalk": "4.1.2",
                "deepmerge": "4.3.0",
@@ -428,18 +428,21 @@
            }
        },
        "node_modules/@playwright/test": {
-            "version": "1.30.0",
-            "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.30.0.tgz",
-            "integrity": "sha512-SVxkQw1xvn/Wk/EvBnqWIq6NLo1AppwbYOjNLmyU0R1RoQ3rLEBtmjTnElcnz8VEtn11fptj1ECxK0tgURhajw==",
+            "version": "1.32.3",
+            "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.32.3.tgz",
+            "integrity": "sha512-BvWNvK0RfBriindxhLVabi8BRe3X0J9EVjKlcmhxjg4giWBD/xleLcg2dz7Tx0agu28rczjNIPQWznwzDwVsZQ==",
            "dependencies": {
                "@types/node": "*",
-                "playwright-core": "1.30.0"
+                "playwright-core": "1.32.3"
            },
            "bin": {
                "playwright": "cli.js"
            },
            "engines": {
                "node": ">=14"
+            },
+            "optionalDependencies": {
+                "fsevents": "2.3.2"
            }
        },
        "node_modules/@types/json-schema": {
@@ -1396,6 +1399,19 @@
            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
            "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
        },
+        "node_modules/fsevents": {
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+            "hasInstallScript": true,
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+            }
+        },
        "node_modules/get-stream": {
            "version": "5.2.0",
            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
@@ -1927,9 +1943,9 @@
            }
        },
        "node_modules/playwright-core": {
-            "version": "1.30.0",
-            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.30.0.tgz",
-            "integrity": "sha512-7AnRmTCf+GVYhHbLJsGUtskWTE33SwMZkybJ0v6rqR1boxq2x36U7p1vDRV7HO2IwTZgmycracLxPEJI49wu4g==",
+            "version": "1.32.3",
+            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.32.3.tgz",
+            "integrity": "sha512-SB+cdrnu74ZIn5Ogh/8278ngEh9NEEV0vR4sJFmK04h2iZpybfbqBY0bX6+BLYWVdV12JLLI+JEFtSnYgR+mWg==",
            "bin": {
                "playwright": "cli.js"
            },
@@ -2677,12 +2693,13 @@
            "integrity": "sha512-4cSkWqpu7uK9zzeVwtMWrgGbP34GUlvZsWdEEt98ep6ZECQA+iGB75pOpIVwcsHKXtkDRE6fgugtxNXs5uHpMg=="
        },
        "@playwright/test": {
-            "version": "1.30.0",
-            "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.30.0.tgz",
-            "integrity": "sha512-SVxkQw1xvn/Wk/EvBnqWIq6NLo1AppwbYOjNLmyU0R1RoQ3rLEBtmjTnElcnz8VEtn11fptj1ECxK0tgURhajw==",
+            "version": "1.32.3",
+            "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.32.3.tgz",
+            "integrity": "sha512-BvWNvK0RfBriindxhLVabi8BRe3X0J9EVjKlcmhxjg4giWBD/xleLcg2dz7Tx0agu28rczjNIPQWznwzDwVsZQ==",
            "requires": {
                "@types/node": "*",
-                "playwright-core": "1.30.0"
+                "fsevents": "2.3.2",
+                "playwright-core": "1.32.3"
            }
        },
        "@types/json-schema": {
@@ -3366,6 +3383,12 @@
            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
            "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
        },
+        "fsevents": {
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+            "optional": true
+        },
        "get-stream": {
            "version": "5.2.0",
            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
@@ -3747,9 +3770,9 @@
            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
        },
        "playwright-core": {
-            "version": "1.30.0",
-            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.30.0.tgz",
-            "integrity": "sha512-7AnRmTCf+GVYhHbLJsGUtskWTE33SwMZkybJ0v6rqR1boxq2x36U7p1vDRV7HO2IwTZgmycracLxPEJI49wu4g=="
+            "version": "1.32.3",
+            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.32.3.tgz",
+            "integrity": "sha512-SB+cdrnu74ZIn5Ogh/8278ngEh9NEEV0vR4sJFmK04h2iZpybfbqBY0bX6+BLYWVdV12JLLI+JEFtSnYgR+mWg=="
        },
        "prelude-ls": {
            "version": "1.2.1",
--- a/e2e-tests/playwright/package.json
+++ b/e2e-tests/playwright/package.json
@@ -13,7 +13,7 @@
    "dependencies": {
        "@percy/cli": "1.18.0",
        "@percy/playwright": "1.0.4",
-        "@playwright/test": "1.30.0",
+        "@playwright/test": "1.32.3",
        "async-wait-until": "2.0.12",
        "chalk": "4.1.2",
        "deepmerge": "4.3.0",
--- a/e2e-tests/playwright/playwright.config.ts
+++ b/e2e-tests/playwright/playwright.config.ts
@@ -6,7 +6,7 @@ import {defineConfig, devices} from '@playwright/test';
 import {duration} from '@e2e-support/util';
 import testConfig from '@e2e-test.config';

-const defaultOutputFolder = 'playwright-report';
+const defaultOutputFolder = './playwright-report';

 export default defineConfig({
    globalSetup: require.resolve('./global_setup'),
--- a/e2e-tests/playwright/support/ui/components/channels/post_create.ts
+++ b/e2e-tests/playwright/support/ui/components/channels/post_create.ts
@@ -9,6 +9,7 @@ export default class ChannelsPostCreate {
    readonly input;
    readonly attachmentButton;
    readonly emojiButton;
+    readonly sendButton: Locator;

    constructor(container: Locator) {
        this.container = container;
@@ -16,12 +17,17 @@ export default class ChannelsPostCreate {
        this.input = container.getByTestId('post_textbox');
        this.attachmentButton = container.getByLabel('attachment');
        this.emojiButton = container.getByLabel('select an emoji');
+        this.sendButton = container.getByTestId('SendMessageButton');
    }

    async postMessage(message: string) {
        await this.input.fill(message);
    }

+    async sendMessage() {
+        await this.sendButton.click();
+    }
+
    async toBeVisible() {
        await expect(this.container).toBeVisible();
        await expect(this.input).toBeVisible();
--- a/e2e-tests/playwright/support/ui/pages/channels.ts
+++ b/e2e-tests/playwright/support/ui/pages/channels.ts
@@ -49,6 +49,10 @@ export default class ChannelsPage {
        await this.postCreate.postMessage(message);
    }

+    async sendMessage() {
+        await this.postCreate.sendMessage();
+    }
+
    async getFirstPost() {
        await this.page.getByTestId('postView').first().waitFor();
        const post = await this.page.getByTestId('postView').first();