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
62 changes: 0 additions & 62 deletions apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/tests/e2e/page-objects/fragments/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ export * from './user-info-flextab';
export * from './home-content';
export * from './home-omnichannel-content';
export * from './home-flextab';
export * from './home-sidenav';
export * from './omnichannel-sidenav';
export * from './omnichannel-close-chat-modal';
export * from './navbar';
Expand Down
11 changes: 6 additions & 5 deletions apps/meteor/tests/e2e/page-objects/home-channel.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Locator, Page } from '@playwright/test';

import { HomeContent, HomeSidenav, HomeFlextab, Navbar, Sidepanel, RoomSidebar, ToastMessages } from './fragments';
import { HomeContent, HomeFlextab, Navbar, Sidepanel, RoomSidebar, ToastMessages } from './fragments';
import { RoomToolbar } from './fragments/toolbar';
import { VoiceCalls } from './fragments/voice-calls';

Expand All @@ -9,8 +9,6 @@ export class HomeChannel {

readonly content: HomeContent;

readonly sidenav: HomeSidenav;

readonly sidebar: RoomSidebar;

readonly sidepanel: Sidepanel;
Expand All @@ -28,7 +26,6 @@ export class HomeChannel {
constructor(page: Page) {
this.page = page;
this.content = new HomeContent(page);
this.sidenav = new HomeSidenav(page);
this.sidebar = new RoomSidebar(page);
this.sidepanel = new Sidepanel(page);
this.navbar = new Navbar(page);
Expand Down Expand Up @@ -122,8 +119,12 @@ export class HomeChannel {
return this.page.getByRole('main').getByRole('status');
}

get homepageHeader(): Locator {
return this.page.locator('main').getByRole('heading', { name: 'Home' });
}

async waitForHome(): Promise<void> {
await this.sidenav.homepageHeader.waitFor({ state: 'visible' });
await this.homepageHeader.waitFor({ state: 'visible' });
}

async waitForRoomLoad(): Promise<void> {
Expand Down
5 changes: 1 addition & 4 deletions apps/meteor/tests/e2e/page-objects/home-discussion.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
import type { Locator, Page } from '@playwright/test';

import { HomeContent, HomeSidenav, HomeFlextab, Navbar } from './fragments';
import { HomeContent, HomeFlextab, Navbar } from './fragments';

export class HomeDiscussion {
private readonly page: Page;

readonly content: HomeContent;

readonly sidenav: HomeSidenav;

readonly navbar: Navbar;

readonly tabs: HomeFlextab;

constructor(page: Page) {
this.page = page;
this.content = new HomeContent(page);
this.sidenav = new HomeSidenav(page);
this.navbar = new Navbar(page);
this.tabs = new HomeFlextab(page);
}
Expand Down
8 changes: 4 additions & 4 deletions apps/meteor/tests/e2e/page-objects/omnichannel-room-info.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import type { Locator, Page } from '@playwright/test';

import { HomeSidenav } from './fragments/home-sidenav';
import { RoomSidebar } from './fragments';

export class OmnichannelRoomInfo {
private readonly page: Page;

private readonly homeSidenav: HomeSidenav;
private readonly sidebar: RoomSidebar;

constructor(page: Page) {
this.page = page;
this.homeSidenav = new HomeSidenav(page);
this.sidebar = new RoomSidebar(page);
}

get dialogRoomInfo(): Locator {
Expand Down Expand Up @@ -70,6 +70,6 @@ export class OmnichannelRoomInfo {
}

getBadgeIndicator(name: string, title: string): Locator {
return this.homeSidenav.getSidebarItemByName(name).getByTitle(title);
return this.sidebar.getSidebarItemByName(name).getByTitle(title);
}
}
Loading