diff --git a/e2e/content-services/components/permissions-component.e2e.ts b/e2e/content-services/components/permissions-component.e2e.ts index 211e2d4759..92e7399465 100644 --- a/e2e/content-services/components/permissions-component.e2e.ts +++ b/e2e/content-services/components/permissions-component.e2e.ts @@ -35,7 +35,7 @@ import { browser } from 'protractor'; import { FolderModel } from '../../models/ACS/folder.model'; import { MetadataViewPage } from '../../core/pages/metadata-view.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; -import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page'; +import { UploadDialogPage } from '../pages/upload-dialog.page'; import { GroupsApi, NodeEntry } from '@alfresco/js-api'; describe('Permissions Component', () => { diff --git a/e2e/core/viewer/viewer-content-services-component.e2e.ts b/e2e/content-services/components/viewer-content-services-component.e2e.ts similarity index 99% rename from e2e/core/viewer/viewer-content-services-component.e2e.ts rename to e2e/content-services/components/viewer-content-services-component.e2e.ts index f0aadfd7fb..1cb99ff05c 100644 --- a/e2e/core/viewer/viewer-content-services-component.e2e.ts +++ b/e2e/content-services/components/viewer-content-services-component.e2e.ts @@ -28,7 +28,7 @@ import { ContentServicesPage } from '../../core/pages/content-services.page'; import { FileModel } from '../../models/ACS/file.model'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { VersionManagePage } from '../pages/version-manager.page'; -import { MetadataViewPage } from '../pages/metadata-view.page'; +import { MetadataViewPage } from '../../core/pages/metadata-view.page'; describe('Content Services Viewer', () => { const acsUser = new UserModel(); diff --git a/e2e/content-services/components/viewer-vesion.e2e.ts b/e2e/content-services/components/viewer-vesion.e2e.ts new file mode 100644 index 0000000000..635246b01c --- /dev/null +++ b/e2e/content-services/components/viewer-vesion.e2e.ts @@ -0,0 +1,94 @@ +/*! + * @license + * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved. + * + * 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 { browser } from 'protractor'; +import { createApiService, FileBrowserUtil, LoginPage, UploadActions, UserModel, UsersActions, ViewerPage } from '@alfresco/adf-testing'; +import { ContentServicesPage } from '../../core/pages/content-services.page'; +import { FileModel } from '../../models/ACS/file.model'; +import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; +import { VersionManagePage } from '../pages/version-manager.page'; + +describe('Viewer', () => { + + const navigationBarPage = new NavigationBarPage(); + const viewerPage = new ViewerPage(); + const loginPage = new LoginPage(); + const contentServicesPage = new ContentServicesPage(); + + const apiService = createApiService(); + const uploadActions = new UploadActions(apiService); + const usersActions = new UsersActions(apiService); + + const versionManagePage = new VersionManagePage(); + const acsUser = new UserModel(); + let txtFileUploaded; + + const txtFileInfo = new FileModel({ + name: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_path + }); + + const fileModelVersionTwo = new FileModel({ + name: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_name, + location: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location + }); + + beforeAll(async () => { + await apiService.loginWithProfile('admin'); + await usersActions.createUser(acsUser); + + await apiService.login(acsUser.username, acsUser.password); + + txtFileUploaded = await uploadActions.uploadFile(txtFileInfo.location, txtFileInfo.name, '-my-'); + + await loginPage.login(acsUser.username, acsUser.password); + }); + + afterAll(async () => { + await apiService.loginWithProfile('admin'); + await uploadActions.deleteFileOrFolder(txtFileUploaded.entry.id); + await navigationBarPage.clickLogoutButton(); + }); + + beforeEach(async () => { + await contentServicesPage.goToDocumentList(); + await contentServicesPage.doubleClickRow(txtFileUploaded.entry.name); + await viewerPage.waitTillContentLoaded(); + }); + + afterEach(async () => { + await viewerPage.clickCloseButton(); + }); + + it('[C362242] Should the Viewer be able to view a previous version of a file', async () => { + await contentServicesPage.versionManagerContent(txtFileInfo.name); + await versionManagePage.showNewVersionButton.click(); + await versionManagePage.uploadNewVersionFile(fileModelVersionTwo.location); + await versionManagePage.closeVersionDialog(); + await contentServicesPage.doubleClickRow(txtFileUploaded.entry.name); + await viewerPage.waitTillContentLoaded(); + await viewerPage.clickInfoButton(); + await viewerPage.clickOnTab('Versions'); + await versionManagePage.viewFileVersion('1.0'); + await viewerPage.expectUrlToContain('1.0'); + }); + + it('[C362265] Should the Viewer be able to download a previous version of a file', async () => { + await viewerPage.clickDownloadButton(); + await FileBrowserUtil.isFileDownloaded(txtFileInfo.name); + }); +}); 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 97bf66840c..bef68ea475 100644 --- a/e2e/content-services/document-list/document-list-pagination.e2e.ts +++ b/e2e/content-services/document-list/document-list-pagination.e2e.ts @@ -31,7 +31,7 @@ import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { FolderModel } from '../../models/ACS/folder.model'; import { browser } from 'protractor'; import { FileModel } from '../../models/ACS/file.model'; -import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page'; +import { UploadDialogPage } from '../pages/upload-dialog.page'; describe('Document List - Pagination', () => { const pagination = { diff --git a/e2e/content-services/document-list/document-list-selection.e2e.ts b/e2e/content-services/document-list/document-list-selection.e2e.ts index 6d652c7bc3..68e86b8a9f 100644 --- a/e2e/content-services/document-list/document-list-selection.e2e.ts +++ b/e2e/content-services/document-list/document-list-selection.e2e.ts @@ -21,7 +21,7 @@ import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { FolderModel } from '../../models/ACS/folder.model'; import { browser } from 'protractor'; import { FileModel } from '../../models/ACS/file.model'; -import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page'; +import { UploadDialogPage } from '../pages/upload-dialog.page'; describe('Document List - Selection', () => { const loginPage = new LoginPage(); diff --git a/e2e/core/pages/dialog/upload-dialog.page.ts b/e2e/content-services/pages/upload-dialog.page.ts similarity index 100% rename from e2e/core/pages/dialog/upload-dialog.page.ts rename to e2e/content-services/pages/upload-dialog.page.ts diff --git a/e2e/core/pages/version-manager.page.ts b/e2e/content-services/pages/version-manager.page.ts similarity index 100% rename from e2e/core/pages/version-manager.page.ts rename to e2e/content-services/pages/version-manager.page.ts diff --git a/e2e/content-services/upload/cancel-upload.e2e.ts b/e2e/content-services/upload/cancel-upload.e2e.ts index 996ff6f578..a3e68a6dd0 100644 --- a/e2e/content-services/upload/cancel-upload.e2e.ts +++ b/e2e/content-services/upload/cancel-upload.e2e.ts @@ -18,7 +18,7 @@ import { browser } from 'protractor'; import { createApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../core/pages/content-services.page'; -import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page'; +import { UploadDialogPage } from '../pages/upload-dialog.page'; import { UploadTogglesPage } from '../../core/pages/dialog/upload-toggles.page'; import { FileModel } from '../../models/ACS/file.model'; diff --git a/e2e/content-services/upload/excluded-file.e2e.ts b/e2e/content-services/upload/excluded-file.e2e.ts index ad79d89352..08622a54ae 100644 --- a/e2e/content-services/upload/excluded-file.e2e.ts +++ b/e2e/content-services/upload/excluded-file.e2e.ts @@ -24,7 +24,7 @@ import { createApiService, UsersActions } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../core/pages/content-services.page'; -import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page'; +import { UploadDialogPage } from '../pages/upload-dialog.page'; import { UploadTogglesPage } from '../../core/pages/dialog/upload-toggles.page'; import { FileModel } from '../../models/ACS/file.model'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; diff --git a/e2e/content-services/upload/upload-dialog.e2e.ts b/e2e/content-services/upload/upload-dialog.e2e.ts index 6640b58253..9265c572cf 100644 --- a/e2e/content-services/upload/upload-dialog.e2e.ts +++ b/e2e/content-services/upload/upload-dialog.e2e.ts @@ -17,11 +17,11 @@ import { createApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../core/pages/content-services.page'; -import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page'; +import { UploadDialogPage } from '../pages/upload-dialog.page'; import { UploadTogglesPage } from '../../core/pages/dialog/upload-toggles.page'; import { FileModel } from '../../models/ACS/file.model'; import { browser } from 'protractor'; -import { VersionManagePage } from '../../core/pages/version-manager.page'; +import { VersionManagePage } from '../pages/version-manager.page'; describe('Upload component', () => { diff --git a/e2e/content-services/upload/uploader-component.e2e.ts b/e2e/content-services/upload/uploader-component.e2e.ts index f61a66d915..6c171ec05b 100644 --- a/e2e/content-services/upload/uploader-component.e2e.ts +++ b/e2e/content-services/upload/uploader-component.e2e.ts @@ -26,7 +26,7 @@ import { createApiService, UsersActions } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../core/pages/content-services.page'; -import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page'; +import { UploadDialogPage } from '../pages/upload-dialog.page'; import { UploadTogglesPage } from '../../core/pages/dialog/upload-toggles.page'; import { FileModel } from '../../models/ACS/file.model'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; diff --git a/e2e/content-services/upload/user-permission.e2e.ts b/e2e/content-services/upload/user-permission.e2e.ts index ac9fe598a9..8a952eec68 100644 --- a/e2e/content-services/upload/user-permission.e2e.ts +++ b/e2e/content-services/upload/user-permission.e2e.ts @@ -18,7 +18,7 @@ import { browser } from 'protractor'; import { createApiService, LoginPage, SnackbarPage, StringUtil, UserModel, UsersActions } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../core/pages/content-services.page'; -import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page'; +import { UploadDialogPage } from '../pages/upload-dialog.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { FileModel } from '../../models/ACS/file.model'; import CONSTANTS = require('../../util/constants'); diff --git a/e2e/content-services/upload/version-actions.e2e.ts b/e2e/content-services/upload/version-actions.e2e.ts index 043cb68d0d..9bcd9cd371 100644 --- a/e2e/content-services/upload/version-actions.e2e.ts +++ b/e2e/content-services/upload/version-actions.e2e.ts @@ -28,9 +28,9 @@ import { createApiService, import { browser, by, element } from 'protractor'; import { FileModel } from '../../models/ACS/file.model'; import { ContentServicesPage } from '../../core/pages/content-services.page'; -import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page'; +import { UploadDialogPage } from '../pages/upload-dialog.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; -import { VersionManagePage } from '../../core/pages/version-manager.page'; +import { VersionManagePage } from '../pages/version-manager.page'; describe('Version component actions', () => { diff --git a/e2e/content-services/upload/version-permissions.e2e.ts b/e2e/content-services/upload/version-permissions.e2e.ts index 5203df7963..7dae21aaf7 100644 --- a/e2e/content-services/upload/version-permissions.e2e.ts +++ b/e2e/content-services/upload/version-permissions.e2e.ts @@ -26,8 +26,8 @@ import { UsersActions } from '@alfresco/adf-testing'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; -import { VersionManagePage } from '../../core/pages/version-manager.page'; -import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page'; +import { VersionManagePage } from '../pages/version-manager.page'; +import { UploadDialogPage } from '../pages/upload-dialog.page'; import { ContentServicesPage } from '../../core/pages/content-services.page'; import { FileModel } from '../../models/ACS/file.model'; import CONSTANTS = require('../../util/constants'); diff --git a/e2e/content-services/upload/version-properties.e2e.ts b/e2e/content-services/upload/version-properties.e2e.ts index 726fbc2ee0..2430500a48 100644 --- a/e2e/content-services/upload/version-properties.e2e.ts +++ b/e2e/content-services/upload/version-properties.e2e.ts @@ -24,7 +24,7 @@ import { createApiService, UsersActions, ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../core/pages/content-services.page'; -import { VersionManagePage } from '../../core/pages/version-manager.page'; +import { VersionManagePage } from '../pages/version-manager.page'; import { FileModel } from '../../models/ACS/file.model'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; diff --git a/e2e/content-services/upload/version-smoke-tests.e2e.ts b/e2e/content-services/upload/version-smoke-tests.e2e.ts index c6f5439b09..3b6930be86 100644 --- a/e2e/content-services/upload/version-smoke-tests.e2e.ts +++ b/e2e/content-services/upload/version-smoke-tests.e2e.ts @@ -18,7 +18,7 @@ import { browser } from 'protractor'; import { createApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../core/pages/content-services.page'; -import { VersionManagePage } from '../../core/pages/version-manager.page'; +import { VersionManagePage } from '../pages/version-manager.page'; import { FileModel } from '../../models/ACS/file.model'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; 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 083a3d419d..966ba8d893 100644 --- a/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts +++ b/e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts @@ -16,11 +16,10 @@ */ import { browser } from 'protractor'; -import { createApiService, FileBrowserUtil, LoginPage, UploadActions, UserModel, UsersActions, ViewerPage } from '@alfresco/adf-testing'; +import { createApiService, LoginPage, UploadActions, UserModel, UsersActions, ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../core/pages/content-services.page'; import { FileModel } from '../../models/ACS/file.model'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; -import { VersionManagePage } from '../pages/version-manager.page'; describe('Viewer', () => { @@ -33,7 +32,6 @@ describe('Viewer', () => { const uploadActions = new UploadActions(apiService); const usersActions = new UsersActions(apiService); - const versionManagePage = new VersionManagePage(); const acsUser = new UserModel(); let txtFileUploaded; @@ -94,21 +92,4 @@ describe('Viewer', () => { await viewerPage.checkTabIsActive('Versions'); }); - it('[C362242] Should the Viewer be able to view a previous version of a file', async () => { - await contentServicesPage.versionManagerContent(txtFileInfo.name); - await versionManagePage.showNewVersionButton.click(); - await versionManagePage.uploadNewVersionFile(fileModelVersionTwo.location); - await versionManagePage.closeVersionDialog(); - await contentServicesPage.doubleClickRow(txtFileUploaded.entry.name); - await viewerPage.waitTillContentLoaded(); - await viewerPage.clickInfoButton(); - await viewerPage.clickOnTab('Versions'); - await versionManagePage.viewFileVersion('1.0'); - await viewerPage.expectUrlToContain('1.0'); - }); - - it('[C362265] Should the Viewer be able to download a previous version of a file', async () => { - await viewerPage.clickDownloadButton(); - await FileBrowserUtil.isFileDownloaded(txtFileInfo.name); - }); }); diff --git a/lib/content-services/src/lib/audit/audit.service.ts b/lib/content-services/src/lib/audit/audit.service.ts index 49086295d6..5fc52e959d 100644 --- a/lib/content-services/src/lib/audit/audit.service.ts +++ b/lib/content-services/src/lib/audit/audit.service.ts @@ -45,6 +45,7 @@ export class AuditService { /** * Gets a list of audit applications. + * * @param opts Options. * @returns a list of the audit applications. */ @@ -61,6 +62,7 @@ export class AuditService { /** * Get audit application info. + * * @param auditApplicationId The identifier of an audit application. * @param opts Options. * @returns status of an audit application. @@ -78,6 +80,7 @@ export class AuditService { /** * Update audit application info. + * * @param auditApplicationId The identifier of an audit application. * @param auditAppBodyUpdate The audit application to update. * @param opts Options. @@ -94,6 +97,7 @@ export class AuditService { /** * List audit entries for an audit application. + * * @param auditApplicationId The identifier of an audit application. * @param opts Options. * @returns a list of audit entries. @@ -112,6 +116,7 @@ export class AuditService { /** * Get audit entry. + * * @param auditApplicationId The identifier of an audit application. * @param auditEntryId The identifier of an audit entry. * @param opts Options. @@ -128,6 +133,7 @@ export class AuditService { /** * List audit entries for a node. + * * @param nodeId The identifier of a node. * @param opts Options. * @returns @@ -145,6 +151,7 @@ export class AuditService { /** * Permanently delete audit entries for an audit application. + * * @param auditApplicationId The identifier of an audit application. * @param where Audit entries to permanently delete for an audit application, given an inclusive time period or range of ids. * @returns @@ -158,6 +165,7 @@ export class AuditService { /** * Permanently delete an audit entry. + * * @param auditApplicationId The identifier of an audit application. * @param auditEntryId The identifier of an audit entry. * @returns diff --git a/lib/core/src/lib/testing/core.story.module.ts b/lib/core/src/lib/testing/core.story.module.ts index e368b8f409..516804b03f 100644 --- a/lib/core/src/lib/testing/core.story.module.ts +++ b/lib/core/src/lib/testing/core.story.module.ts @@ -20,9 +20,11 @@ import { CoreModule } from '../core.module'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { TranslateModule } from '@ngx-translate/core'; import { provideTranslations } from '../translation/translation.service'; +import { AuthModule } from '../../../src/lib/auth/oidc/auth.module'; @NgModule({ imports: [ + AuthModule.forRoot(), TranslateModule.forRoot(), CoreModule.forRoot(), BrowserAnimationsModule diff --git a/lib/process-services-cloud/src/lib/form/services/content-cloud-node-selector.service.spec.ts b/lib/process-services-cloud/src/lib/form/services/content-cloud-node-selector.service.spec.ts index 48af074828..46d24a488c 100644 --- a/lib/process-services-cloud/src/lib/form/services/content-cloud-node-selector.service.spec.ts +++ b/lib/process-services-cloud/src/lib/form/services/content-cloud-node-selector.service.spec.ts @@ -61,13 +61,13 @@ describe('ContentCloudNodeSelectorService', () => { dialog = TestBed.inject(MatDialog); showWarningSpy = spyOn(notificationService, 'showWarning'); - openDialogSpy = spyOn(dialog, 'open').and.returnValue( { + openDialogSpy = spyOn(dialog, 'open').and.returnValue( { afterOpened: () => of({}), afterClosed: () => of({}), componentInstance: { error: new Subject() } - }); + } as any); getNodeSpy = spyOn(service.nodesApi, 'getNode'); }); diff --git a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts index fee25b5ea0..6ad5521969 100644 --- a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts @@ -616,7 +616,6 @@ describe('ProcessListCloudComponent: Injecting custom columns for task list - Cu }); describe('ProcessListCloudComponent: Creating an empty custom template - EmptyTemplateComponent', () => { - let preferencesService: PreferenceCloudServiceInterface; @Component({ template: ` @@ -626,14 +625,13 @@ describe('ProcessListCloudComponent: Creating an empty custom template - EmptyTe ` }) - class EmptyTemplateComponent { @ViewChild(ProcessListCloudComponent) processListCloud: ProcessListCloudComponent; } let fixtureEmpty: ComponentFixture; - preferencesService = jasmine.createSpyObj('preferencesService', { + const preferencesService = jasmine.createSpyObj('preferencesService', { getPreferences: of({}), updatePreference: of({}) }); diff --git a/lib/process-services-cloud/src/lib/testing/process-services-cloud-story.module.ts b/lib/process-services-cloud/src/lib/testing/process-services-cloud-story.module.ts index b95dc72f36..92f7f07648 100644 --- a/lib/process-services-cloud/src/lib/testing/process-services-cloud-story.module.ts +++ b/lib/process-services-cloud/src/lib/testing/process-services-cloud-story.module.ts @@ -16,13 +16,14 @@ */ import { NgModule } from '@angular/core'; -import { CoreModule, provideTranslations } from '@alfresco/adf-core'; +import { AuthModule, CoreModule, provideTranslations } from '@alfresco/adf-core'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { TranslateModule } from '@ngx-translate/core'; import { ProcessServicesCloudModule } from '../process-services-cloud.module'; @NgModule({ imports: [ + AuthModule.forRoot(), BrowserAnimationsModule, TranslateModule.forRoot(), CoreModule.forRoot(),