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-4547] Fixing flaky tests in Content Services and Core (#4743)

Browse Source
This commit is contained in:
Marouan Bentaleb
2019-05-22 14:57:20 +01:00
committed by Denys Vuika
parent 58cf10be5f
commit 5e7aabfaea
9 changed files with 44 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demo-shell/src/app.config.json
View File

@@ -8,7 +8,7 @@
"contextRootBpm": "activiti-app", "contextRootBpm": "activiti-app",
"authType": "BASIC", "authType": "BASIC",
"locale": "en", "locale": "en",
"notificationDefaultDuration": 10000, "notificationDefaultDuration": 2000,
"auth": { "auth": {
"withCredentials": false "withCredentials": false
}, },

6
e2e/content-services/document-list/document-list-copy-move.e2e.ts
View File

@@ -72,16 +72,14 @@ describe('Document List Component - Actions', () => {
folder5 = await uploadActions.createFolder(alfrescoJsApi, 'E' + folderModel5.name, '-my-'); folder5 = await uploadActions.createFolder(alfrescoJsApi, 'E' + folderModel5.name, '-my-');
folder6 = await uploadActions.createFolder(alfrescoJsApi, 'F' + folderModel6.name, '-my-'); folder6 = await uploadActions.createFolder(alfrescoJsApi, 'F' + folderModel6.name, '-my-');
folders = [folder1, folder2, folder3, folder4, folder5, folder6]; folders = [folder1, folder2, folder3, folder4, folder5, folder6];
done();
});
beforeEach(async (done) => {
await loginPage.loginToContentServicesUsingUserModel(contentServicesUser); await loginPage.loginToContentServicesUsingUserModel(contentServicesUser);
contentServicesPage.goToDocumentList(); contentServicesPage.goToDocumentList();
contentServicesPage.waitForTableBody(); contentServicesPage.waitForTableBody();
paginationPage.selectItemsPerPage('5'); paginationPage.selectItemsPerPage('5');
contentServicesPage.checkAcsContainer(); contentServicesPage.checkAcsContainer();
contentListPage.waitForTableBody(); contentListPage.waitForTableBody();
done(); done();
}); });
@@ -93,7 +91,7 @@ describe('Document List Component - Actions', () => {
done(); done();
}); });
xit('[C260132] Move action on folder with - Load more', () => { it('[C260132] Move action on folder with - Load more', () => {
expect(paginationPage.getCurrentItemsPerPage()).toEqual('5'); expect(paginationPage.getCurrentItemsPerPage()).toEqual('5');
expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + 5 + ' of ' + 6); expect(paginationPage.getPaginationRange()).toEqual('Showing 1-' + 5 + ' of ' + 6);

18
e2e/content-services/permissions/site-permissions.e2e.ts
View File

@@ -93,6 +93,8 @@ describe('Permissions Component', function () {
await alfrescoJsApi.core.peopleApi.addPerson(managerUser); await alfrescoJsApi.core.peopleApi.addPerson(managerUser);
await alfrescoJsApi.login(folderOwnerUser.id, folderOwnerUser.password); await alfrescoJsApi.login(folderOwnerUser.id, folderOwnerUser.password);
browser.sleep(15000);
const publicSiteName = `PUBLIC_TEST_SITE_${StringUtil.generateRandomString(5)}`; const publicSiteName = `PUBLIC_TEST_SITE_${StringUtil.generateRandomString(5)}`;
const privateSiteName = `PRIVATE_TEST_SITE_${StringUtil.generateRandomString(5)}`; const privateSiteName = `PRIVATE_TEST_SITE_${StringUtil.generateRandomString(5)}`;
@@ -168,11 +170,9 @@ describe('Permissions Component', function () {
done(); done();
}); });
xit('[C277002] Should display the Role Site dropdown', async () => { it('[C277002] Should display the Role Site dropdown', async () => {
contentServicesPage.checkContentIsDisplayed(folderName); contentServicesPage.checkContentIsDisplayed(folderName);
contentServicesPage.checkSelectedSiteIsDisplayed('My files');
contentList.rightClickOnRow(folderName); contentList.rightClickOnRow(folderName);
contentServicesPage.pressContextMenuActionNamed('Permission'); contentServicesPage.pressContextMenuActionNamed('Permission');
@@ -183,8 +183,6 @@ describe('Permissions Component', function () {
permissionsPage.checkAddPermissionDialogIsDisplayed(); permissionsPage.checkAddPermissionDialogIsDisplayed();
permissionsPage.checkSearchUserInputIsDisplayed(); permissionsPage.checkSearchUserInputIsDisplayed();
browser.sleep(10000);
permissionsPage.searchUserOrGroup(consumerUser.getId()); permissionsPage.searchUserOrGroup(consumerUser.getId());
permissionsPage.clickUserOrGroup(consumerUser.getFirstName()); permissionsPage.clickUserOrGroup(consumerUser.getFirstName());
permissionsPage.checkUserOrGroupIsAdded(consumerUser.getId()); permissionsPage.checkUserOrGroupIsAdded(consumerUser.getId());
@@ -194,17 +192,17 @@ describe('Permissions Component', function () {
permissionsPage.clickRoleDropdownByUserOrGroupName(consumerUser.getId()); permissionsPage.clickRoleDropdownByUserOrGroupName(consumerUser.getId());
expect(permissionsPage.getRoleDropdownOptions().count()).toBe(4); expect(permissionsPage.getRoleDropdownOptions().count()).toBe(4);
expect(permissionsPage.getRoleDropdownOptions().get(0).getText()).toBe('SiteCollaborator'); expect(permissionsPage.getRoleDropdownOptions().get(0).getText()).toBe(CONSTANTS.CS_USER_ROLES.COLLABORATOR);
expect(permissionsPage.getRoleDropdownOptions().get(1).getText()).toBe('SiteConsumer'); expect(permissionsPage.getRoleDropdownOptions().get(1).getText()).toBe(CONSTANTS.CS_USER_ROLES.CONSUMER);
expect(permissionsPage.getRoleDropdownOptions().get(2).getText()).toBe('SiteContributor'); expect(permissionsPage.getRoleDropdownOptions().get(2).getText()).toBe(CONSTANTS.CS_USER_ROLES.CONTRIBUTOR);
expect(permissionsPage.getRoleDropdownOptions().get(3).getText()).toBe('SiteManager'); expect(permissionsPage.getRoleDropdownOptions().get(3).getText()).toBe(CONSTANTS.CS_USER_ROLES.MANAGER);
}); });
}); });
describe('Roles: SiteConsumer, SiteCollaborator, SiteContributor, SiteManager', function () { describe('Roles: SiteConsumer, SiteCollaborator, SiteContributor, SiteManager', function () {
xit('[C276994] Role SiteConsumer', async () => { it('[C276994] Role SiteConsumer', async () => {
await loginPage.loginToContentServicesUsingUserModel(siteConsumerUser); await loginPage.loginToContentServicesUsingUserModel(siteConsumerUser);

2
e2e/content-services/tag-component.e2e.ts
View File

@@ -190,7 +190,7 @@ describe('Tag component', () => {
tagPage.checkDeleteTagFromTagListByNodeIdIsNotDisplayed(tagList[3]); tagPage.checkDeleteTagFromTagListByNodeIdIsNotDisplayed(tagList[3]);
}); });
xit('[C286472] Should be able to click Show more/less button on List Tags Content Services', () => { it('[C286472] Should be able to click Show more/less button on List Tags Content Services', () => {
tagPage.insertNodeId(pdfFileModel.id); tagPage.insertNodeId(pdfFileModel.id);
tagPage.checkShowMoreButtonIsDisplayed(); tagPage.checkShowMoreButtonIsDisplayed();

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

@@ -128,19 +128,15 @@ describe('Datatable component', () => {
notificationPage.checkNotificationSnackBarIsNotDisplayed(); notificationPage.checkNotificationSnackBarIsNotDisplayed();
}); });
xit('[C307040] A column value with copyContent set to true is copied when clicking on it', () => { it('[C307040] A column value with copyContent set to true is copied when clicking on it', () => {
dataTablePage.mouseOverIdColumn('1'); dataTablePage.mouseOverIdColumn('1');
expect(dataTablePage.getCopyContentTooltip()).toEqual('Click to copy'); expect(dataTablePage.getCopyContentTooltip()).toEqual('Click to copy');
dataTablePage.clickOnIdColumn('1'); dataTablePage.clickOnIdColumn('1');
notificationPage.checkNotifyContains('Text copied to clipboard'); notificationPage.checkNotifyContains('Text copied to clipboard');
dataTablePage.pasteClipboard();
expect(dataTablePage.getClipboardInputText()).toEqual('1');
dataTablePage.clickOnIdColumn('2'); dataTablePage.clickOnIdColumn('2');
notificationPage.checkNotifyContains('Text copied to clipboard'); notificationPage.checkNotifyContains('Text copied to clipboard');
dataTablePage.clickOnIdColumn('3');
notificationPage.checkNotifyContains('Text copied to clipboard');
dataTablePage.pasteClipboard(); dataTablePage.pasteClipboard();
expect(dataTablePage.getClipboardInputText()).toEqual('3'); expect(dataTablePage.getClipboardInputText()).toEqual('2');
}); });
it('[C307072] A tooltip is displayed when mouseOver a column with copyContent set to true', () => { it('[C307072] A tooltip is displayed when mouseOver a column with copyContent set to true', () => {
@@ -164,20 +160,15 @@ describe('Datatable component', () => {
notificationPage.checkNotificationSnackBarIsNotDisplayed(); notificationPage.checkNotificationSnackBarIsNotDisplayed();
}); });
xit('[C307073] A column value with copyContent set to true is copied when clicking on it', () => { it('[C307073] A column value with copyContent set to true is copied when clicking on it', () => {
copyContentDataTablePage.mouseOverIdColumn('1'); copyContentDataTablePage.mouseOverIdColumn('1');
expect(copyContentDataTablePage.getCopyContentTooltip()).toEqual('Click to copy'); expect(copyContentDataTablePage.getCopyContentTooltip()).toEqual('Click to copy');
copyContentDataTablePage.clickOnIdColumn('1'); copyContentDataTablePage.clickOnIdColumn('1');
notificationPage.checkNotifyContains('Text copied to clipboard'); notificationPage.checkNotifyContains('Text copied to clipboard');
copyContentDataTablePage.pasteClipboard();
expect(copyContentDataTablePage.getClipboardInputText()).toEqual('1');
copyContentDataTablePage.clickOnIdColumn('2'); copyContentDataTablePage.clickOnIdColumn('2');
notificationPage.checkNotifyContains('Text copied to clipboard'); notificationPage.checkNotifyContains('Text copied to clipboard');
copyContentDataTablePage.mouseOverIdColumn('3');
copyContentDataTablePage.clickOnIdColumn('3');
notificationPage.checkNotifyContains('Text copied to clipboard');
copyContentDataTablePage.pasteClipboard(); copyContentDataTablePage.pasteClipboard();
expect(copyContentDataTablePage.getClipboardInputText()).toEqual('3'); expect(copyContentDataTablePage.getClipboardInputText()).toEqual('2');
}); });
it('[C307100] A column value of type text and with copyContent set to true is copied when clicking on it', () => { it('[C307100] A column value of type text and with copyContent set to true is copied when clicking on it', () => {

4
e2e/process-services-cloud/task-header-cloud.e2e.ts
View File

@@ -25,7 +25,6 @@ import { LoginSSOPage, SettingsPage, AppListCloudPage, TaskHeaderCloudPage, Task
import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage'; import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
import { TaskDetailsCloudDemoPage } from '../pages/adf/demo-shell/process-services/taskDetailsCloudDemoPage'; import { TaskDetailsCloudDemoPage } from '../pages/adf/demo-shell/process-services/taskDetailsCloudDemoPage';
import resources = require('../util/resources'); import resources = require('../util/resources');
import { browser } from 'protractor';
describe('Task Header cloud component', () => { describe('Task Header cloud component', () => {
@@ -142,11 +141,10 @@ describe('Task Header cloud component', () => {
.toEqual(subTask.entry.parentTaskId === null ? '' : subTask.entry.parentTaskId); .toEqual(subTask.entry.parentTaskId === null ? '' : subTask.entry.parentTaskId);
}); });
xit('[C307032] Should display the appropriate title for the unclaim option of a Task', async () => { it('[C307032] Should display the appropriate title for the unclaim option of a Task', async () => {
tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); tasksCloudDemoPage.myTasksFilter().clickTaskFilter();
tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(basicCreatedTaskName); tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(basicCreatedTaskName);
tasksCloudDemoPage.taskListCloudComponent().selectRow(basicCreatedTaskName); tasksCloudDemoPage.taskListCloudComponent().selectRow(basicCreatedTaskName);
browser.driver.sleep(30000);
expect(taskDetailsCloudDemoPage.getReleaseButtonText()).toBe('RELEASE'); expect(taskDetailsCloudDemoPage.getReleaseButtonText()).toBe('RELEASE');
}); });
}); });

2
lib/testing/src/lib/core/pages/data-table-component.page.ts
View File

@@ -288,7 +288,7 @@ export class DataTableComponentPage {
} }
getCellByRowNumberAndColumnName(rowNumber, columnName) { getCellByRowNumberAndColumnName(rowNumber, columnName) {
return this.list.get(rowNumber).element(by.css(`div[title="${columnName}"] span`)); return this.list.get(rowNumber).all(by.css(`div[title="${columnName}"] span`)).first();
} }
getCellByRowContentAndColumn(rowColumn, rowContent, columnName) { getCellByRowContentAndColumn(rowColumn, rowContent, columnName) {

50
package-lock.json generated
View File

@@ -1,69 +1,69 @@
{ {
"name": "alfresco-components", "name": "alfresco-components",
"version": "3.2.0", "version": "3.2.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
"@alfresco/adf-content-services": { "@alfresco/adf-content-services": {
"version": "3.2.0", "version": "3.2.1",
"resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.2.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.2.1.tgz",
"integrity": "sha512-G8+vSL3GTGm2rAtvNgFpCctcX7WwRBoAkvkvwnIWETrl5zYb4ftzvCpSkrj8FKxueE8Ys59oTMOv1o22ev2+AA==", "integrity": "sha512-dljtJUnvlA2OC1g9u8TyQEnoHqTEVl94AH6S7dcpWiACLCSMiwd5Zkdpe/p/5FWxPY4on53iIR31KJmyYXfoYQ==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/adf-core": { "@alfresco/adf-core": {
"version": "3.2.0", "version": "3.2.1",
"resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.2.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.2.1.tgz",
"integrity": "sha512-mgDNroAiKjDSOVS3nfc0vYrgGtWt2dUNLfLReU89jvMAiXLVCghA/Gufhjx0t64TOneWofD9hNGV0KuIXx0wFQ==", "integrity": "sha512-BFaL3ARaErwvYa4OjgAgWbN0Pm1NMfULd9gFZROQCqPhr794KtwhGqIVmr+G6JjaQvIXMZ3hSTppKu63NyBoqA==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/adf-extensions": { "@alfresco/adf-extensions": {
"version": "3.2.0", "version": "3.2.1",
"resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.2.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.2.1.tgz",
"integrity": "sha512-nw7rzgG7WznekyzNQF+unsWITuBfQva2wvTiqRPtimpA1hZWIcxKUWhKf5nkw8nCb8qlgkVIimylZjNZFlsr7A==", "integrity": "sha512-ULYZmpRfR7ckLvNe/273DhgWvx7wvoUDzy1lsOIpFS0LfyfjEqEjOcQQ3V2DAcbR1Rl7cJ7+3RXkfVHmp/d6ng==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/adf-insights": { "@alfresco/adf-insights": {
"version": "3.2.0", "version": "3.2.1",
"resolved": "https://registry.npmjs.org/@alfresco/adf-insights/-/adf-insights-3.2.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-insights/-/adf-insights-3.2.1.tgz",
"integrity": "sha512-5TjEsqXyXvW1x4zL/SwVE3C9yuIQfNc4VggOjJu7aMUIMfwaRT2/6CPrL3uRycGpckhQxwYimPmXmgQCKA/B9A==", "integrity": "sha512-6ktlzvoHJ2Pf6+Qcp/ua8rZ/RYuakO0Y6QeFNXlilVt3FK/jF1AmJT3Xj21tdnxOEzWAKTH1lb+rd/0itP+DoQ==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/adf-process-services": { "@alfresco/adf-process-services": {
"version": "3.2.0", "version": "3.2.1",
"resolved": "https://registry.npmjs.org/@alfresco/adf-process-services/-/adf-process-services-3.2.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-process-services/-/adf-process-services-3.2.1.tgz",
"integrity": "sha512-sWe4hXx+vb+A4AgVx7IogB7hblhzw8xEJnJpHRXTxNZg2dUFIHrRAbl2249feSlY/Jf2VotmbahwiD9PWps/ZA==", "integrity": "sha512-cHNFYxzkUgvf0oqWJt87rnmEl9ujtJ2Jw73jR/Wcayk2QgOrmMuhaIaFlkgqhfudIHeXnpT2RfcgxcF7rWCWaA==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/adf-process-services-cloud": { "@alfresco/adf-process-services-cloud": {
"version": "3.2.0", "version": "3.2.1",
"resolved": "https://registry.npmjs.org/@alfresco/adf-process-services-cloud/-/adf-process-services-cloud-3.2.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-process-services-cloud/-/adf-process-services-cloud-3.2.1.tgz",
"integrity": "sha512-Bbr2jlp33hKqu9xjBXbcJxR6UdX9B5524+XB3LlDj/sxMzy8QAOndXS91Ywcfwsz1zWCApBkwfAdOkfmWab+sQ==", "integrity": "sha512-40IirZWLqRqTcJlYMwNRX7AyWUdrRzOHG2OPsAtTO4ozEub3UzYZDte/7uh7a52CoVsSz+Kx/oom8pGK+9MVoQ==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/adf-testing": { "@alfresco/adf-testing": {
"version": "3.2.0", "version": "3.2.1",
"resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-3.2.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-3.2.1.tgz",
"integrity": "sha512-4tZ5V9EiyNCYZILH339KTqag1Gv1nTTOa75DsPb5hIP96T/QGskgF26ehIiADTJrDfuOtuWfbRWLrB4OQ5y61A==", "integrity": "sha512-8RG80G3JMvB3QjtVRI4jsLXDUicvqXyc9TrTgOcH6ilYKKTqt6P+OJi3H45yLPhat41MwSeP1LgCoUW3d1SWHQ==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/js-api": { "@alfresco/js-api": {
"version": "3.2.0", "version": "3.2.1",
"resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-3.2.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-3.2.1.tgz",
"integrity": "sha512-HgB/8M4mSi1mVx7ZDbgrNLP5xZiPUamkNzQI198DkWwQRxXh9V0khEavm82Rr9M5nrLw4VdPUARFLmxsNQwmng==", "integrity": "sha512-qaXftaHqFonWRKRmYxhB2/bEpUh5fvUj6cN+xuKUXIGgt9XxF76NpWkXnEEQLZ0BWg5upd19Q3N1x4E7DiNGUg==",
"requires": { "requires": {
"event-emitter": "0.3.4", "event-emitter": "0.3.4",
"superagent": "3.8.2" "superagent": "3.8.2"

2
scripts/test-e2e-lib.sh
View File

@@ -140,11 +140,11 @@ while [[ $1 == -* ]]; do
-b|--browser) set_browser; shift;; -b|--browser) set_browser; shift;;
-dev|--dev) set_development; shift;; -dev|--dev) set_development; shift;;
-s|--spec) set_test $2; shift 2;; -s|--spec) set_test $2; shift 2;;
-db|--debug) debug; shift;;
-ud|--use-dist) lite_server; shift;; -ud|--use-dist) lite_server; shift;;
-save) set_save_screenshot; shift;; -save) set_save_screenshot; shift;;
-proxy|--proxy) set_proxy $2; shift 2;; -proxy|--proxy) set_proxy $2; shift 2;;
-s|--seleniumServer) set_selenium $2; shift 2;; -s|--seleniumServer) set_selenium $2; shift 2;;
-db|--debug) debug; shift;;
-host|--host) set_host $2; shift 2;; -host|--host) set_host $2; shift 2;;
-host_bpm|--host_bpm) set_host_bpm $2; shift 2;; -host_bpm|--host_bpm) set_host_bpm $2; shift 2;;
-host_sso|--host_sso) set_host_sso $2; shift 2;; -host_sso|--host_sso) set_host_sso $2; shift 2;;