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 a6d8852288..b326b5ef26 100644 --- a/e2e/content-services/document-list/document-list-component.e2e.ts +++ b/e2e/content-services/document-list/document-list-component.e2e.ts @@ -16,17 +16,15 @@ */ import { browser } from 'protractor'; -import { LoginPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { ViewerPage } from '../../pages/adf/viewerPage'; import TestConfig = require('../../test.config'); import resources = require('../../util/resources'); -import { StringUtil } from '@alfresco/adf-testing'; +import { LoginPage, ErrorPage, StringUtil } from '@alfresco/adf-testing'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../../actions/ACS/upload.actions'; -import { ErrorPage } from '../../pages/adf/errorPage'; import { FileModel } from '../../models/ACS/fileModel'; import moment from 'moment-es6'; diff --git a/e2e/content-services/document-list/document-list-pagination.e2e.ts b/e2e/content-services/document-list/document-list-pagination.e2e.ts index 8e730e0ec7..078982330e 100644 --- a/e2e/content-services/document-list/document-list-pagination.e2e.ts +++ b/e2e/content-services/document-list/document-list-pagination.e2e.ts @@ -17,7 +17,7 @@ import { LoginPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { PaginationPage } from '../../pages/adf/paginationPage'; +import { PaginationPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { AcsUserModel } from '../../models/ACS/acsUserModel'; diff --git a/e2e/content-services/share-file/unshare-file.e2e.ts b/e2e/content-services/share-file/unshare-file.e2e.ts index c0332e0a23..03bbf1c066 100644 --- a/e2e/content-services/share-file/unshare-file.e2e.ts +++ b/e2e/content-services/share-file/unshare-file.e2e.ts @@ -18,9 +18,8 @@ import CONSTANTS = require('../../util/constants'); import { StringUtil } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { LoginPage } from '@alfresco/adf-testing'; +import { LoginPage, ErrorPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { ErrorPage } from '../../pages/adf/errorPage'; 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/trashcan-pagination.e2e.ts b/e2e/content-services/trashcan-pagination.e2e.ts index 6fcc1256fa..6757322023 100644 --- a/e2e/content-services/trashcan-pagination.e2e.ts +++ b/e2e/content-services/trashcan-pagination.e2e.ts @@ -18,7 +18,7 @@ import { LoginPage } from '@alfresco/adf-testing'; import { TrashcanPage } from '../pages/adf/trashcanPage'; -import { PaginationPage } from '../pages/adf/paginationPage'; +import { PaginationPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { AcsUserModel } from '../models/ACS/acsUserModel'; diff --git a/e2e/core/error-component.e2e.ts b/e2e/core/error-component.e2e.ts index 6aa47298d6..7dc52fb019 100644 --- a/e2e/core/error-component.e2e.ts +++ b/e2e/core/error-component.e2e.ts @@ -15,11 +15,10 @@ * limitations under the License. */ -import { LoginPage } from '@alfresco/adf-testing'; +import { LoginPage, ErrorPage } from '@alfresco/adf-testing'; import { AcsUserModel } from '../models/ACS/acsUserModel'; import TestConfig = require('../test.config'); import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; -import { ErrorPage } from '../pages/adf/errorPage'; import { browser } from 'protractor'; describe('Error Component', () => { diff --git a/e2e/core/login/login-component.e2e.ts b/e2e/core/login/login-component.e2e.ts index 99314fa33e..779db702d4 100644 --- a/e2e/core/login/login-component.e2e.ts +++ b/e2e/core/login/login-component.e2e.ts @@ -17,7 +17,7 @@ import { browser } from 'protractor'; -import { LoginPage, SettingsPage } from '@alfresco/adf-testing'; +import { LoginPage, SettingsPage, ErrorPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ProcessServicesPage } from '../../pages/adf/process-services/processServicesPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; @@ -30,7 +30,6 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { Util } from '../../util/util'; -import { ErrorPage } from '../../pages/adf/errorPage'; describe('Login component', () => { diff --git a/e2e/core/pagination-empty-current-page.e2e.ts b/e2e/core/pagination-empty-current-page.e2e.ts index 6c7081dfb5..5ed68ed7a2 100644 --- a/e2e/core/pagination-empty-current-page.e2e.ts +++ b/e2e/core/pagination-empty-current-page.e2e.ts @@ -17,7 +17,7 @@ import { LoginPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../pages/adf/contentServicesPage'; -import { PaginationPage } from '../pages/adf/paginationPage'; +import { PaginationPage } from '@alfresco/adf-testing'; import { ViewerPage } from '../pages/adf/viewerPage'; import { AcsUserModel } from '../models/ACS/acsUserModel'; diff --git a/e2e/core/viewer/viewer-component.e2e.ts b/e2e/core/viewer/viewer-component.e2e.ts index 8bcc16c698..5aaf79da2a 100644 --- a/e2e/core/viewer/viewer-component.e2e.ts +++ b/e2e/core/viewer/viewer-component.e2e.ts @@ -21,8 +21,6 @@ import { LoginPage } from '@alfresco/adf-testing'; import { ViewerPage } from '../../pages/adf/viewerPage'; import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; -import { ShareDialog } from '../../pages/adf/dialog/shareDialog'; -import { AboutPage } from '../../pages/adf/demo-shell/aboutPage'; import CONSTANTS = require('../../util/constants'); import resources = require('../../util/resources'); @@ -34,9 +32,8 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel'; import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { UploadActions } from '../../actions/ACS/upload.actions'; -import { browser } from 'protractor'; -xdescribe('Viewer', () => { +describe('Viewer', () => { const viewerPage = new ViewerPage(); const navigationBarPage = new NavigationBarPage(); @@ -46,9 +43,6 @@ xdescribe('Viewer', () => { let site; const acsUser = new AcsUserModel(); let pngFileUploaded; - const contentList = contentServicesPage.getDocumentList(); - const shareDialog = new ShareDialog(); - const about = new AboutPage(); const pngFileInfo = new FileModel({ 'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, @@ -392,106 +386,4 @@ xdescribe('Viewer', () => { }); - describe('Display files via API', () => { - - const wordFileInfo = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_name, - 'location': resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_location - }); - - let pngFileShared, wordFileUploaded; - - beforeAll(async (done) => { - await this.alfrescoJsApi.login(acsUser.id, acsUser.password); - - wordFileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, wordFileInfo.location, wordFileInfo.name, '-my-'); - - pngFileShared = await this.alfrescoJsApi.core.sharedlinksApi.addSharedLink({ 'nodeId': pngFileUploaded.entry.id }); - - done(); - }); - - afterAll(async (done) => { - await this.alfrescoJsApi.login(acsUser.id, acsUser.password); - await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, wordFileUploaded.entry.id); - done(); - }); - - beforeEach(() => { - loginPage.loginToContentServicesUsingUserModel(acsUser); - }); - - it('[C260105] Should be able to open an image file shared via API', () => { - browser.get(TestConfig.adf.url + '/preview/s/' + pngFileShared.entry.id); - viewerPage.checkImgContainerIsDisplayed(); - browser.get(TestConfig.adf.url); - navigationBarPage.clickLogoutButton(); - browser.get(TestConfig.adf.url + '/preview/s/' + pngFileShared.entry.id); - viewerPage.checkImgContainerIsDisplayed(); - }); - - it('[C260106] Should be able to open a Word file shared via API', () => { - navigationBarPage.clickContentServicesButton(); - contentServicesPage.waitForTableBody(); - - contentList.selectRow(wordFileInfo.name); - contentServicesPage.clickShareButton(); - shareDialog.checkDialogIsDisplayed(); - shareDialog.clickShareLinkButton(); - browser.controlFlow().execute(async () => { - const sharedLink = await shareDialog.getShareLink(); - - await browser.get(sharedLink); - viewerPage.checkFileIsLoaded(); - viewerPage.checkFileNameIsDisplayed(wordFileInfo.name); - - await browser.get(TestConfig.adf.url); - navigationBarPage.clickLogoutButton(); - await browser.get(sharedLink); - viewerPage.checkFileIsLoaded(); - viewerPage.checkFileNameIsDisplayed(wordFileInfo.name); - }); - }); - }); - - describe('Viewer - Code editor extension', () => { - - const jsFileInfo = new FileModel({ - 'name': resources.Files.ADF_DOCUMENTS.JS.file_name, - 'location': resources.Files.ADF_DOCUMENTS.JS.file_location - }); - - let jsFileUploaded; - - beforeAll(async (done) => { - await this.alfrescoJsApi.login(acsUser.id, acsUser.password); - - jsFileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, jsFileInfo.location, jsFileInfo.name, '-my-'); - - loginPage.loginToContentServicesUsingUserModel(acsUser); - - done(); - }); - - afterAll(async (done) => { - await this.alfrescoJsApi.login(acsUser.id, acsUser.password); - await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, jsFileUploaded.entry.id); - done(); - }); - - it('[C297698] Should be able to add an extension for code editor viewer', () => { - navigationBarPage.checkAboutButtonIsDisplayed(); - navigationBarPage.clickAboutButton(); - - about.checkMonacoPluginIsDisplayed(); - - navigationBarPage.clickContentServicesButton(); - - contentServicesPage.waitForTableBody(); - contentServicesPage.checkContentIsDisplayed(jsFileInfo.name); - contentServicesPage.doubleClickRow(jsFileInfo.name); - - viewerPage.checkCodeViewerIsDisplayed(); - }); - }); }); diff --git a/e2e/core/viewer/viewer-extension.e2e.ts b/e2e/core/viewer/viewer-extension.e2e.ts new file mode 100644 index 0000000000..bd194b723d --- /dev/null +++ b/e2e/core/viewer/viewer-extension.e2e.ts @@ -0,0 +1,105 @@ +/*! + * @license + * Copyright 2019 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import TestConfig = require('../../test.config'); + +import { LoginPage } from '@alfresco/adf-testing'; +import { ViewerPage } from '../../pages/adf/viewerPage'; +import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; +import { MonacoExtensionPage } from '../../pages/adf/demo-shell/monacoExtensionPage'; + +import CONSTANTS = require('../../util/constants'); +import resources = require('../../util/resources'); +import { StringUtil } from '@alfresco/adf-testing'; + +import { FileModel } from '../../models/ACS/fileModel'; +import { AcsUserModel } from '../../models/ACS/acsUserModel'; + +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; +import { UploadActions } from '../../actions/ACS/upload.actions'; + +describe('Viewer', () => { + + const viewerPage = new ViewerPage(); + const navigationBarPage = new NavigationBarPage(); + const loginPage = new LoginPage(); + const contentServicesPage = new ContentServicesPage(); + const uploadActions = new UploadActions(); + let site; + const acsUser = new AcsUserModel(); + const monacoExtensionPage = new MonacoExtensionPage(); + + let jsFileUploaded; + const jsFileInfo = new FileModel({ + 'name': resources.Files.ADF_DOCUMENTS.JS.file_name, + 'location': resources.Files.ADF_DOCUMENTS.JS.file_location + }); + + beforeAll(async (done) => { + + this.alfrescoJsApi = new AlfrescoApi({ + provider: 'ECM', + hostEcm: TestConfig.adf.url + }); + + await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); + + site = await this.alfrescoJsApi.core.sitesApi.createSite({ + title: StringUtil.generateRandomString(8), + visibility: 'PUBLIC' + }); + + await this.alfrescoJsApi.core.sitesApi.addSiteMember(site.entry.id, { + id: acsUser.id, + role: CONSTANTS.CS_USER_ROLES.MANAGER + }); + + await this.alfrescoJsApi.login(acsUser.id, acsUser.password); + + jsFileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, jsFileInfo.location, jsFileInfo.name, '-my-'); + + loginPage.loginToContentServicesUsingUserModel(acsUser); + + done(); + }); + + afterAll(async (done) => { + await this.alfrescoJsApi.login(acsUser.id, acsUser.password); + await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, jsFileUploaded.entry.id); + done(); + }); + + describe('Viewer extension', () => { + + it('[C297698] Should be able to add an extension for code editor viewer', () => { + navigationBarPage.checkAboutButtonIsDisplayed(); + navigationBarPage.clickAboutButton(); + + monacoExtensionPage.checkMonacoPluginIsDisplayed(); + + navigationBarPage.clickContentServicesButton(); + + contentServicesPage.waitForTableBody(); + contentServicesPage.checkContentIsDisplayed(jsFileInfo.name); + contentServicesPage.doubleClickRow(jsFileInfo.name); + + viewerPage.checkCodeViewerIsDisplayed(); + }); + }); +}); diff --git a/e2e/core/viewer/viewer-share-content.ts b/e2e/core/viewer/viewer-share-content.ts new file mode 100644 index 0000000000..734365305d --- /dev/null +++ b/e2e/core/viewer/viewer-share-content.ts @@ -0,0 +1,136 @@ +/*! + * @license + * Copyright 2019 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import TestConfig = require('../../test.config'); + +import { LoginPage } from '@alfresco/adf-testing'; +import { ViewerPage } from '../../pages/adf/viewerPage'; +import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; +import { ShareDialog } from '../../pages/adf/dialog/shareDialog'; + +import CONSTANTS = require('../../util/constants'); +import resources = require('../../util/resources'); +import { StringUtil } from '@alfresco/adf-testing'; + +import { FileModel } from '../../models/ACS/fileModel'; +import { AcsUserModel } from '../../models/ACS/acsUserModel'; + +import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; +import { UploadActions } from '../../actions/ACS/upload.actions'; +import { browser } from 'protractor'; + +describe('Viewer', () => { + + const viewerPage = new ViewerPage(); + const navigationBarPage = new NavigationBarPage(); + const loginPage = new LoginPage(); + const contentServicesPage = new ContentServicesPage(); + const uploadActions = new UploadActions(); + let site; + const acsUser = new AcsUserModel(); + let pngFileUploaded; + const contentList = contentServicesPage.getDocumentList(); + const shareDialog = new ShareDialog(); + + const pngFileInfo = new FileModel({ + 'name': resources.Files.ADF_DOCUMENTS.PNG.file_name, + 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location + }); + + const wordFileInfo = new FileModel({ + 'name': resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_name, + 'location': resources.Files.ADF_DOCUMENTS.DOCX_SUPPORTED.file_location + }); + + let pngFileShared, wordFileUploaded; + + beforeAll(async (done) => { + + this.alfrescoJsApi = new AlfrescoApi({ + provider: 'ECM', + hostEcm: TestConfig.adf.url + }); + + await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword); + await this.alfrescoJsApi.core.peopleApi.addPerson(acsUser); + + site = await this.alfrescoJsApi.core.sitesApi.createSite({ + title: StringUtil.generateRandomString(8), + visibility: 'PUBLIC' + }); + + await this.alfrescoJsApi.core.sitesApi.addSiteMember(site.entry.id, { + id: acsUser.id, + role: CONSTANTS.CS_USER_ROLES.MANAGER + }); + + await this.alfrescoJsApi.login(acsUser.id, acsUser.password); + + pngFileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, pngFileInfo.location, pngFileInfo.name, site.entry.guid); + + await this.alfrescoJsApi.login(acsUser.id, acsUser.password); + + wordFileUploaded = await uploadActions.uploadFile(this.alfrescoJsApi, wordFileInfo.location, wordFileInfo.name, '-my-'); + + pngFileShared = await this.alfrescoJsApi.core.sharedlinksApi.addSharedLink({ 'nodeId': pngFileUploaded.entry.id }); + + done(); + }); + + afterAll(async (done) => { + await this.alfrescoJsApi.login(acsUser.id, acsUser.password); + await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, wordFileUploaded.entry.id); + done(); + }); + + beforeEach(() => { + loginPage.loginToContentServicesUsingUserModel(acsUser); + }); + + it('[C260105] Should be able to open an image file shared via API', () => { + browser.get(TestConfig.adf.url + '/preview/s/' + pngFileShared.entry.id); + viewerPage.checkImgContainerIsDisplayed(); + browser.get(TestConfig.adf.url); + navigationBarPage.clickLogoutButton(); + browser.get(TestConfig.adf.url + '/preview/s/' + pngFileShared.entry.id); + viewerPage.checkImgContainerIsDisplayed(); + }); + + it('[C260106] Should be able to open a Word file shared via API', () => { + navigationBarPage.clickContentServicesButton(); + contentServicesPage.waitForTableBody(); + + contentList.selectRow(wordFileInfo.name); + contentServicesPage.clickShareButton(); + shareDialog.checkDialogIsDisplayed(); + shareDialog.clickShareLinkButton(); + browser.controlFlow().execute(async () => { + const sharedLink = await shareDialog.getShareLink(); + + await browser.get(sharedLink); + viewerPage.checkFileIsLoaded(); + viewerPage.checkFileNameIsDisplayed(wordFileInfo.name); + + await browser.get(TestConfig.adf.url); + navigationBarPage.clickLogoutButton(); + await browser.get(sharedLink); + viewerPage.checkFileIsLoaded(); + viewerPage.checkFileNameIsDisplayed(wordFileInfo.name); + }); + }); +}); diff --git a/e2e/pages/adf/demo-shell/aboutPage.ts b/e2e/pages/adf/demo-shell/monacoExtensionPage.ts similarity index 96% rename from e2e/pages/adf/demo-shell/aboutPage.ts rename to e2e/pages/adf/demo-shell/monacoExtensionPage.ts index 8e025dc9e7..7c4270bc1e 100644 --- a/e2e/pages/adf/demo-shell/aboutPage.ts +++ b/e2e/pages/adf/demo-shell/monacoExtensionPage.ts @@ -18,7 +18,7 @@ import { by, element } from 'protractor'; import { BrowserVisibility } from '@alfresco/adf-testing'; -export class AboutPage { +export class MonacoExtensionPage { monacoPlugin = element(by.cssContainingText('mat-row > mat-cell', 'monaco plugin')); diff --git a/e2e/pages/adf/demo-shell/process-services/taskListDemoPage.ts b/e2e/pages/adf/demo-shell/process-services/taskListDemoPage.ts index 095b122b82..5e9d216baf 100644 --- a/e2e/pages/adf/demo-shell/process-services/taskListDemoPage.ts +++ b/e2e/pages/adf/demo-shell/process-services/taskListDemoPage.ts @@ -16,7 +16,7 @@ */ import { TasksListPage } from '../../process-services/tasksListPage'; -import { PaginationPage } from '../../paginationPage'; +import { PaginationPage } from '@alfresco/adf-testing'; import { element, by } from 'protractor'; import { BrowserVisibility } from '@alfresco/adf-testing'; diff --git a/e2e/pages/adf/viewerPage.ts b/e2e/pages/adf/viewerPage.ts index 918d0cb756..38b37971fc 100644 --- a/e2e/pages/adf/viewerPage.ts +++ b/e2e/pages/adf/viewerPage.ts @@ -62,9 +62,7 @@ export class ViewerPage { toolbarSwitch = element(by.id('adf-switch-toolbar')); toolbar = element(by.id('adf-viewer-toolbar')); lastButton = element.all(by.css('#adf-viewer-toolbar mat-toolbar > button[data-automation-id*="adf-toolbar-"]')).last(); - datatableHeader = element(by.css('div.adf-datatable-header')); goBackSwitch = element(by.id('adf-switch-goback')); - tabLabel = element(by.css('div[class="mat-tab-label-content"]')); openWithSwitch = element(by.id('adf-switch-openwith')); openWith = element(by.id('adf-viewer-openwith')); diff --git a/e2e/process-services/custom-tasks-filters.e2e.ts b/e2e/process-services/custom-tasks-filters.e2e.ts index 67ecdcda38..80afd82f7f 100644 --- a/e2e/process-services/custom-tasks-filters.e2e.ts +++ b/e2e/process-services/custom-tasks-filters.e2e.ts @@ -18,7 +18,7 @@ import { LoginPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { TaskListDemoPage } from '../pages/adf/demo-shell/process-services/taskListDemoPage'; -import { PaginationPage } from '../pages/adf/paginationPage'; +import { PaginationPage } from '@alfresco/adf-testing'; import moment = require('moment'); import { Tenant } from '../models/APS/tenant'; diff --git a/e2e/process-services/pagination-processlist-addingProcesses.e2e.ts b/e2e/process-services/pagination-processlist-addingProcesses.e2e.ts index fba08e2837..dac9b6a373 100644 --- a/e2e/process-services/pagination-processlist-addingProcesses.e2e.ts +++ b/e2e/process-services/pagination-processlist-addingProcesses.e2e.ts @@ -16,7 +16,7 @@ */ import { LoginPage } from '@alfresco/adf-testing'; -import { PaginationPage } from '../pages/adf/paginationPage'; +import { PaginationPage } from '@alfresco/adf-testing'; import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; diff --git a/e2e/process-services/pagination-tasklist-addingTasks.e2e.ts b/e2e/process-services/pagination-tasklist-addingTasks.e2e.ts index 79bffd22d6..b7135df369 100644 --- a/e2e/process-services/pagination-tasklist-addingTasks.e2e.ts +++ b/e2e/process-services/pagination-tasklist-addingTasks.e2e.ts @@ -17,7 +17,7 @@ import { LoginPage } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasksPage'; -import { PaginationPage } from '../pages/adf/paginationPage'; +import { PaginationPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import CONSTANTS = require('../util/constants'); diff --git a/e2e/process-services/processlist-pagination.e2e.ts b/e2e/process-services/processlist-pagination.e2e.ts index a1042e3621..a34a5ac759 100644 --- a/e2e/process-services/processlist-pagination.e2e.ts +++ b/e2e/process-services/processlist-pagination.e2e.ts @@ -17,7 +17,7 @@ import { LoginPage } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { PaginationPage } from '../pages/adf/paginationPage'; +import { PaginationPage } from '@alfresco/adf-testing'; import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage'; import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage'; diff --git a/e2e/process-services/sort-tasklist-pagination.e2e.ts b/e2e/process-services/sort-tasklist-pagination.e2e.ts index 113034500c..f43b1fbea5 100644 --- a/e2e/process-services/sort-tasklist-pagination.e2e.ts +++ b/e2e/process-services/sort-tasklist-pagination.e2e.ts @@ -18,7 +18,7 @@ import { LoginPage } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { PaginationPage } from '../pages/adf/paginationPage'; +import { PaginationPage } from '@alfresco/adf-testing'; import CONSTANTS = require('../util/constants'); diff --git a/e2e/process-services/task-list-pagination.e2e.ts b/e2e/process-services/task-list-pagination.e2e.ts index 5d35e95fb5..977786ac9f 100644 --- a/e2e/process-services/task-list-pagination.e2e.ts +++ b/e2e/process-services/task-list-pagination.e2e.ts @@ -18,7 +18,7 @@ import { LoginPage } from '@alfresco/adf-testing'; import { TasksPage } from '../pages/adf/process-services/tasksPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; -import { PaginationPage } from '../pages/adf/paginationPage'; +import { PaginationPage } from '@alfresco/adf-testing'; import CONSTANTS = require('../util/constants'); diff --git a/e2e/resources/adf/allFileTypes/documents/ppt/a_ppsm_file.ppsm b/e2e/resources/adf/allFileTypes/documents/ppt/a_ppsm_file.ppsm deleted file mode 100644 index 2481d340f4..0000000000 Binary files a/e2e/resources/adf/allFileTypes/documents/ppt/a_ppsm_file.ppsm and /dev/null differ diff --git a/e2e/search/search-filters.e2e.ts b/e2e/search/search-filters.e2e.ts index 708e881d40..f703fe10b9 100644 --- a/e2e/search/search-filters.e2e.ts +++ b/e2e/search/search-filters.e2e.ts @@ -18,7 +18,7 @@ import { LoginPage } from '@alfresco/adf-testing'; import { SearchDialog } from '../pages/adf/dialog/searchDialog'; import { SearchFiltersPage } from '../pages/adf/searchFiltersPage'; -import { PaginationPage } from '../pages/adf/paginationPage'; +import { PaginationPage } from '@alfresco/adf-testing'; import { DocumentListPage } from '../pages/adf/content-services/documentListPage'; import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { ConfigEditorPage } from '../pages/adf/configEditorPage'; diff --git a/e2e/pages/adf/errorPage.ts b/lib/testing/src/lib/core/pages/error.page.ts similarity index 96% rename from e2e/pages/adf/errorPage.ts rename to lib/testing/src/lib/core/pages/error.page.ts index 32ae2005ea..ad07f823bb 100644 --- a/e2e/pages/adf/errorPage.ts +++ b/lib/testing/src/lib/core/pages/error.page.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { BrowserVisibility } from '@alfresco/adf-testing'; +import { BrowserVisibility } from '../../core/browser-visibility'; import { element, by } from 'protractor'; export class ErrorPage { diff --git a/e2e/pages/adf/paginationPage.ts b/lib/testing/src/lib/core/pages/pagination.page.ts similarity index 98% rename from e2e/pages/adf/paginationPage.ts rename to lib/testing/src/lib/core/pages/pagination.page.ts index 3ee35d6c1a..b900d104eb 100644 --- a/e2e/pages/adf/paginationPage.ts +++ b/lib/testing/src/lib/core/pages/pagination.page.ts @@ -16,7 +16,7 @@ */ import { browser, by, element, protractor } from 'protractor'; -import { BrowserVisibility } from '@alfresco/adf-testing'; +import { BrowserVisibility } from '../../core/browser-visibility'; export class PaginationPage { diff --git a/lib/testing/src/lib/core/pages/public-api.ts b/lib/testing/src/lib/core/pages/public-api.ts index 111bfe31d1..c66c2d6c8a 100644 --- a/lib/testing/src/lib/core/pages/public-api.ts +++ b/lib/testing/src/lib/core/pages/public-api.ts @@ -22,3 +22,6 @@ export * from './settings.page'; export * from './form-controller.page'; export * from './login-sso.page'; export * from './data-table-component.page'; +export * from './pagination.page'; +export * from './error.page'; +export * from './login.page'; diff --git a/scripts/clean-env.js b/scripts/clean-env.js index 5f5e0594f1..56f0f3b5d5 100644 --- a/scripts/clean-env.js +++ b/scripts/clean-env.js @@ -17,13 +17,13 @@ async function main() { await this.alfrescoJsApi.login(program.username, program.password); - // await cleanRoot(this.alfrescoJsApi); + await cleanRoot(this.alfrescoJsApi); await deleteSite(this.alfrescoJsApi); await emptyTrashCan(this.alfrescoJsApi); } async function cleanRoot(alfrescoJsApi) { - console.log('start'); + console.log('====== Clean Root ======'); let rootNodes = await alfrescoJsApi.core.nodesApi.getNodeChildren('-root-'); @@ -45,6 +45,8 @@ async function cleanRoot(alfrescoJsApi) { } async function emptyTrashCan(alfrescoJsApi) { + console.log('====== Clean Trash ======'); + let deletedNodes = await alfrescoJsApi.core.nodesApi.getDeletedNodes(); for (let i = 0; i < deletedNodes.list.entries.length; i++) { @@ -57,7 +59,6 @@ async function emptyTrashCan(alfrescoJsApi) { await alfrescoJsApi.core.nodesApi.purgeDeletedNode(deletedNodes.list.entries[i].entry.id); } catch (error) { console.log('error' + JSON.stringify(error)); - } } @@ -65,6 +66,8 @@ async function emptyTrashCan(alfrescoJsApi) { } async function deleteSite(alfrescoJsApi) { + console.log('====== Clean Sites ======'); + let listSites = await this.alfrescoJsApi.core.sitesApi.getSites(); console.log(listSites.list.pagination.totalItems);