diff --git a/e2e/components/data-table/data-table.ts b/e2e/components/data-table/data-table.ts index 7917cf83b..d10b45848 100755 --- a/e2e/components/data-table/data-table.ts +++ b/e2e/components/data-table/data-table.ts @@ -125,16 +125,13 @@ export class DataTable extends Component { return await this.getSortedColumnHeader().getText(); } - async getSortingOrder() { + async getSortingOrder(): Promise { const str = await this.getSortedColumnHeader().getAttribute('class'); if (str.includes('asc')) { return 'asc'; } - else { - if (str.includes('desc')) { - return 'desc'; - } - } + + return 'desc'; } async sortByColumn(columnName: string) { @@ -328,32 +325,40 @@ export class DataTable extends Component { return await this.emptyFolderDragAndDrop.isDisplayed(); } - async getEmptyDragAndDropText() { + async getEmptyDragAndDropText(): Promise { const isEmpty = await this.isEmptyWithDragAndDrop(); if (isEmpty) { return await this.emptyFolderDragAndDrop.getText(); } + + return ''; } - async getEmptyStateTitle() { + async getEmptyStateTitle(): Promise { const isEmpty = await this.isEmptyList(); if (isEmpty) { return await this.emptyListTitle.getText(); } + + return ''; } - async getEmptyStateSubtitle() { + async getEmptyStateSubtitle(): Promise { const isEmpty = await this.isEmptyList(); if (isEmpty) { return await this.emptyListSubtitle.getText(); } + + return ''; } - async getEmptyStateText() { + async getEmptyStateText(): Promise { const isEmpty = await this.isEmptyList(); if (isEmpty) { return await this.emptyListText.getText(); } + + return ''; } async getEmptySearchResultsText() { diff --git a/e2e/components/info-drawer/info-drawer.ts b/e2e/components/info-drawer/info-drawer.ts index 46d8371a4..6e2dd74b6 100755 --- a/e2e/components/info-drawer/info-drawer.ts +++ b/e2e/components/info-drawer/info-drawer.ts @@ -92,10 +92,12 @@ export class InfoDrawer extends Component { return await this.getTabByTitle(title).isPresent(); } - async isTabDisplayed(title: string) { + async isTabDisplayed(title: string): Promise { if (await browser.isElementPresent(this.getTabByTitle(title))) { return await this.getTabByTitle(title).isDisplayed(); } + + return false; } async getTabTitle(index: number) { diff --git a/e2e/components/login/login.ts b/e2e/components/login/login.ts index b4e654f44..1bbeb1cbc 100755 --- a/e2e/components/login/login.ts +++ b/e2e/components/login/login.ts @@ -76,7 +76,7 @@ export class LoginComponent extends Component { return await this.passwordVisibility.click(); } - async getPasswordVisibility() { + async getPasswordVisibility(): Promise { const text = await this.passwordVisibility.getText(); if (text.endsWith('visibility_off')) { return false; @@ -86,9 +86,11 @@ export class LoginComponent extends Component { return true; } } + + return false; } - async isPasswordDisplayed() { + async isPasswordDisplayed(): Promise { const type = await this.passwordInput.getAttribute('type'); if (type === 'text') { return true; @@ -98,6 +100,8 @@ export class LoginComponent extends Component { return false; } } + + return false; } async isUsernameEnabled() { diff --git a/e2e/components/menu/menu.ts b/e2e/components/menu/menu.ts index 6dabbd736..9ba44043e 100755 --- a/e2e/components/menu/menu.ts +++ b/e2e/components/menu/menu.ts @@ -167,7 +167,7 @@ export class Menu extends Component { } } - async hasSubMenu(menuItem: string) { + async hasSubMenu(menuItem: string): Promise { try { const elem = this.getItemByLabel(menuItem); await browser.wait(EC.elementToBeClickable(elem), BROWSER_WAIT_TIMEOUT); @@ -175,6 +175,7 @@ export class Menu extends Component { return elemClass.includes('mat-menu-item-submenu-trigger'); } catch (error) { console.log('---- has submenu error: ', error); + return false; } } @@ -200,13 +201,14 @@ export class Menu extends Component { return await this.submenus.count(); } - async isMenuItemDisabled(title: string) { + async isMenuItemDisabled(title: string): Promise { try { const item = this.getItemByLabel(title); const disabled = await item.getAttribute('disabled'); return disabled; } catch (error) { console.log('----- isMenuItemDisabled catch: ', error); + return null; } } diff --git a/e2e/components/viewer/viewer.ts b/e2e/components/viewer/viewer.ts index 944aa928e..109f03abb 100755 --- a/e2e/components/viewer/viewer.ts +++ b/e2e/components/viewer/viewer.ts @@ -100,10 +100,12 @@ export class Viewer extends Component { return await browser.isElementPresent(this.viewerExtensionContent); } - async getComponentIdOfView() { + async getComponentIdOfView(): Promise { if (await this.isCustomContentPresent()) { return await this.viewerExtensionContent.getAttribute('data-automation-id'); } + + return null; } async isPdfViewerContentDisplayed() { diff --git a/e2e/suites/actions-available/test-util.ts b/e2e/suites/actions-available/test-util.ts index aa3a71adf..c2afaeb47 100644 --- a/e2e/suites/actions-available/test-util.ts +++ b/e2e/suites/actions-available/test-util.ts @@ -119,10 +119,11 @@ export async function checkViewerToolbarMoreActions(item: string, expectedToolba } -function removeClosePreviousNextOldInfo(actions: string[]) { +function removeClosePreviousNextOldInfo(actions: string[]): string[] { return actions.filter(elem => { if ( (elem !== 'Close') && (elem !== 'Previous File') && (elem !== 'Next File') && (elem !== 'View details')) { return elem; } - }); + return null + }).filter((action) => action != null); } diff --git a/e2e/utilities/repo-client/apis/favorites/favorites-api.ts b/e2e/utilities/repo-client/apis/favorites/favorites-api.ts index d884d925c..acd9f9226 100755 --- a/e2e/utilities/repo-client/apis/favorites/favorites-api.ts +++ b/e2e/utilities/repo-client/apis/favorites/favorites-api.ts @@ -26,7 +26,7 @@ import { RepoApi } from '../repo-api'; import { RepoClient } from './../../repo-client'; import { Utils } from '../../../../utilities/utils'; -import { FavoritesApi as AdfFavoritesApi, SitesApi as AdfSiteApi } from '@alfresco/js-api'; +import { FavoritesApi as AdfFavoritesApi, SitesApi as AdfSiteApi, FavoriteEntry } from '@alfresco/js-api'; export class FavoritesApi extends RepoApi { favoritesApi = new AdfFavoritesApi(this.alfrescoJsApi); @@ -48,7 +48,7 @@ export class FavoritesApi extends RepoApi { return await this.favoritesApi.createFavorite('-me-', data); } - async addFavoriteById(nodeType: 'file' | 'folder' | 'site', id: string) { + async addFavoriteById(nodeType: 'file' | 'folder' | 'site', id: string): Promise { let guid; await this.apiAuth(); @@ -68,6 +68,7 @@ export class FavoritesApi extends RepoApi { return await this.favoritesApi.createFavorite('-me-', data); } catch (error) { console.log('--- add favorite by id catch '); + return null; } } diff --git a/e2e/utilities/repo-client/apis/shared-links/shared-links-api.ts b/e2e/utilities/repo-client/apis/shared-links/shared-links-api.ts index 22570ed7f..9604e07fc 100755 --- a/e2e/utilities/repo-client/apis/shared-links/shared-links-api.ts +++ b/e2e/utilities/repo-client/apis/shared-links/shared-links-api.ts @@ -25,7 +25,7 @@ import { RepoApi } from '../repo-api'; import { Utils } from '../../../../utilities/utils'; -import { SharedlinksApi as AdfSharedlinksApi } from '@alfresco/js-api'; +import { SharedlinksApi as AdfSharedlinksApi, SharedLinkEntry } from '@alfresco/js-api'; export class SharedLinksApi extends RepoApi { sharedlinksApi = new AdfSharedlinksApi(this.alfrescoJsApi); @@ -34,7 +34,7 @@ export class SharedLinksApi extends RepoApi { super(username, password); } - async shareFileById(id: string, expireDate?: Date) { + async shareFileById(id: string, expireDate?: Date): Promise { try { await this.apiAuth(); const data = { @@ -44,6 +44,7 @@ export class SharedLinksApi extends RepoApi { return await this.sharedlinksApi.createSharedLink(data); } catch (error) { console.log('---- shareFileById error: ', error); + return null; } } diff --git a/e2e/utilities/repo-client/apis/sites/sites-api.ts b/e2e/utilities/repo-client/apis/sites/sites-api.ts index 037f5c541..0c811cc82 100755 --- a/e2e/utilities/repo-client/apis/sites/sites-api.ts +++ b/e2e/utilities/repo-client/apis/sites/sites-api.ts @@ -24,7 +24,7 @@ */ import { RepoApi } from '../repo-api'; -import { SiteBody, SiteMemberRoleBody, SiteMemberBody } from '@alfresco/js-api'; +import { SiteBody, SiteMemberRoleBody, SiteMemberBody, SiteEntry, SiteMembershipRequestEntry } from '@alfresco/js-api'; import { SITE_VISIBILITY } from '../../../../configs'; import { Utils } from '../../../../utilities/utils'; import { SitesApi as AdfSiteApi } from '@alfresco/js-api'; @@ -66,7 +66,7 @@ export class SitesApi extends RepoApi { return site.entry.title; } - async createSite(title: string, visibility?: string, description?: string, siteId?: string) { + async createSite(title: string, visibility?: string, description?: string, siteId?: string): Promise { const site = { title, visibility: visibility || SITE_VISIBILITY.PUBLIC, @@ -79,6 +79,7 @@ export class SitesApi extends RepoApi { return await this.sitesApi.createSite(site); } catch (error) { console.log('=== create site catch: ', error); + return null; } } @@ -134,7 +135,7 @@ export class SitesApi extends RepoApi { return await this.sitesApi.deleteSiteMembership(siteId, userId); } - async requestToJoin(siteId: string) { + async requestToJoin(siteId: string): Promise { const body = { id: siteId }; @@ -143,6 +144,7 @@ export class SitesApi extends RepoApi { return await this.sitesApi.createSiteMembershipRequestForPerson('-me-', body); } catch (error) { console.log('====== requestToJoin catch ', error); + return null; }; }