Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Expanded view will be shown in meeting room #189

Merged
merged 15 commits into from
Jul 14, 2023
Merged

Expanded view will be shown in meeting room #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e41010b
add the expended view to the meeting setting
ahmadkadri Jun 28, 2023
4249faa
fix tests
ahmadkadri Jun 29, 2023
72ce2ae
add changeset
ahmadkadri Jun 29, 2023
7d0feac
Merge branch 'nic/feat/PB-3391-Meeting-expanded-view' into nic/feat/P…
ahmadkadri Jun 30, 2023
9ec77f6
fix e2e test im meetingRoom
ahmadkadri Jul 3, 2023
f9d9f70
Merge branch 'nic/feat/PB-3391-Meeting-expanded-view' into nic/feat/P…
ahmadkadri Jul 4, 2023
6537cec
replace the old meetingDetails class and fix some tests
ahmadkadri Jul 5, 2023
d47bdd3
merge from dev
ahmadkadri Jul 6, 2023
7662aaa
fix chat permission e2e2 test
ahmadkadri Jul 6, 2023
f4f0838
e2e test fixed
Jul 6, 2023
b000d8b
hide the join button in the sidebar
ahmadkadri Jul 6, 2023
2a019c8
change request
ahmadkadri Jul 13, 2023
8bbc156
Merge branch 'main' into nic/feat/PB-3407-Expanded-view-will-be-shown…
ahmadkadri Jul 13, 2023
78c4c55
change request
ahmadkadri Jul 13, 2023
f0c8f72
Merge branch 'nic/feat/PB-3407-Expanded-view-will-be-shown-in-meeting…
ahmadkadri Jul 13, 2023
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
5 changes: 5 additions & 0 deletions .changeset/stale-cycles-sort.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@nordeck/matrix-meetings-widget': minor
---

Add the expended meeting view to the cockpit widget
55 changes: 29 additions & 26 deletions e2e/src/meetingRoom.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,15 @@ test.describe('Meeting Room', () => {
);

await aliceElementWebPage.showWidgetInSidebar('NeoDateFix Details');
const meetingCard = aliceCockpitWidgetPage.getMeeting();
await expect(meetingCard.meetingTimeRangeText).toHaveText(
'Oct 3, 2040, 10:30 AM – 11:30 AM'
);
await expect(meetingCard.meetingTitleText).toHaveText('My Meeting');
await expect(meetingCard.meetingDescriptionText).toHaveText(
const meetingDetails = aliceCockpitWidgetPage.getMeeting();
await aliceElementWebPage.approveWidgetIdentity();
await expect(meetingDetails.meetingDescriptionText).toHaveText(
'My Description'
);
await expect(meetingDetails.meetingTitleText).toHaveText('My Meeting');
await expect(meetingDetails.meetingTimeRangeText).toHaveText(
'October 3, 2040, 10:30 – 11:30 AM'
);
});

test('should edit the meeting title from within the meeting', async ({
Expand All @@ -80,14 +81,13 @@ test.describe('Meeting Room', () => {
}) => {
await aliceElementWebPage.showWidgetInSidebar('NeoDateFix Details');

const meetingCard = aliceCockpitWidgetPage.getMeeting();
const aliceEditMeetingWidgetPage = await meetingCard.editMeeting();
const meetingDetails = aliceCockpitWidgetPage.getMeeting();
await aliceElementWebPage.approveWidgetIdentity();
const aliceEditMeetingWidgetPage = await meetingDetails.editMeeting();
await aliceEditMeetingWidgetPage.titleTextbox.fill('New Meeting');
await aliceEditMeetingWidgetPage.submit();

await aliceElementWebPage.approveWidgetIdentity();

await expect(meetingCard.meetingTitleText).toHaveText('New Meeting');
await expect(meetingDetails.meetingTitleText).toHaveText('New Meeting');
await expect(aliceElementWebPage.roomNameText).toHaveText('New Meeting');
await expect(
aliceElementWebPage.locateChatMessageInRoom(/Title: New Meeting/)
Expand All @@ -101,13 +101,13 @@ test.describe('Meeting Room', () => {
}) => {
await aliceElementWebPage.showWidgetInSidebar('NeoDateFix Details');

const meetingCard = aliceCockpitWidgetPage.getMeeting();
const aliceEditMeetingWidgetPage = await meetingCard.editMeeting();
const meetingDetails = aliceCockpitWidgetPage.getMeeting();
await aliceElementWebPage.approveWidgetIdentity();

const aliceEditMeetingWidgetPage = await meetingDetails.editMeeting();
await aliceEditMeetingWidgetPage.addParticipant(charlie.displayName);
await aliceEditMeetingWidgetPage.submit();

await aliceElementWebPage.approveWidgetIdentity();

await aliceElementWebPage.waitForUserMembership(charlie.username, 'invite');
});

Expand All @@ -116,13 +116,12 @@ test.describe('Meeting Room', () => {
aliceCockpitWidgetPage,
}) => {
await aliceElementWebPage.showWidgetInSidebar('NeoDateFix Details');
const meetingCard = aliceCockpitWidgetPage.getMeeting();
const aliceEditMeetingWidgetPage = await meetingCard.editMeeting();
const meetingDetails = aliceCockpitWidgetPage.getMeeting();
await aliceElementWebPage.approveWidgetIdentity();
const aliceEditMeetingWidgetPage = await meetingDetails.editMeeting();
await aliceEditMeetingWidgetPage.removeLastWidget();
await aliceEditMeetingWidgetPage.submit();

await aliceElementWebPage.approveWidgetIdentity();

await aliceElementWebPage
.locateChatMessageInRoom('Video conference ended by Bot')
.waitFor();
Expand All @@ -141,13 +140,13 @@ test.describe('Meeting Room', () => {
aliceCockpitWidgetPage,
}) => {
await aliceElementWebPage.showWidgetInSidebar('NeoDateFix Details');
const meetingCard = aliceCockpitWidgetPage.getMeeting();
const aliceEditMeetingWidgetPage = await meetingCard.editMeeting();
const meetingDetails = aliceCockpitWidgetPage.getMeeting();
await aliceElementWebPage.approveWidgetIdentity();

const aliceEditMeetingWidgetPage = await meetingDetails.editMeeting();
await aliceEditMeetingWidgetPage.addWidget('Video Conference (optional)');
await aliceEditMeetingWidgetPage.submit();

await aliceElementWebPage.approveWidgetIdentity();

await expect
.poll(async () => {
return await aliceElementWebPage.getWidgets();
Expand Down Expand Up @@ -181,10 +180,10 @@ test.describe('Meeting Room', () => {
await aliceElementWebPage.sendMessage('I am Alice');
await aliceElementWebPage.showWidgetInSidebar('NeoDateFix Details');
const meetingCard = aliceCockpitWidgetPage.getMeeting();
await aliceElementWebPage.approveWidgetIdentity();
let aliceEditMeetingWidgetPage = await meetingCard.editMeeting();
await aliceEditMeetingWidgetPage.toggleChatPermission();
await aliceEditMeetingWidgetPage.submit();
await aliceElementWebPage.approveWidgetIdentity();
await aliceElementWebPage.sendMessage('I am still here');
await expect(bobElementWebPage.noChatPermissionText).toBeVisible();
aliceEditMeetingWidgetPage = await meetingCard.editMeeting();
Expand Down Expand Up @@ -213,8 +212,10 @@ test.describe('Meeting Room', () => {
.joinMeeting();
await bobElementWebPage.acceptRoomInvitation();
await aliceElementWebPage.showWidgetInSidebar('NeoDateFix Details');
const meetingCard = aliceCockpitWidgetPage.getMeeting();
await meetingCard.deleteMeeting();
const meetingDetails = aliceCockpitWidgetPage.getMeeting();
await aliceElementWebPage.approveWidgetIdentity();

await meetingDetails.deleteMeeting();

await expect(aliceElementWebPage.locateTombstone()).toBeVisible();
await expect(bobElementWebPage.locateTombstone()).toBeVisible();
Expand All @@ -236,6 +237,8 @@ test.describe('Meeting Room', () => {
aliceCockpitWidgetPage,
}) => {
await aliceElementWebPage.showWidgetInSidebar('NeoDateFix Details');
await aliceElementWebPage.approveWidgetIdentity();

await aliceCockpitWidgetPage.backToParentRoom();
await aliceElementWebPage.approveWidgetCapabilities();

Expand Down
62 changes: 36 additions & 26 deletions e2e/src/openXchange.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,23 +52,22 @@ test.describe('OpenXchange', () => {

await aliceElementWebPage.showWidgetInSidebar('NeoDateFix Details');

const meetingCard = aliceCockpitWidgetPage.getMeeting();
await expect(meetingCard.meetingTitleText).toHaveText('My Meeting');
await expect(meetingCard.meetingDescriptionText).toHaveText(
const meetingDetails = aliceCockpitWidgetPage.getMeeting();
await aliceElementWebPage.approveWidgetIdentity();

await expect(meetingDetails.meetingTitleText).toHaveText('My Meeting');
await expect(meetingDetails.meetingDescriptionText).toHaveText(
'My Description'
);
await expect(meetingCard.meetingTimeRangeText).toHaveText(
'Oct 3, 2040, 10:30 AM – 11:00 AM'
await expect(meetingDetails.meetingTimeRangeText).toHaveText(
'October 3, 2040, 10:30 – 11:00 AM'
);

const menu = await meetingCard.openMoreSettingsMenu();
await aliceElementWebPage.approveWidgetIdentity();

await expect(menu.editInOpenXchangeMenuItem).toHaveAttribute(
await expect(meetingDetails.editInOpenXchangeMenuItem).toHaveAttribute(
'href',
'https://webmail-hostname/appsuite/#app=io.ox/calendar&id=meeting-id&folder=cal://0/471'
);
await expect(menu.deleteInOpenXchangeMenuItem).toHaveAttribute(
await expect(meetingDetails.deleteInOpenXchangeMenuItem).toHaveAttribute(
'href',
'https://webmail-hostname/appsuite/#app=io.ox/calendar&id=meeting-id&folder=cal://0/471'
);
Expand Down Expand Up @@ -105,9 +104,10 @@ test.describe('OpenXchange', () => {

await expect(
aliceCockpitWidgetPage.getMeeting().meetingTimeRangeText
).toHaveText(
'Oct 3, 2040, 10:30 AM – 11:00 AM. Recurrence: Every day for 5 times'
);
).toHaveText('October 3, 2040, 10:30 – 11:00 AM');
await expect(
aliceCockpitWidgetPage.getMeeting().meetingRecurrenceRuleText
).toHaveText('Every day for 5 times');
});

test('should update meeting via OX', async ({
Expand All @@ -131,9 +131,9 @@ test.describe('OpenXchange', () => {

await aliceElementWebPage.showWidgetInSidebar('NeoDateFix Details');

const meetingCard = aliceCockpitWidgetPage.getMeeting();
await expect(meetingCard.meetingTimeRangeText).toHaveText(
'Oct 3, 2040, 10:30 AM – 11:00 AM'
const meetingDetails = aliceCockpitWidgetPage.getMeeting();
await expect(meetingDetails.meetingTimeRangeText).toHaveText(
'October 3, 2040, 10:30 – 11:00 AM'
);

await meetingsBotApi.updateMeeting({
Expand All @@ -145,14 +145,16 @@ test.describe('OpenXchange', () => {
openIdToken: await aliceElementWebPage.getOpenIdToken(),
});

await aliceElementWebPage.approveWidgetIdentity();

await expect(
aliceElementWebPage.locateChatMessageInRoom(
/10\/04\/2040 10:30 AM CEST to 10\/04\/2040 11:00 AM CEST/
)
).toBeVisible();

await expect(meetingCard.meetingTimeRangeText).toHaveText(
'Oct 4, 2040, 10:30 AM – 11:00 AM'
await expect(meetingDetails.meetingTimeRangeText).toHaveText(
'October 4, 2040, 10:30 – 11:00 AM'
);
});

Expand Down Expand Up @@ -221,9 +223,11 @@ test.describe('OpenXchange', () => {

await expect(
aliceCockpitWidgetPage.getMeeting().meetingTimeRangeText
).toHaveText(
'Oct 3, 2040, 10:30 AM – 11:00 AM. Recurrence: Every day for 5 times'
);
).toHaveText('October 3, 2040, 10:30 – 11:00 AM');

await expect(
aliceCockpitWidgetPage.getMeeting().meetingRecurrenceRuleText
).toHaveText(' Every day for 5 times');

await meetingsBotApi.updateMeeting({
roomId,
Expand All @@ -236,7 +240,9 @@ test.describe('OpenXchange', () => {

await expect(
aliceCockpitWidgetPage.getMeeting().meetingTimeRangeText
).toHaveText('Oct 3, 2040, 10:30 AM – 11:00 AM');
).toHaveText('October 3, 2040, 10:30 – 11:00 AM');

await aliceElementWebPage.approveWidgetIdentity();

await expect(
aliceElementWebPage.locateChatMessageInRoom(
Expand Down Expand Up @@ -273,9 +279,11 @@ test.describe('OpenXchange', () => {

await aliceElementWebPage.showWidgetInSidebar('NeoDateFix Details');

await aliceElementWebPage.approveWidgetIdentity();

await expect(
aliceCockpitWidgetPage.getMeeting().meetingTimeRangeText
).toHaveText('Oct 3, 2040, 10:30 AM – 11:00 AM');
).toHaveText('October 3, 2040, 10:30 – 11:00 AM');

await meetingsBotApi.updateMeeting({
roomId,
Expand All @@ -289,9 +297,11 @@ test.describe('OpenXchange', () => {

await expect(
aliceCockpitWidgetPage.getMeeting().meetingTimeRangeText
).toHaveText(
'Oct 3, 2040, 10:30 AM – 11:00 AM. Recurrence: Every day for 5 times'
);
).toHaveText('October 3, 2040, 10:30 – 11:00 AM');

await expect(
aliceCockpitWidgetPage.getMeeting().meetingRecurrenceRuleText
).toHaveText('Every day for 5 times');

await expect(
aliceElementWebPage.locateChatMessageInRoom(
Expand Down
36 changes: 0 additions & 36 deletions e2e/src/pages/MeetingDetailsPage.ts
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions e2e/src/pages/cockpitWidgetPage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import { FrameLocator, Locator, Page } from '@playwright/test';
import { MeetingCardPage } from './meetingCardPage';
import { MeetingDetailsPage } from './meetingDetailsPage';

export class CockpitWidgetPage {
public readonly backToParentRoomButton: Locator;
Expand All @@ -33,11 +33,11 @@ export class CockpitWidgetPage {
await this.backToParentRoomButton.click();
}

getMeeting(): MeetingCardPage {
return new MeetingCardPage(
getMeeting(): MeetingDetailsPage {
return new MeetingDetailsPage(
this.page,
this.widget,
this.widget.getByRole('heading').locator('..').locator('..').locator('..')
this.widget.getByRole('region', { name: 'Meeting details' })
);
}
}
1 change: 1 addition & 0 deletions e2e/src/pages/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export { CockpitWidgetPage } from './cockpitWidgetPage';
export { ElementWebPage } from './elementWebPage';
export type { OpenIdToken } from './elementWebPage';
export { JitsiWidgetPage } from './jitsiWidgetPage';
export { MeetingDetailsPage } from './meetingDetailsPage';
export { MeetingsBotApi } from './meetingsBotApi';
export { MeetingsWidgetPage } from './meetingsWidgetPage';
export { ScheduleBreakoutSessionsWidgetPage } from './scheduleBreakoutSessionsWidgetPage';
Expand Down
Loading
Loading