diff --git a/e2e-tests/playwright/lib/src/ui/components/channels/center_view.ts b/e2e-tests/playwright/lib/src/ui/components/channels/center_view.ts index 70558c71b4..29c9712473 100644 --- a/e2e-tests/playwright/lib/src/ui/components/channels/center_view.ts +++ b/e2e-tests/playwright/lib/src/ui/components/channels/center_view.ts @@ -131,7 +131,12 @@ export default class ChannelsCenterView { await this.postBoxIndicator.isVisible(); await this.scheduledDraftChannelIcon.isVisible(); const messageLocator = this.scheduledDraftChannelInfoMessage.first(); - await expect(messageLocator).toContainText('Message scheduled for'); + try { + await expect(messageLocator).toContainText('Message scheduled for'); + } catch (error) { + // First assertion failed, trying fallback + await expect(messageLocator).toContainText('You have one scheduled message.'); + } } async clickOnLastEditedPost(postID: string | null) { diff --git a/e2e-tests/playwright/specs/functional/channels/settings/notifications/highlight_without_notification.spec.ts b/e2e-tests/playwright/specs/functional/channels/settings/notifications/highlight_without_notification.spec.ts index 8175e248e8..8e1e139a51 100644 --- a/e2e-tests/playwright/specs/functional/channels/settings/notifications/highlight_without_notification.spec.ts +++ b/e2e-tests/playwright/specs/functional/channels/settings/notifications/highlight_without_notification.spec.ts @@ -6,7 +6,7 @@ import {expect, test} from '@mattermost/playwright-lib'; let keywords: string[]; const highlightWithoutNotificationClass = 'non-notification-highlight'; -test.beforeAll(async ({pw}) => { +test.beforeEach(async ({pw}) => { keywords = [`AB${pw.random.id()}`, `CD${pw.random.id()}`, `EF${pw.random.id()}`, `Highlight me ${pw.random.id()}`]; }); diff --git a/server/i18n/en.json b/server/i18n/en.json index 3ed93a89b0..e96c8aebaa 100644 --- a/server/i18n/en.json +++ b/server/i18n/en.json @@ -2338,7 +2338,7 @@ }, { "id": "api.license.request-trial.can-start-trial.not-allowed", - "translation": "Failed to apply new trial license. You have previously applied a trial license to this Mattermost instance.. If you would like to extend your trial period please [contact our sales team](https://mattermost.com/contact-us/)." + "translation": "Failed to apply new trial license as your workspace has already applied a trial license. If you would like to extend your trial period please [contact our sales team](https://mattermost.com/contact-us/)." }, { "id": "api.license.request_trial_license.app_error",