From 4885e6bcee48cf8771051f8e4d921dfab73dd740 Mon Sep 17 00:00:00 2001 From: Geeta Mandakini Ayyalasomayajula <45559635+gmandakini@users.noreply.github.com> Date: Mon, 28 Oct 2019 20:02:47 +0000 Subject: [PATCH] =?UTF-8?q?added=20methods=20to=20view=20file,=20assert=20?= =?UTF-8?q?on=20File=20title=20in=20the=20viewer=20and=20cl=E2=80=A6=20(#5?= =?UTF-8?q?196)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * added methods to view file, assert on File title in the viewer and close viewer. * moved the ViewerPage file to ADF testing package * removed the unnecessary methods as using the methods of the ViewerPage class. --- .../comments/comment-component.e2e.ts | 3 +-- .../document-list/document-list-component.e2e.ts | 3 +-- .../metadata/aspect-oriented-config.e2e.ts | 3 +-- .../metadata/metadata-permissions.e2e.ts | 3 +-- .../metadata/metadata-properties.e2e.ts | 3 +-- .../metadata/metadata-smoke-tests.e2e.ts | 3 +-- .../permissions/permissions-component.e2e.ts | 3 +-- .../permissions/site-permissions.e2e.ts | 3 +-- e2e/content-services/share-file/share-file.e2e.ts | 4 ++-- .../sso/sso-download-directive-component.e2e.ts | 4 ++-- e2e/core/pagination-empty-current-page.e2e.ts | 3 +-- .../file-extensions/viewer-archive.component.e2e.ts | 3 +-- .../viewer/file-extensions/viewer-component.e2e.ts | 3 +-- .../file-extensions/viewer-excel.component.e2e.ts | 3 +-- .../file-extensions/viewer-image.component.e2e.ts | 3 +-- .../viewer-powerpoint.component.e2e.ts | 3 +-- .../file-extensions/viewer-text.component.e2e.ts | 3 +-- .../file-extensions/viewer-word.component.e2e.ts | 3 +-- e2e/core/viewer/info-drawer.component.e2e.ts | 3 +-- .../viewer/viewer-content-services-component.e2e.ts | 3 +-- .../viewer/viewer-custom-toolbar-info-drawer.e2e.ts | 3 +-- e2e/core/viewer/viewer-extension.e2e.ts | 3 +-- e2e/core/viewer/viewer-properties.e2e.ts | 3 +-- e2e/core/viewer/viewer-share-content.ts | 3 +-- e2e/process-services/attach-file-widget.e2e.ts | 3 +-- .../process-attachmentList-actionMenu.e2e.ts | 3 +-- .../task-attachmentList-actionMenu.e2e.ts | 3 +-- e2e/search/search-component.e2e.ts | 3 +-- .../core/pages/form/widgets/attachFileWidgetCloud.ts | 12 ++++++++---- lib/testing/src/lib/core/pages/public-api.ts | 1 + .../testing/src/lib/core/pages}/viewerPage.ts | 7 +++++-- 31 files changed, 44 insertions(+), 62 deletions(-) rename {e2e/pages/adf => lib/testing/src/lib/core/pages}/viewerPage.ts (98%) diff --git a/e2e/content-services/comments/comment-component.e2e.ts b/e2e/content-services/comments/comment-component.e2e.ts index 4e1a126d9f..6cfef4f4b8 100644 --- a/e2e/content-services/comments/comment-component.e2e.ts +++ b/e2e/content-services/comments/comment-component.e2e.ts @@ -15,9 +15,8 @@ * limitations under the License. */ -import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing'; +import { LoginPage, UploadActions, StringUtil, ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { ViewerPage } from '../../pages/adf/viewerPage'; import { CommentsPage } from '../../pages/adf/commentsPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; diff --git a/e2e/content-services/document-list/document-list-component.e2e.ts b/e2e/content-services/document-list/document-list-component.e2e.ts index 7aa6bcb031..204bc70931 100644 --- a/e2e/content-services/document-list/document-list-component.e2e.ts +++ b/e2e/content-services/document-list/document-list-component.e2e.ts @@ -17,9 +17,8 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; -import { ViewerPage } from '../../pages/adf/viewerPage'; import { browser } from 'protractor'; -import { LoginPage, StringUtil, UploadActions } from '@alfresco/adf-testing'; +import { LoginPage, StringUtil, UploadActions, ViewerPage } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { FileModel } from '../../models/ACS/fileModel'; import moment from 'moment-es6'; diff --git a/e2e/content-services/metadata/aspect-oriented-config.e2e.ts b/e2e/content-services/metadata/aspect-oriented-config.e2e.ts index 91dd22f05e..70afe4cd0f 100644 --- a/e2e/content-services/metadata/aspect-oriented-config.e2e.ts +++ b/e2e/content-services/metadata/aspect-oriented-config.e2e.ts @@ -15,8 +15,7 @@ * limitations under the License. */ -import { LoginPage, UploadActions, LocalStorageUtil } from '@alfresco/adf-testing'; -import { ViewerPage } from '../../pages/adf/viewerPage'; +import { LoginPage, UploadActions, LocalStorageUtil, ViewerPage } from '@alfresco/adf-testing'; import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; diff --git a/e2e/content-services/metadata/metadata-permissions.e2e.ts b/e2e/content-services/metadata/metadata-permissions.e2e.ts index ad9fa0959d..35f5bed6c5 100644 --- a/e2e/content-services/metadata/metadata-permissions.e2e.ts +++ b/e2e/content-services/metadata/metadata-permissions.e2e.ts @@ -15,8 +15,7 @@ * limitations under the License. */ -import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing'; -import { ViewerPage } from '../../pages/adf/viewerPage'; +import { LoginPage, UploadActions, StringUtil, ViewerPage } from '@alfresco/adf-testing'; import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; diff --git a/e2e/content-services/metadata/metadata-properties.e2e.ts b/e2e/content-services/metadata/metadata-properties.e2e.ts index 24818cc462..1934dae5e3 100644 --- a/e2e/content-services/metadata/metadata-properties.e2e.ts +++ b/e2e/content-services/metadata/metadata-properties.e2e.ts @@ -15,8 +15,7 @@ * limitations under the License. */ -import { LoginPage, UploadActions } from '@alfresco/adf-testing'; -import { ViewerPage } from '../../pages/adf/viewerPage'; +import { LoginPage, UploadActions, ViewerPage } from '@alfresco/adf-testing'; import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; diff --git a/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts b/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts index 0798ce7570..eb9f85476f 100644 --- a/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts +++ b/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts @@ -15,9 +15,8 @@ * limitations under the License. */ -import { LoginPage, LocalStorageUtil, BrowserActions, UploadActions } from '@alfresco/adf-testing'; +import { LoginPage, LocalStorageUtil, BrowserActions, UploadActions, ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { ViewerPage } from '../../pages/adf/viewerPage'; import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; diff --git a/e2e/content-services/permissions/permissions-component.e2e.ts b/e2e/content-services/permissions/permissions-component.e2e.ts index 7b0a1ee323..5e53a8ee7b 100644 --- a/e2e/content-services/permissions/permissions-component.e2e.ts +++ b/e2e/content-services/permissions/permissions-component.e2e.ts @@ -20,10 +20,9 @@ import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { FileModel } from '../../models/ACS/fileModel'; -import { StringUtil, BrowserActions, NotificationHistoryPage, LoginPage, UploadActions } from '@alfresco/adf-testing'; +import { StringUtil, BrowserActions, NotificationHistoryPage, LoginPage, UploadActions, ViewerPage } from '@alfresco/adf-testing'; import { browser } from 'protractor'; import { FolderModel } from '../../models/ACS/folderModel'; -import { ViewerPage } from '../../pages/adf/viewerPage'; import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { UploadDialog } from '../../pages/adf/dialog/uploadDialog'; diff --git a/e2e/content-services/permissions/site-permissions.e2e.ts b/e2e/content-services/permissions/site-permissions.e2e.ts index 6461298ecd..878b7f53c4 100644 --- a/e2e/content-services/permissions/site-permissions.e2e.ts +++ b/e2e/content-services/permissions/site-permissions.e2e.ts @@ -16,13 +16,12 @@ */ import { PermissionsPage } from '../../pages/adf/permissionsPage'; -import { LoginPage, BrowserActions, UploadActions, StringUtil, NotificationHistoryPage } from '@alfresco/adf-testing'; +import { LoginPage, BrowserActions, UploadActions, StringUtil, NotificationHistoryPage, ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { FileModel } from '../../models/ACS/fileModel'; import { browser } from 'protractor'; -import { ViewerPage } from '../../pages/adf/viewerPage'; import CONSTANTS = require('../../util/constants'); import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; import { UploadDialog } from '../../pages/adf/dialog/uploadDialog'; diff --git a/e2e/content-services/share-file/share-file.e2e.ts b/e2e/content-services/share-file/share-file.e2e.ts index e58c452bbc..6dd041836c 100644 --- a/e2e/content-services/share-file/share-file.e2e.ts +++ b/e2e/content-services/share-file/share-file.e2e.ts @@ -20,11 +20,11 @@ import { BrowserActions, LocalStorageUtil, NotificationHistoryPage, - UploadActions + UploadActions, + ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { ViewerPage } from '../../pages/adf/viewerPage'; import { ShareDialog } from '../../pages/adf/dialog/shareDialog'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { FileModel } from '../../models/ACS/fileModel'; diff --git a/e2e/content-services/sso/sso-download-directive-component.e2e.ts b/e2e/content-services/sso/sso-download-directive-component.e2e.ts index 8cd1c0c532..f553fc139e 100644 --- a/e2e/content-services/sso/sso-download-directive-component.e2e.ts +++ b/e2e/content-services/sso/sso-download-directive-component.e2e.ts @@ -26,10 +26,10 @@ import { SettingsPage, StringUtil, UserModel, - FileBrowserUtil + FileBrowserUtil, + ViewerPage } from '@alfresco/adf-testing'; import { FileModel } from '../../models/ACS/fileModel'; -import { ViewerPage } from '../../pages/adf/viewerPage'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList, implicitFlow true', () => { diff --git a/e2e/core/pagination-empty-current-page.e2e.ts b/e2e/core/pagination-empty-current-page.e2e.ts index 0bf35ebace..990ec83737 100644 --- a/e2e/core/pagination-empty-current-page.e2e.ts +++ b/e2e/core/pagination-empty-current-page.e2e.ts @@ -15,10 +15,9 @@ * limitations under the License. */ -import { LoginPage } from '@alfresco/adf-testing'; +import { LoginPage, ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../pages/adf/contentServicesPage'; import { PaginationPage } from '@alfresco/adf-testing'; -import { ViewerPage } from '../pages/adf/viewerPage'; import { AcsUserModel } from '../models/ACS/acsUserModel'; import { FolderModel } from '../models/ACS/folderModel'; import { FileModel } from '../models/ACS/fileModel'; diff --git a/e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts index 2c06bdbf88..b87a758197 100644 --- a/e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts @@ -16,8 +16,7 @@ */ import { browser } from 'protractor'; -import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing'; -import { ViewerPage } from '../../../pages/adf/viewerPage'; +import { LoginPage, UploadActions, StringUtil, ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; import CONSTANTS = require('../../../util/constants'); import { FolderModel } from '../../../models/ACS/folderModel'; diff --git a/e2e/core/viewer/file-extensions/viewer-component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-component.e2e.ts index 8c2b0d9ede..d678005c70 100644 --- a/e2e/core/viewer/file-extensions/viewer-component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-component.e2e.ts @@ -16,8 +16,7 @@ */ import { browser } from 'protractor'; -import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing'; -import { ViewerPage } from '../../../pages/adf/viewerPage'; +import { LoginPage, UploadActions, StringUtil, ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; import CONSTANTS = require('../../../util/constants'); import { FileModel } from '../../..//models/ACS/fileModel'; diff --git a/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts index 0abab8b4fb..7c1937572d 100644 --- a/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts @@ -16,8 +16,7 @@ */ import { browser } from 'protractor'; -import { LoginPage, StringUtil, UploadActions } from '@alfresco/adf-testing'; -import { ViewerPage } from '../../../pages/adf/viewerPage'; +import { LoginPage, StringUtil, UploadActions, ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; import CONSTANTS = require('../../../util/constants'); import { FolderModel } from '../../../models/ACS/folderModel'; diff --git a/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts index 1e07e355a9..b3de28109f 100644 --- a/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts @@ -16,8 +16,7 @@ */ import { browser } from 'protractor'; -import { LoginPage, StringUtil, UploadActions } from '@alfresco/adf-testing'; -import { ViewerPage } from '../../../pages/adf/viewerPage'; +import { LoginPage, StringUtil, UploadActions, ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; import CONSTANTS = require('../../../util/constants'); import { FolderModel } from '../../../models/ACS/folderModel'; diff --git a/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts index 486c5d405c..929f057289 100644 --- a/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts @@ -15,8 +15,7 @@ * limitations under the License. */ -import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing'; -import { ViewerPage } from '../../../pages/adf/viewerPage'; +import { LoginPage, UploadActions, StringUtil, ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; import CONSTANTS = require('../../../util/constants'); import { FolderModel } from '../../../models/ACS/folderModel'; diff --git a/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts index 8df72fe988..5b4f2c01b2 100644 --- a/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts @@ -16,8 +16,7 @@ */ import { browser } from 'protractor'; -import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing'; -import { ViewerPage } from '../../../pages/adf/viewerPage'; +import { LoginPage, UploadActions, StringUtil, ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; import CONSTANTS = require('../../../util/constants'); import { FolderModel } from '../../../models/ACS/folderModel'; diff --git a/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts index 852046949b..38f5155c48 100644 --- a/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts +++ b/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts @@ -16,8 +16,7 @@ */ import { browser } from 'protractor'; -import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing'; -import { ViewerPage } from '../../../pages/adf/viewerPage'; +import { LoginPage, UploadActions, StringUtil, ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../../pages/adf/contentServicesPage'; import CONSTANTS = require('../../../util/constants'); import { FolderModel } from '../../../models/ACS/folderModel'; diff --git a/e2e/core/viewer/info-drawer.component.e2e.ts b/e2e/core/viewer/info-drawer.component.e2e.ts index a0ce5fab7f..c022416637 100644 --- a/e2e/core/viewer/info-drawer.component.e2e.ts +++ b/e2e/core/viewer/info-drawer.component.e2e.ts @@ -16,8 +16,7 @@ */ import { browser } from 'protractor'; -import { LoginPage, UploadActions, StringUtil } from '@alfresco/adf-testing'; -import { ViewerPage } from '../../pages/adf/viewerPage'; +import { LoginPage, UploadActions, StringUtil, ViewerPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import CONSTANTS = require('../../util/constants'); diff --git a/e2e/core/viewer/viewer-content-services-component.e2e.ts b/e2e/core/viewer/viewer-content-services-component.e2e.ts index 7f3bdb2a9e..1ce389d70f 100644 --- a/e2e/core/viewer/viewer-content-services-component.e2e.ts +++ b/e2e/core/viewer/viewer-content-services-component.e2e.ts @@ -16,9 +16,8 @@ */ import { browser } from 'protractor'; -import { LoginPage, UploadActions } from '@alfresco/adf-testing'; +import { LoginPage, UploadActions, ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { ViewerPage } from '../../pages/adf/viewerPage'; import { FileModel } from '../../models/ACS/fileModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; diff --git a/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts b/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts index 45c94711ed..7e49462a90 100644 --- a/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts +++ b/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts @@ -16,8 +16,7 @@ */ import { browser } from 'protractor'; -import { LoginPage, UploadActions } from '@alfresco/adf-testing'; -import { ViewerPage } from '../../pages/adf/viewerPage'; +import { LoginPage, UploadActions, ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { FileModel } from '../../models/ACS/fileModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; diff --git a/e2e/core/viewer/viewer-extension.e2e.ts b/e2e/core/viewer/viewer-extension.e2e.ts index aa830323f4..4f714a8832 100644 --- a/e2e/core/viewer/viewer-extension.e2e.ts +++ b/e2e/core/viewer/viewer-extension.e2e.ts @@ -16,8 +16,7 @@ */ import { browser } from 'protractor'; -import { LoginPage, StringUtil, UploadActions } from '@alfresco/adf-testing'; -import { ViewerPage } from '../../pages/adf/viewerPage'; +import { LoginPage, StringUtil, UploadActions, ViewerPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { MonacoExtensionPage } from '../../pages/adf/demo-shell/monacoExtensionPage'; diff --git a/e2e/core/viewer/viewer-properties.e2e.ts b/e2e/core/viewer/viewer-properties.e2e.ts index a81fa2e937..f85e1ecbae 100644 --- a/e2e/core/viewer/viewer-properties.e2e.ts +++ b/e2e/core/viewer/viewer-properties.e2e.ts @@ -16,9 +16,8 @@ */ import { browser } from 'protractor'; -import { LoginPage, UploadActions, DataTableComponentPage } from '@alfresco/adf-testing'; +import { LoginPage, UploadActions, DataTableComponentPage, ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { ViewerPage } from '../../pages/adf/viewerPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { FileModel } from '../../models/ACS/fileModel'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; diff --git a/e2e/core/viewer/viewer-share-content.ts b/e2e/core/viewer/viewer-share-content.ts index 9b5db74a65..c7271351ad 100644 --- a/e2e/core/viewer/viewer-share-content.ts +++ b/e2e/core/viewer/viewer-share-content.ts @@ -15,8 +15,7 @@ * limitations under the License. */ -import { LoginPage, UploadActions, StringUtil, BrowserActions } from '@alfresco/adf-testing'; -import { ViewerPage } from '../../pages/adf/viewerPage'; +import { LoginPage, UploadActions, StringUtil, BrowserActions, ViewerPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ShareDialog } from '../../pages/adf/dialog/shareDialog'; diff --git a/e2e/process-services/attach-file-widget.e2e.ts b/e2e/process-services/attach-file-widget.e2e.ts index 707fe3b27b..c35725a740 100644 --- a/e2e/process-services/attach-file-widget.e2e.ts +++ b/e2e/process-services/attach-file-widget.e2e.ts @@ -15,12 +15,11 @@ * limitations under the License. */ -import { LoginPage, Widget } from '@alfresco/adf-testing'; +import { LoginPage, Widget, ViewerPage } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasksPage'; import CONSTANTS = require('../util/constants'); import { FileModel } from '../models/ACS/fileModel'; import { browser } from 'protractor'; -import { ViewerPage } from '../pages/adf/viewerPage'; import { AppsActions } from '../actions/APS/apps.actions'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; diff --git a/e2e/process-services/process-attachmentList-actionMenu.e2e.ts b/e2e/process-services/process-attachmentList-actionMenu.e2e.ts index d40f9be000..ff96b390b7 100644 --- a/e2e/process-services/process-attachmentList-actionMenu.e2e.ts +++ b/e2e/process-services/process-attachmentList-actionMenu.e2e.ts @@ -15,11 +15,10 @@ * limitations under the License. */ -import { LoginPage, FileBrowserUtil } from '@alfresco/adf-testing'; +import { LoginPage, FileBrowserUtil, ViewerPage } from '@alfresco/adf-testing'; import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage'; import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage'; -import { ViewerPage } from '../pages/adf/viewerPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UsersActions } from '../actions/users.actions'; diff --git a/e2e/process-services/task-attachmentList-actionMenu.e2e.ts b/e2e/process-services/task-attachmentList-actionMenu.e2e.ts index 42b4a2d5ed..18ed2705b1 100644 --- a/e2e/process-services/task-attachmentList-actionMenu.e2e.ts +++ b/e2e/process-services/task-attachmentList-actionMenu.e2e.ts @@ -16,11 +16,10 @@ */ import { browser } from 'protractor'; -import { LoginPage, FileBrowserUtil } from '@alfresco/adf-testing'; +import { LoginPage, FileBrowserUtil, ViewerPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage'; -import { ViewerPage } from '../pages/adf/viewerPage'; import CONSTANTS = require('../util/constants'); import path = require('path'); import fs = require('fs'); diff --git a/e2e/search/search-component.e2e.ts b/e2e/search/search-component.e2e.ts index a4bf0fdd9c..55e600ec47 100644 --- a/e2e/search/search-component.e2e.ts +++ b/e2e/search/search-component.e2e.ts @@ -17,10 +17,9 @@ import { browser } from 'protractor'; -import { LoginPage, UploadActions, StringUtil, LocalStorageUtil, BrowserActions } from '@alfresco/adf-testing'; +import { LoginPage, UploadActions, StringUtil, LocalStorageUtil, BrowserActions, ViewerPage } from '@alfresco/adf-testing'; import { SearchDialog } from '../pages/adf/dialog/searchDialog'; import { ContentServicesPage } from '../pages/adf/contentServicesPage'; -import { ViewerPage } from '../pages/adf/viewerPage'; import { SearchResultsPage } from '../pages/adf/searchResultsPage'; import { AcsUserModel } from '../models/ACS/acsUserModel'; import { FileModel } from '../models/ACS/fileModel'; diff --git a/lib/testing/src/lib/core/pages/form/widgets/attachFileWidgetCloud.ts b/lib/testing/src/lib/core/pages/form/widgets/attachFileWidgetCloud.ts index ba44e01670..aad2d71f64 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/attachFileWidgetCloud.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/attachFileWidgetCloud.ts @@ -84,9 +84,13 @@ export class AttachFileWidgetCloud { await BrowserVisibility.waitUntilElementIsNotVisible(deleteButton); } - async viewFile(name): Promise { - const fileView = element(this.filesListLocator).element(by.cssContainingText('mat-list-item span ', name)); - await BrowserActions.click(fileView); - await browser.actions().doubleClick(fileView).perform(); + async showFile(name): Promise { + const fileId = await this.getFileId(name); + const optionMenu = this.widget.element(by.css(`button[id='${fileId}-option-menu']`)); + await BrowserActions.click(optionMenu); + await BrowserActions.waitUntilActionMenuIsVisible(); + const showButton = element(by.css(`button#${fileId}-show-file`)); + await BrowserActions.click(showButton); + await BrowserVisibility.waitUntilElementIsNotVisible(showButton); } } diff --git a/lib/testing/src/lib/core/pages/public-api.ts b/lib/testing/src/lib/core/pages/public-api.ts index 301ad324f0..9c26affc5e 100644 --- a/lib/testing/src/lib/core/pages/public-api.ts +++ b/lib/testing/src/lib/core/pages/public-api.ts @@ -27,3 +27,4 @@ export * from './error.page'; export * from './login.page'; export * from './notification-history.page'; export * from './form/public-api'; +export * from './viewerPage'; diff --git a/e2e/pages/adf/viewerPage.ts b/lib/testing/src/lib/core/pages/viewerPage.ts similarity index 98% rename from e2e/pages/adf/viewerPage.ts rename to lib/testing/src/lib/core/pages/viewerPage.ts index 223613454a..7838b24e9f 100644 --- a/e2e/pages/adf/viewerPage.ts +++ b/lib/testing/src/lib/core/pages/viewerPage.ts @@ -15,8 +15,11 @@ * limitations under the License. */ -import { TabsPage, FormControllersPage, BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; -import { element, by, browser, protractor, ElementFinder } from 'protractor'; +import { BrowserActions } from '../utils/browser-actions'; +import { TabsPage } from '../../../lib/material/pages/tabs.page'; +import { FormControllersPage } from './form-controller.page'; +import { BrowserVisibility } from '../utils/browser-visibility'; +import { element, by, ElementFinder, browser, protractor } from 'protractor'; export class ViewerPage {