Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions apps/meteor/tests/e2e/channel-management.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import type { Page } from '@playwright/test';

import { Users } from './fixtures/userStates';
import { HomeChannel } from './page-objects';
import { CreateNewDiscussionModal } from './page-objects/fragments';
import { createTargetChannel } from './utils';
import { test, expect } from './utils/test';

Expand Down Expand Up @@ -148,8 +149,9 @@ test.describe.serial('channel-management', () => {
await poHomeChannel.navbar.openChat(targetChannel);
await poHomeChannel.composer.btnMenuMoreActions.click();
await page.getByRole('menuitem', { name: 'Discussion' }).click();
await poHomeChannel.content.inputDiscussionName.fill(discussionName);
await poHomeChannel.content.btnCreateDiscussionModal.click();
const createDiscussionModal = new CreateNewDiscussionModal(page);
await createDiscussionModal.inputName.fill(discussionName);
await createDiscussionModal.create();

await expect(page.getByRole('heading', { name: discussionName })).toBeVisible();
});
Expand Down
12 changes: 7 additions & 5 deletions apps/meteor/tests/e2e/feature-preview.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { faker } from '@faker-js/faker';

import { Users } from './fixtures/userStates';
import { AdminInfo, HomeChannel, HomeDiscussion, HomeTeam } from './page-objects';
import { CreateNewChannelModal } from './page-objects/fragments/modals';
import { CreateNewChannelModal, CreateNewDiscussionModal } from './page-objects/fragments/modals';
import {
createTargetChannel,
createTargetTeam,
Expand Down Expand Up @@ -246,8 +246,9 @@ test.describe.serial('feature preview', () => {

await poHomeChannel.composer.btnMenuMoreActions.click();
await page.getByRole('menuitem', { name: 'Discussion' }).click();
await poHomeChannel.content.inputDiscussionName.fill(discussionName);
await poHomeChannel.content.btnCreateDiscussionModal.click();
const createDiscussionModal = new CreateNewDiscussionModal(page);
await createDiscussionModal.inputName.fill(discussionName);
await createDiscussionModal.create();
await expect(page.getByRole('heading', { name: discussionName })).toBeVisible();

await poHomeDiscussion.sidebar.discussionsTeamCollabFilter.click();
Expand Down Expand Up @@ -570,8 +571,9 @@ test.describe.serial('feature preview', () => {
await test.step('create discussion in DM', async () => {
await poHomeChannel.composer.btnMenuMoreActions.click();
await page.getByRole('menuitem', { name: 'Discussion' }).click();
await poHomeChannel.content.inputDiscussionName.fill(discussionName);
await poHomeChannel.content.btnCreateDiscussionModal.click();
const createDiscussionModal = new CreateNewDiscussionModal(page);
await createDiscussionModal.inputName.fill(discussionName);
await createDiscussionModal.create();
await poHomeChannel.content.waitForChannel();
await poHomeChannel.content.sendMessage('hello');

Expand Down
12 changes: 0 additions & 12 deletions apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
Original file line number Diff line number Diff line change
Expand Up @@ -180,18 +180,6 @@ export class HomeContent {
return this.page.getByRole('dialog', { name: 'File Upload' });
}

get createDiscussionModal(): Locator {
return this.page.getByRole('dialog', { name: 'Create discussion' });
}

get inputDiscussionName(): Locator {
return this.createDiscussionModal.getByRole('textbox', { name: 'Name' });
}

get btnCreateDiscussionModal(): Locator {
return this.createDiscussionModal.getByRole('button', { name: 'Create' });
}

get btnModalConfirm(): Locator {
return this.page.locator('#modal-root .rcx-button-group--align-end .rcx-button--primary');
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ export abstract class CreateNewModal extends Modal {
await this.listbox.selectOption(memberName);
await this.inputAddMembers.click();
}

async create() {
await this.btnCreate.click();
await this.waitForDismissal();
}
}

export class CreateNewChannelModal extends CreateNewModal {
Expand Down
Loading