fix storybook

move e2e in content for versioning
fix lint
This commit is contained in:
eromano
2023-08-09 11:08:10 +02:00
parent 5694123d87
commit 00461c03be
22 changed files with 126 additions and 42 deletions

View File

@@ -35,7 +35,7 @@ import { browser } from 'protractor';
import { FolderModel } from '../../models/ACS/folder.model'; import { FolderModel } from '../../models/ACS/folder.model';
import { MetadataViewPage } from '../../core/pages/metadata-view.page'; import { MetadataViewPage } from '../../core/pages/metadata-view.page';
import { NavigationBarPage } from '../../core/pages/navigation-bar.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'; import { GroupsApi, NodeEntry } from '@alfresco/js-api';
describe('Permissions Component', () => { describe('Permissions Component', () => {

View File

@@ -28,7 +28,7 @@ import { ContentServicesPage } from '../../core/pages/content-services.page';
import { FileModel } from '../../models/ACS/file.model'; import { FileModel } from '../../models/ACS/file.model';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { VersionManagePage } from '../pages/version-manager.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', () => { describe('Content Services Viewer', () => {
const acsUser = new UserModel(); const acsUser = new UserModel();

View File

@@ -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);
});
});

View File

@@ -31,7 +31,7 @@ import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { FolderModel } from '../../models/ACS/folder.model'; import { FolderModel } from '../../models/ACS/folder.model';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { FileModel } from '../../models/ACS/file.model'; 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', () => { describe('Document List - Pagination', () => {
const pagination = { const pagination = {

View File

@@ -21,7 +21,7 @@ import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { FolderModel } from '../../models/ACS/folder.model'; import { FolderModel } from '../../models/ACS/folder.model';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { FileModel } from '../../models/ACS/file.model'; 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', () => { describe('Document List - Selection', () => {
const loginPage = new LoginPage(); const loginPage = new LoginPage();

View File

@@ -18,7 +18,7 @@
import { browser } from 'protractor'; import { browser } from 'protractor';
import { createApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing'; import { createApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../core/pages/content-services.page'; 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 { UploadTogglesPage } from '../../core/pages/dialog/upload-toggles.page';
import { FileModel } from '../../models/ACS/file.model'; import { FileModel } from '../../models/ACS/file.model';

View File

@@ -24,7 +24,7 @@ import { createApiService,
UsersActions UsersActions
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../core/pages/content-services.page'; 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 { UploadTogglesPage } from '../../core/pages/dialog/upload-toggles.page';
import { FileModel } from '../../models/ACS/file.model'; import { FileModel } from '../../models/ACS/file.model';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';

View File

@@ -17,11 +17,11 @@
import { createApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing'; import { createApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../core/pages/content-services.page'; 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 { UploadTogglesPage } from '../../core/pages/dialog/upload-toggles.page';
import { FileModel } from '../../models/ACS/file.model'; import { FileModel } from '../../models/ACS/file.model';
import { browser } from 'protractor'; import { browser } from 'protractor';
import { VersionManagePage } from '../../core/pages/version-manager.page'; import { VersionManagePage } from '../pages/version-manager.page';
describe('Upload component', () => { describe('Upload component', () => {

View File

@@ -26,7 +26,7 @@ import { createApiService,
UsersActions UsersActions
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../core/pages/content-services.page'; 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 { UploadTogglesPage } from '../../core/pages/dialog/upload-toggles.page';
import { FileModel } from '../../models/ACS/file.model'; import { FileModel } from '../../models/ACS/file.model';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';

View File

@@ -18,7 +18,7 @@
import { browser } from 'protractor'; import { browser } from 'protractor';
import { createApiService, LoginPage, SnackbarPage, StringUtil, UserModel, UsersActions } from '@alfresco/adf-testing'; import { createApiService, LoginPage, SnackbarPage, StringUtil, UserModel, UsersActions } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../core/pages/content-services.page'; 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 { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { FileModel } from '../../models/ACS/file.model'; import { FileModel } from '../../models/ACS/file.model';
import CONSTANTS = require('../../util/constants'); import CONSTANTS = require('../../util/constants');

View File

@@ -28,9 +28,9 @@ import { createApiService,
import { browser, by, element } from 'protractor'; import { browser, by, element } from 'protractor';
import { FileModel } from '../../models/ACS/file.model'; import { FileModel } from '../../models/ACS/file.model';
import { ContentServicesPage } from '../../core/pages/content-services.page'; 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 { 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', () => { describe('Version component actions', () => {

View File

@@ -26,8 +26,8 @@ import {
UsersActions UsersActions
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { VersionManagePage } from '../../core/pages/version-manager.page'; import { VersionManagePage } from '../pages/version-manager.page';
import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page'; import { UploadDialogPage } from '../pages/upload-dialog.page';
import { ContentServicesPage } from '../../core/pages/content-services.page'; import { ContentServicesPage } from '../../core/pages/content-services.page';
import { FileModel } from '../../models/ACS/file.model'; import { FileModel } from '../../models/ACS/file.model';
import CONSTANTS = require('../../util/constants'); import CONSTANTS = require('../../util/constants');

View File

@@ -24,7 +24,7 @@ import { createApiService,
UsersActions, ViewerPage UsersActions, ViewerPage
} from '@alfresco/adf-testing'; } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../core/pages/content-services.page'; 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 { FileModel } from '../../models/ACS/file.model';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';

View File

@@ -18,7 +18,7 @@
import { browser } from 'protractor'; import { browser } from 'protractor';
import { createApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing'; import { createApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
import { ContentServicesPage } from '../../core/pages/content-services.page'; 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 { FileModel } from '../../models/ACS/file.model';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';

View File

@@ -16,11 +16,10 @@
*/ */
import { browser } from 'protractor'; 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 { ContentServicesPage } from '../../core/pages/content-services.page';
import { FileModel } from '../../models/ACS/file.model'; import { FileModel } from '../../models/ACS/file.model';
import { NavigationBarPage } from '../../core/pages/navigation-bar.page'; import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
import { VersionManagePage } from '../pages/version-manager.page';
describe('Viewer', () => { describe('Viewer', () => {
@@ -33,7 +32,6 @@ describe('Viewer', () => {
const uploadActions = new UploadActions(apiService); const uploadActions = new UploadActions(apiService);
const usersActions = new UsersActions(apiService); const usersActions = new UsersActions(apiService);
const versionManagePage = new VersionManagePage();
const acsUser = new UserModel(); const acsUser = new UserModel();
let txtFileUploaded; let txtFileUploaded;
@@ -94,21 +92,4 @@ describe('Viewer', () => {
await viewerPage.checkTabIsActive('Versions'); 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);
});
}); });

View File

@@ -45,6 +45,7 @@ export class AuditService {
/** /**
* Gets a list of audit applications. * Gets a list of audit applications.
*
* @param opts Options. * @param opts Options.
* @returns a list of the audit applications. * @returns a list of the audit applications.
*/ */
@@ -61,6 +62,7 @@ export class AuditService {
/** /**
* Get audit application info. * Get audit application info.
*
* @param auditApplicationId The identifier of an audit application. * @param auditApplicationId The identifier of an audit application.
* @param opts Options. * @param opts Options.
* @returns status of an audit application. * @returns status of an audit application.
@@ -78,6 +80,7 @@ export class AuditService {
/** /**
* Update audit application info. * Update audit application info.
*
* @param auditApplicationId The identifier of an audit application. * @param auditApplicationId The identifier of an audit application.
* @param auditAppBodyUpdate The audit application to update. * @param auditAppBodyUpdate The audit application to update.
* @param opts Options. * @param opts Options.
@@ -94,6 +97,7 @@ export class AuditService {
/** /**
* List audit entries for an audit application. * List audit entries for an audit application.
*
* @param auditApplicationId The identifier of an audit application. * @param auditApplicationId The identifier of an audit application.
* @param opts Options. * @param opts Options.
* @returns a list of audit entries. * @returns a list of audit entries.
@@ -112,6 +116,7 @@ export class AuditService {
/** /**
* Get audit entry. * Get audit entry.
*
* @param auditApplicationId The identifier of an audit application. * @param auditApplicationId The identifier of an audit application.
* @param auditEntryId The identifier of an audit entry. * @param auditEntryId The identifier of an audit entry.
* @param opts Options. * @param opts Options.
@@ -128,6 +133,7 @@ export class AuditService {
/** /**
* List audit entries for a node. * List audit entries for a node.
*
* @param nodeId The identifier of a node. * @param nodeId The identifier of a node.
* @param opts Options. * @param opts Options.
* @returns * @returns
@@ -145,6 +151,7 @@ export class AuditService {
/** /**
* Permanently delete audit entries for an audit application. * Permanently delete audit entries for an audit application.
*
* @param auditApplicationId The identifier of 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. * @param where Audit entries to permanently delete for an audit application, given an inclusive time period or range of ids.
* @returns * @returns
@@ -158,6 +165,7 @@ export class AuditService {
/** /**
* Permanently delete an audit entry. * Permanently delete an audit entry.
*
* @param auditApplicationId The identifier of an audit application. * @param auditApplicationId The identifier of an audit application.
* @param auditEntryId The identifier of an audit entry. * @param auditEntryId The identifier of an audit entry.
* @returns * @returns

View File

@@ -20,9 +20,11 @@ import { CoreModule } from '../core.module';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { provideTranslations } from '../translation/translation.service'; import { provideTranslations } from '../translation/translation.service';
import { AuthModule } from '../../../src/lib/auth/oidc/auth.module';
@NgModule({ @NgModule({
imports: [ imports: [
AuthModule.forRoot(),
TranslateModule.forRoot(), TranslateModule.forRoot(),
CoreModule.forRoot(), CoreModule.forRoot(),
BrowserAnimationsModule BrowserAnimationsModule

View File

@@ -61,13 +61,13 @@ describe('ContentCloudNodeSelectorService', () => {
dialog = TestBed.inject(MatDialog); dialog = TestBed.inject(MatDialog);
showWarningSpy = spyOn(notificationService, 'showWarning'); showWarningSpy = spyOn(notificationService, 'showWarning');
openDialogSpy = spyOn(dialog, 'open').and.returnValue(<any> { openDialogSpy = spyOn(dialog, 'open').and.returnValue( {
afterOpened: () => of({}), afterOpened: () => of({}),
afterClosed: () => of({}), afterClosed: () => of({}),
componentInstance: { componentInstance: {
error: new Subject<any>() error: new Subject<any>()
} }
}); } as any);
getNodeSpy = spyOn(service.nodesApi, 'getNode'); getNodeSpy = spyOn(service.nodesApi, 'getNode');
}); });

View File

@@ -616,7 +616,6 @@ describe('ProcessListCloudComponent: Injecting custom columns for task list - Cu
}); });
describe('ProcessListCloudComponent: Creating an empty custom template - EmptyTemplateComponent', () => { describe('ProcessListCloudComponent: Creating an empty custom template - EmptyTemplateComponent', () => {
let preferencesService: PreferenceCloudServiceInterface;
@Component({ @Component({
template: ` template: `
<adf-cloud-process-list #processListCloud> <adf-cloud-process-list #processListCloud>
@@ -626,14 +625,13 @@ describe('ProcessListCloudComponent: Creating an empty custom template - EmptyTe
</adf-cloud-process-list> </adf-cloud-process-list>
` `
}) })
class EmptyTemplateComponent { class EmptyTemplateComponent {
@ViewChild(ProcessListCloudComponent) @ViewChild(ProcessListCloudComponent)
processListCloud: ProcessListCloudComponent; processListCloud: ProcessListCloudComponent;
} }
let fixtureEmpty: ComponentFixture<EmptyTemplateComponent>; let fixtureEmpty: ComponentFixture<EmptyTemplateComponent>;
preferencesService = jasmine.createSpyObj('preferencesService', { const preferencesService = jasmine.createSpyObj('preferencesService', {
getPreferences: of({}), getPreferences: of({}),
updatePreference: of({}) updatePreference: of({})
}); });

View File

@@ -16,13 +16,14 @@
*/ */
import { NgModule } from '@angular/core'; 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 { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { ProcessServicesCloudModule } from '../process-services-cloud.module'; import { ProcessServicesCloudModule } from '../process-services-cloud.module';
@NgModule({ @NgModule({
imports: [ imports: [
AuthModule.forRoot(),
BrowserAnimationsModule, BrowserAnimationsModule,
TranslateModule.forRoot(), TranslateModule.forRoot(),
CoreModule.forRoot(), CoreModule.forRoot(),