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

exclude upload folder test as far we don't find a solution in chrome 73 (#4473)

Browse Source 
* exclude upload folder test as far we don't find a solution in chrome 73

* exclude folder drag and drop test chrome 73

* fix test search

* Update .travis.yml

* xit C279918 C279916

* fix process-service cloud application list
This commit is contained in:
Eugenio Romano
2019-03-23 20:32:03 +00:00
committed by GitHub
parent 4a32fb920f
commit 6059690e79
8 changed files with 83 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@@ -134,7 +134,7 @@ jobs:
AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)"; AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)";
if [[ $AFFECTED_LIBS =~ "core$" || $AFFECTED_E2E = "e2e" || $TRAVIS_PULL_REQUEST == "false" ]]; if [[ $AFFECTED_LIBS =~ "core$" || $AFFECTED_E2E = "e2e" || $TRAVIS_PULL_REQUEST == "false" ]];
then then
(./scripts/test-e2e-lib.sh -host localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" -b --folder core --skip-lint -save --use-dist || exit 1;); (./scripts/test-e2e-lib.sh -host localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --folder core --skip-lint -save --use-dist || exit 1;);
fi; fi;
- stage: e2e Test # Test process-services - stage: e2e Test # Test process-services
name: process-services name: process-services
@@ -143,7 +143,7 @@ jobs:
AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)"; AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)";
if [[ $AFFECTED_LIBS =~ "process-services$" || $AFFECTED_E2E = "e2e" || $TRAVIS_PULL_REQUEST == "false" ]]; if [[ $AFFECTED_LIBS =~ "process-services$" || $AFFECTED_E2E = "e2e" || $TRAVIS_PULL_REQUEST == "false" ]];
then then
(./scripts/test-e2e-lib.sh -host localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" -b --folder process-services --skip-lint --use-dist || exit 1;); (./scripts/test-e2e-lib.sh -host localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --folder process-services --skip-lint --use-dist || exit 1;);
fi; fi;
- stage: e2e Test # Test content-services - stage: e2e Test # Test content-services
name: content-services name: content-services
@@ -161,7 +161,7 @@ jobs:
AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)"; AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)";
if [[ $AFFECTED_LIBS =~ "content-services$" || $AFFECTED_E2E = "e2e" || $TRAVIS_PULL_REQUEST == "false" ]]; if [[ $AFFECTED_LIBS =~ "content-services$" || $AFFECTED_E2E = "e2e" || $TRAVIS_PULL_REQUEST == "false" ]];
then then
(./scripts/test-e2e-lib.sh -host localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" -b --folder search --skip-lint --use-dist || exit 1;); (./scripts/test-e2e-lib.sh -host localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --folder search --skip-lint --use-dist || exit 1;);
fi; fi;
- stage: e2e Test # Test process-services-cloud - stage: e2e Test # Test process-services-cloud
name: process-services-cloud name: process-services-cloud
@@ -179,7 +179,7 @@ jobs:
AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)"; AFFECTED_LIBS="$(./scripts/affected-libs.sh -gnu -b $TRAVIS_BRANCH)";
if [[ $AFFECTED_LIBS =~ "process-services-cloud$" || $AFFECTED_E2E = "e2e" || $TRAVIS_PULL_REQUEST == "false" ]]; if [[ $AFFECTED_LIBS =~ "process-services-cloud$" || $AFFECTED_E2E = "e2e" || $TRAVIS_PULL_REQUEST == "false" ]];
then then
(./scripts/test-e2e-lib.sh -host localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" -b --folder insights --skip-lint --use-dist || exit 1;); (./scripts/test-e2e-lib.sh -host localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e "$E2E_EMAIL" --folder insights --skip-lint --use-dist || exit 1;);
fi; fi;
- stage: Create Docker and Deploy Docker PR - stage: Create Docker and Deploy Docker PR
script: script:

2
e2e/content-services/upload/excluded-file.e2e.ts
View File

@@ -110,7 +110,7 @@ describe('Upload component - Excluded Files', () => {
.checkContentIsNotDisplayed(iniExcludedFile.name); .checkContentIsNotDisplayed(iniExcludedFile.name);
}); });
it('[C260125] Should not upload excluded file when they are in a Folder', () => { xit('[C260125] Should not upload excluded file when they are in a Folder', () => {
uploadToggles.enableFolderUpload(); uploadToggles.enableFolderUpload();
contentServicesPage.uploadFolder(folderWithExcludedFile.location); contentServicesPage.uploadFolder(folderWithExcludedFile.location);

4
e2e/content-services/upload/uploader-component.e2e.ts
View File

@@ -132,7 +132,7 @@ describe('Upload component', () => {
.checkContentIsDisplayed(firstPdfFileModel.name); .checkContentIsDisplayed(firstPdfFileModel.name);
}); });
it('[C260173] Should be able to upload folder when enabled', () => { xit('[C260173] Should be able to upload folder when enabled', () => {
uploadToggles.enableFolderUpload(); uploadToggles.enableFolderUpload();
uploadToggles.checkFolderUploadToggleIsEnabled(); uploadToggles.checkFolderUploadToggleIsEnabled();
@@ -305,7 +305,7 @@ describe('Upload component', () => {
expect(contentServicesPage.uploadButtonIsEnabled()).toBeTruthy(); expect(contentServicesPage.uploadButtonIsEnabled()).toBeTruthy();
}); });
it('[C279882] Should be possible Upload a folder in a folder', () => { xit('[C279882] Should be possible Upload a folder in a folder', () => {
uploadToggles.enableFolderUpload(); uploadToggles.enableFolderUpload();
browser.driver.sleep(1000); browser.driver.sleep(1000);
contentServicesPage.uploadFolder(folderOne.location); contentServicesPage.uploadFolder(folderOne.location);

16
e2e/content-services/upload/user-permission.e2e.ts
View File

@@ -64,8 +64,8 @@ describe('Upload - User permission', () => {
}); });
let folder = new FolderModel({ let folder = new FolderModel({
'name': resources.Files.ADF_DOCUMENTS.FOLDER_ONE.folder_name, 'name': resources.Files.ADF_DOCUMENTS.FOLDER_TWO.folder_name,
'location': resources.Files.ADF_DOCUMENTS.FOLDER_ONE.folder_location 'location': resources.Files.ADF_DOCUMENTS.FOLDER_TWO.folder_location
}); });
beforeAll(() => { beforeAll(() => {
@@ -118,7 +118,7 @@ describe('Upload - User permission', () => {
done(); done();
}); });
it('[C212861] Should not be allowed to Drag and drop a file/folder in a folder with consumer permissions', () => { xit('[C212861] Should not be allowed to Drag and drop a file/folder in a folder with consumer permissions', () => {
contentServicesPage.checkDragAndDropDIsDisplayed(); contentServicesPage.checkDragAndDropDIsDisplayed();
contentServicesPage.dragAndDropFolder(folder.location); contentServicesPage.dragAndDropFolder(folder.location);
@@ -173,7 +173,7 @@ describe('Upload - User permission', () => {
notificationPage.checkNotifyContains('You don\'t have the create permission to upload the content'); notificationPage.checkNotifyContains('You don\'t have the create permission to upload the content');
}); });
it('[C279916] Should not be allowed to upload a folder in folder with consumer permissions', () => { xit('[C279916] Should not be allowed to upload a folder in folder with consumer permissions', () => {
uploadToggles.enableFolderUpload(); uploadToggles.enableFolderUpload();
uploadToggles.checkFolderUploadToggleIsEnabled(); uploadToggles.checkFolderUploadToggleIsEnabled();
@@ -209,13 +209,13 @@ describe('Upload - User permission', () => {
done(); done();
}); });
it('[C260130] Should be allowed to Drag and drop a file/folder in a folder with manager permissions', () => { xit('[C260130] Should be allowed to Drag and drop a file/folder in a folder with manager permissions', () => {
contentServicesPage.checkDragAndDropDIsDisplayed(); contentServicesPage.checkDragAndDropDIsDisplayed();
contentServicesPage.dragAndDropFile(emptyFile.location); contentServicesPage.dragAndDropFile(emptyFile.location);
contentServicesPage.checkContentIsDisplayed(emptyFile.location); contentServicesPage.checkContentIsDisplayed(emptyFile.name);
contentServicesPage.dragAndDropFolder(folder.name); contentServicesPage.dragAndDropFolder(folder.location);
contentServicesPage.checkContentIsDisplayed(folder.name); contentServicesPage.checkContentIsDisplayed(folder.name);
let fileInTheUploadedFolder = 'share_profile_pic.png'; let fileInTheUploadedFolder = 'share_profile_pic.png';
@@ -230,7 +230,7 @@ describe('Upload - User permission', () => {
uploadDialog.fileIsUploaded(emptyFile.name); uploadDialog.fileIsUploaded(emptyFile.name);
}); });
it('[C279918] Should be allowed to upload a folder in a folder with manager permissions', () => { xit('[C279918] Should be allowed to upload a folder in a folder with manager permissions', () => {
uploadToggles.enableFolderUpload(); uploadToggles.enableFolderUpload();
uploadToggles.checkFolderUploadToggleIsEnabled(); uploadToggles.checkFolderUploadToggleIsEnabled();

54
e2e/pages/adf/contentServicesPage.ts
View File

@@ -168,26 +168,6 @@ export class ContentServicesPage {
return this.contentList.dataTablePage().getAllRowsColumnValues('Size'); return this.contentList.dataTablePage().getAllRowsColumnValues('Size');
} }
getElementsDisplayedAuthor(alfrescoJsApi) {
let deferred = protractor.promise.defer();
let initialList = [];
let idList = this.getElementsDisplayedId();
let numberOfElements = this.numberOfResultsDisplayed();
this.nodeActions.getNodesDisplayed(alfrescoJsApi, idList, numberOfElements).then((nodes) => {
nodes.forEach((item) => {
item.entry.createdByUser.id.then((author) => {
if (author !== '') {
initialList.push(author);
}
});
});
}).then(function () {
deferred.fulfill(initialList);
});
return deferred.promise;
}
getElementsDisplayedName() { getElementsDisplayedName() {
return this.contentList.dataTablePage().getAllRowsColumnValues('Display name'); return this.contentList.dataTablePage().getAllRowsColumnValues('Display name');
} }
@@ -200,6 +180,38 @@ export class ContentServicesPage {
let sorted = true; let sorted = true;
let i = 0; let i = 0;
while (elements.length > 1 && sorted === true && i < (elements.length - 1)) {
const left = elements[i];
const right = elements[i + 1];
if (left > right) {
sorted = false;
}
i++;
}
return sorted;
}
checkElementsSortedDesc(elements) {
let sorted = true;
let i = 0;
while (elements.length > 1 && sorted === true && i < (elements.length - 1)) {
const left = elements[i];
const right = elements[i + 1];
if (left < right) {
sorted = false;
}
i++;
}
return sorted;
}
checkElementsDateSortedAsc(elements) {
let sorted = true;
let i = 0;
while (elements.length > 1 && sorted === true && i < (elements.length - 1)) { while (elements.length > 1 && sorted === true && i < (elements.length - 1)) {
const left = DateUtil.parse(elements[i], 'DD-MM-YY'); const left = DateUtil.parse(elements[i], 'DD-MM-YY');
const right = DateUtil.parse(elements[i + 1], 'DD-MM-YY'); const right = DateUtil.parse(elements[i + 1], 'DD-MM-YY');
@@ -212,7 +224,7 @@ export class ContentServicesPage {
return sorted; return sorted;
} }
checkElementsSortedDesc(elements) { checkElementsDateSortedDesc(elements) {
let sorted = true; let sorted = true;
let i = 0; let i = 0;

6
e2e/search/components/search-sorting-picker.e2e.ts
View File

@@ -201,7 +201,7 @@ describe('Search Sorting Picker', () => {
searchResults.sortByCreated(true); searchResults.sortByCreated(true);
browser.controlFlow().execute(async () => { browser.controlFlow().execute(async () => {
let results = await searchResults. dataTable.geCellElementDetail('Created'); let results = await searchResults. dataTable.geCellElementDetail('Created');
expect(contentServices.checkElementsSortedAsc(results)).toBe(true); expect(contentServices.checkElementsDateSortedAsc(results)).toBe(true);
}); });
}); });
@@ -209,7 +209,7 @@ describe('Search Sorting Picker', () => {
searchResults.sortByCreated(false); searchResults.sortByCreated(false);
browser.controlFlow().execute(async () => { browser.controlFlow().execute(async () => {
let results = await searchResults. dataTable.geCellElementDetail('Created'); let results = await searchResults. dataTable.geCellElementDetail('Created');
expect(contentServices.checkElementsSortedDesc(results)).toBe(true); expect(contentServices.checkElementsDateSortedDesc(results)).toBe(true);
}); });
}); });
@@ -239,7 +239,7 @@ describe('Search Sorting Picker', () => {
for (let i = 0; i < nodeList.length; i++) { for (let i = 0; i < nodeList.length; i++) {
modifiedDateList.push(new Date(nodeList[i].entry.modifiedAt)); modifiedDateList.push(new Date(nodeList[i].entry.modifiedAt));
} }
expect(contentServices.checkElementsSortedAsc(modifiedDateList)).toBe(true); expect(contentServices.checkElementsDateSortedAsc(modifiedDateList)).toBe(true);
}); });
}); });

28
e2e/test.config.js
View File

@@ -51,16 +51,38 @@ module.exports = {
*/ */
adminPassword: PASSWORD, adminPassword: PASSWORD,
hostBPM: "http://" + HOST_BPM, hostBPM: "http://" + ( HOST_BPM || HOST),
clientIdSso: "alfresco", clientIdSso: "alfresco",
hostSso: function () { hostSso: function () {
return "http://" + (HOST_SSO ? HOST_SSO : (PROXY + '/auth/realms/alfresco')); let baseUrl;
if (HOST_SSO) {
baseUrl = HOST_SSO;
} else if (PROXY) {
baseUrl = PROXY;
} else {
baseUrl = HOST;
}
return `http://${baseUrl}/auth/realms/alfresco`;
}(), }(),
hostIdentity: function () { hostIdentity: function () {
return "http://" + (HOST_IDENTITY ? HOST_IDENTITY : (PROXY + '/auth/admin/realms/alfresco')); let baseUrl;
if (HOST_IDENTITY) {
baseUrl = HOST_IDENTITY;
} else if (HOST_SSO) {
baseUrl = HOST_SSO;
} else if (PROXY) {
baseUrl = PROXY;
} else {
baseUrl = HOST;
}
return `http://${baseUrl}/auth/admin/realms/alfresco`;
}() }()
}, },

13
lib/process-services-cloud/src/lib/app/services/apps-process-cloud.service.ts
View File

@@ -29,7 +29,8 @@ export class AppsProcessCloudService {
constructor( constructor(
private apiService: AlfrescoApiService, private apiService: AlfrescoApiService,
private logService: LogService, private logService: LogService,
private appConfigService: AppConfigService) {} private appConfigService: AppConfigService) {
}
/** /**
* Gets a list of deployed apps for this user by status. * Gets a list of deployed apps for this user by status.
@@ -49,12 +50,12 @@ export class AppsProcessCloudService {
return from(api.callCustomApi(path, 'GET', pathParams, queryParams, headerParams, formParams, bodyParam, return from(api.callCustomApi(path, 'GET', pathParams, queryParams, headerParams, formParams, bodyParam,
contentTypes, accepts)) contentTypes, accepts))
.pipe( .pipe(
map((applications: ApplicationInstanceModel[]) => { map((applications: any) => {
return applications.map((application) => { return applications.list.entries.map((application) => {
return new ApplicationInstanceModel(application); return new ApplicationInstanceModel(application.entry);
}); });
}), }),
catchError((err) => this.handleError(err)) catchError((err) => this.handleError(err))
); );
} }