inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-4089] Refactoring ContentListPage (#4162)

Browse Source 
* [ADF-NO-ISSUE] Refactoring ContentListPage

* Applying changes

* [ADF-4089] contentListPage refactoring

* Fixing missing dependencies

* Fixing core and search failing tests

* Fix tooltip document-list tests

* no message
This commit is contained in:
Marouan Bentaleb
2019-03-08 10:49:23 +00:00
committed by Eugenio Romano
parent 88ef01011e
commit 27c6e18a10
93 changed files with 3410 additions and 3841 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
e2e/core/card-view/metadata-properties.e2e.ts
View File

@@ -16,7 +16,6 @@
*/
import { LoginPage } from '../../pages/adf/loginPage';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { ViewerPage } from '../../pages/adf/viewerPage';
import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
@@ -29,6 +28,8 @@ import resources = require('../../util/resources');
import AlfrescoApi = require('alfresco-js-api-node');
import { UploadActions } from '../../actions/ACS/upload.actions';
import { check, uncheck } from '../../util/material';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
describe('CardView Component - properties', () => {
@@ -46,9 +47,10 @@ describe('CardView Component - properties', () => {
};
let loginPage = new LoginPage();
let contentServicesPage = new ContentServicesPage();
let navigationBarPage = new NavigationBarPage();
let viewerPage = new ViewerPage();
let metadataViewPage = new MetadataViewPage();
const contentServicesPage = new ContentServicesPage();
let acsUser = new AcsUserModel();
@@ -80,7 +82,8 @@ describe('CardView Component - properties', () => {
loginPage.loginToContentServicesUsingUserModel(acsUser);
contentServicesPage.navigateToDocumentList();
navigationBarPage.clickContentServicesButton();
contentServicesPage.waitForTableBody();
done();
});

13
e2e/core/card-view/metadata-smoke-tests.e2e.ts
View File

@@ -21,7 +21,6 @@ import { LoginPage } from '../../pages/adf/loginPage';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { ViewerPage } from '../../pages/adf/viewerPage';
import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
import { ContentListPage } from '../../pages/adf/dialog/contentListPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import { FileModel } from '../../models/ACS/fileModel';
@@ -32,6 +31,7 @@ import dateFormat = require('dateformat');
import AlfrescoApi = require('alfresco-js-api-node');
import { UploadActions } from '../../actions/ACS/upload.actions';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
describe('Metadata component', () => {
@@ -52,7 +52,7 @@ describe('Metadata component', () => {
const contentServicesPage = new ContentServicesPage();
const viewerPage = new ViewerPage();
const metadataViewPage = new MetadataViewPage();
const contentListPage = new ContentListPage();
const navigationBarPage = new NavigationBarPage();
let acsUser = new AcsUserModel();
@@ -87,7 +87,8 @@ describe('Metadata component', () => {
pngFileModel.update(pngUploadedFile.entry);
loginPage.loginToContentServicesUsingUserModel(acsUser);
contentServicesPage.navigateToDocumentList();
navigationBarPage.clickContentServicesButton();
contentServicesPage.waitForTableBody();
done();
});
@@ -233,7 +234,7 @@ describe('Metadata component', () => {
expect(metadataViewPage.getPropertyText('properties.cm:description')).toEqual('check author example description');
loginPage.loginToContentServicesUsingUserModel(acsUser);
contentServicesPage.navigateToDocumentList();
navigationBarPage.clickContentServicesButton();
await browser.get(fileUrl);
@@ -291,14 +292,14 @@ describe('Metadata component', () => {
});
it('[C261157] Should be possible use the metadata component When the node is a Folder', () => {
contentListPage.metadataContent(folderName);
contentServicesPage.metadataContent(folderName);
expect(metadataViewPage.getPropertyText('name')).toEqual(folderName);
expect(metadataViewPage.getPropertyText('createdByUser.displayName')).toEqual(acsUser.firstName + ' ' + acsUser.lastName);
});
it('[C261158] Should be possible edit the metadata When the node is a Folder', () => {
contentListPage.metadataContent(folderName);
contentServicesPage.metadataContent(folderName);
browser.controlFlow().execute(async () => {
await metadataViewPage.editIconClick();

14
e2e/core/datatable/data-table-component-selection.e2e.ts
View File

@@ -16,7 +16,8 @@
*/
import { LoginPage } from '../../pages/adf/loginPage';
import { DataTablePage } from '../../pages/adf/dataTablePage';
import { DataTablePage } from '../../pages/adf/demo-shell/dataTablePage';
import { DataTableComponentPage } from '../../pages/adf/dataTableComponentPage';
import TestConfig = require('../../test.config');
import { AcsUserModel } from '../../models/ACS/acsUserModel';
@@ -29,6 +30,7 @@ describe('Datatable component - selection', () => {
let loginPage = new LoginPage();
let acsUser = new AcsUserModel();
let navigationBarPage = new NavigationBarPage();
let dataTableComponent = new DataTableComponentPage();
beforeAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
@@ -49,21 +51,21 @@ describe('Datatable component - selection', () => {
it('[C213258] Should be possible change the selection modes when change the selectionMode property', () => {
dataTablePage.selectRow('2');
dataTablePage.checkRowIsSelected('2');
dataTableComponent.checkRowIsSelected('Id', '2');
dataTablePage.getNumberOfSelectedRows().then((result) => {
expect(result).toEqual(1);
});
dataTablePage.selectRow('3');
dataTablePage.checkRowIsSelected('3');
dataTableComponent.checkRowIsSelected('Id', '3');
dataTablePage.getNumberOfSelectedRows().then((result) => {
expect(result).toEqual(1);
});
dataTablePage.selectSelectionMode('Multiple');
dataTablePage.selectRow('1');
dataTablePage.checkRowIsSelected('1');
dataTableComponent.checkRowIsSelected('Id', '1');
dataTablePage.selectRowWithKeyboard('3');
dataTablePage.checkRowIsSelected('1');
dataTablePage.checkRowIsSelected('3');
dataTableComponent.checkRowIsSelected('Id', '1');
dataTableComponent.checkRowIsSelected('Id', '3');
dataTablePage.checkRowIsNotSelected('2');
dataTablePage.checkRowIsNotSelected('4');
dataTablePage.selectSelectionMode('None');

24
e2e/core/datatable/data-table-component.e2e.ts
View File

@@ -16,7 +16,8 @@
*/
import { LoginPage } from '../../pages/adf/loginPage';
import { DataTablePage } from '../../pages/adf/dataTablePage';
import { DataTablePage } from '../../pages/adf/demo-shell/dataTablePage';
import { DataTableComponentPage } from '../../pages/adf/dataTableComponentPage';
import { AcsUserModel } from '../../models/ACS/acsUserModel';
import TestConfig = require('../../test.config');
@@ -25,10 +26,11 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
describe('Datatable component', () => {
let dataTablePage = new DataTablePage();
let loginPage = new LoginPage();
let acsUser = new AcsUserModel();
let navigationBarPage = new NavigationBarPage();
const dataTablePage = new DataTablePage();
const loginPage = new LoginPage();
const acsUser = new AcsUserModel();
const navigationBarPage = new NavigationBarPage();
const dataTableComponent = new DataTableComponentPage();
beforeAll(async (done) => {
this.alfrescoJsApi = new AlfrescoApi({
@@ -48,11 +50,11 @@ describe('Datatable component', () => {
});
it('[C91314] Should be possible add new row to the table', () => {
dataTablePage.getNumberOfRows().then((result) => {
dataTableComponent.numberOfRows().then((result) => {
dataTablePage.addRow();
expect(dataTablePage.getNumberOfRows()).toEqual(result + 1);
expect(dataTableComponent.numberOfRows()).toEqual(result + 1);
dataTablePage.addRow();
expect(dataTablePage.getNumberOfRows()).toEqual(result + 2);
expect(dataTableComponent.numberOfRows()).toEqual(result + 2);
});
});
@@ -65,11 +67,11 @@ describe('Datatable component', () => {
});
it('[C277314] Should filter the table rows when the input filter is passed', () => {
expect(dataTablePage.getNumberOfRows()).toEqual(4);
expect(dataTableComponent.numberOfRows()).toEqual(4);
dataTablePage.insertFilter('Name');
expect(dataTablePage.getNumberOfRows()).toEqual(3);
expect(dataTableComponent.numberOfRows()).toEqual(3);
dataTablePage.insertFilter('I');
expect(dataTablePage.getNumberOfRows()).toEqual(1);
expect(dataTableComponent.numberOfRows()).toEqual(1);
});
});

2
e2e/core/infinite-scrolling.e2e.ts
View File

@@ -71,7 +71,7 @@ describe('Enable infinite scrolling', () => {
});
it('[C260484] Should be possible to enable infinite scrolling', () => {
contentServicesPage.navigateToFolder(folderModel.name);
contentServicesPage.doubleClickRow(folderModel.name);
contentServicesPage.enableInfiniteScrolling();
contentServicesPage.clickLoadMoreButton();
for (fileNum; fileNum < nrOfFiles; fileNum++) {

2
e2e/core/pagination-empty-current-page.e2e.ts
View File

@@ -78,7 +78,7 @@ describe('Pagination - returns to previous page when current is empty', () => {
});
it('[C274710] Should redirect to previous page when current is emptied', () => {
contentServicesPage.navigateToFolder(folderModel.name);
contentServicesPage.doubleClickRow(folderModel.name);
contentServicesPage.checkAcsContainer();
contentServicesPage.waitForTableBody();

25
e2e/core/viewer/viewer-component.e2e.ts
View File

@@ -21,7 +21,6 @@ import { LoginPage } from '../../pages/adf/loginPage';
import { ViewerPage } from '../../pages/adf/viewerPage';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { ContentListPage } from '../../pages/adf/dialog/contentListPage';
import { ShareDialog } from '../../pages/adf/dialog/shareDialog';
import { AboutPage } from '../../pages/adf/demo-shell/aboutPage';
@@ -36,7 +35,6 @@ import { AcsUserModel } from '../../models/ACS/acsUserModel';
import AlfrescoApi = require('alfresco-js-api-node');
import { UploadActions } from '../../actions/ACS/upload.actions';
import { browser } from 'protractor';
import { viewWrappedDebugError } from '@angular/core/src/view/errors';
xdescribe('Viewer', () => {
@@ -48,7 +46,7 @@ xdescribe('Viewer', () => {
let site;
let acsUser = new AcsUserModel();
let pngFileUploaded;
const contentList = new ContentListPage();
const contentList = contentServicesPage.getDocumentList();
const shareDialog = new ShareDialog();
const about = new AboutPage();
@@ -158,7 +156,7 @@ xdescribe('Viewer', () => {
});
it('[C260517] Should be possible to open any Archive file', () => {
contentServicesPage.navigateToFolder('archive');
contentServicesPage.doubleClickRow('archive');
uploadedArchives.forEach((currentFile) => {
if (currentFile.entry.name !== '.DS_Store') {
@@ -193,7 +191,7 @@ xdescribe('Viewer', () => {
});
it('[C280008] Should be possible to open any Excel file', () => {
contentServicesPage.navigateToFolder('excel');
contentServicesPage.doubleClickRow('excel');
uploadedExcels.forEach((currentFile) => {
if (currentFile.entry.name !== '.DS_Store') {
@@ -228,7 +226,7 @@ xdescribe('Viewer', () => {
});
it('[C280009] Should be possible to open any PowerPoint file', () => {
contentServicesPage.navigateToFolder('ppt');
contentServicesPage.doubleClickRow('ppt');
uploadedPpt.forEach((currentFile) => {
if (currentFile.entry.name !== '.DS_Store') {
@@ -263,7 +261,7 @@ xdescribe('Viewer', () => {
});
it('[C280010] Should be possible to open any Text file', () => {
contentServicesPage.navigateToFolder('text');
contentServicesPage.doubleClickRow('text');
uploadedTexts.forEach((currentFile) => {
if (currentFile.entry.name !== '.DS_Store') {
@@ -298,7 +296,7 @@ xdescribe('Viewer', () => {
});
it('[C280011] Should be possible to open any Word file', () => {
contentServicesPage.navigateToFolder('word');
contentServicesPage.doubleClickRow('word');
uploadedWords.forEach((currentFile) => {
if (currentFile.entry.name !== '.DS_Store') {
@@ -333,7 +331,7 @@ xdescribe('Viewer', () => {
});
it('[C280012] Should be possible to open any other Document supported extension', () => {
contentServicesPage.navigateToFolder('other');
contentServicesPage.doubleClickRow('other');
uploadedOthers.forEach((currentFile) => {
if (currentFile.entry.name !== '.DS_Store') {
@@ -372,7 +370,7 @@ xdescribe('Viewer', () => {
});
it('[C279966] Should be possible to open any Image supported extension', () => {
contentServicesPage.navigateToFolder('images');
contentServicesPage.doubleClickRow('images');
uploadedImages.forEach((currentFile) => {
if (currentFile.entry.name !== '.DS_Store') {
@@ -382,7 +380,7 @@ xdescribe('Viewer', () => {
}
});
contentServicesPage.navigateToFolder('images-rendition');
contentServicesPage.doubleClickRow('images-rendition');
uploadedImgRenditionFolderInfo.forEach((currentFile) => {
if (currentFile.entry.name !== '.DS_Store') {
@@ -434,9 +432,10 @@ xdescribe('Viewer', () => {
});
it('[C260106] Should be able to open a Word file shared via API', () => {
contentServicesPage.navigateToDocumentList();
navigationBarPage.clickContentServicesButton();
contentServicesPage.waitForTableBody();
contentList.clickRowToSelect(wordFileInfo.name);
contentList.selectRow(wordFileInfo.name);
contentServicesPage.clickShareButton();
shareDialog.checkDialogIsDisplayed();
shareDialog.clickShareLinkButton();

12
e2e/core/viewer/viewer-properties.e2e.ts
View File

@@ -21,7 +21,7 @@ import { LoginPage } from '../../pages/adf/loginPage';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { ViewerPage } from '../../pages/adf/viewerPage';
import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { DataTablePage } from '../../pages/adf/dataTablePage';
import { DataTableComponentPage } from '../../pages/adf/dataTableComponentPage';
import resources = require('../../util/resources');
@@ -38,7 +38,7 @@ describe('Viewer - properties', () => {
let contentServicesPage = new ContentServicesPage();
let loginPage = new LoginPage();
let navigationBarPage = new NavigationBarPage();
let dataTable = new DataTablePage();
let dataTable = new DataTableComponentPage();
let pngFile = new FileModel({
'name': resources.Files.ADF_DOCUMENTS.PNG.file_name,
@@ -189,18 +189,18 @@ describe('Viewer - properties', () => {
viewerPage.clickCloseButton();
navigationBarPage.clickOverlayViewerButton();
dataTable.doubleClickRow(fileForOverlay.name);
dataTable.doubleClickRow('Name', fileForOverlay.name);
viewerPage.checkOverlayViewerIsDisplayed();
viewerPage.clickCloseButton();
dataTable.doubleClickRow(pngFile.name);
dataTable.doubleClickRow('Name', pngFile.name);
viewerPage.checkOverlayViewerIsDisplayed();
viewerPage.clickCloseButton();
viewerPage.disableOverlay();
dataTable.doubleClickRow(fileForOverlay.name);
dataTable.doubleClickRow('Name', fileForOverlay.name);
viewerPage.checkImgContainerIsDisplayed();
viewerPage.checkInlineViewerIsDisplayed();
dataTable.doubleClickRow(pngFile.name);
dataTable.doubleClickRow('Name', pngFile.name);
viewerPage.checkImgContainerIsDisplayed();
viewerPage.checkInlineViewerIsDisplayed();
});