diff --git a/e2e/pages/adf/tagPage.js b/e2e/pages/adf/tagPage.js index 9a78daf928..8f30ba697e 100644 --- a/e2e/pages/adf/tagPage.js +++ b/e2e/pages/adf/tagPage.js @@ -68,6 +68,21 @@ var TagPage = function () { return this; }; + this.deleteTagFromTagListByNodeId = function () { + var deleteChip = element(by.css('button[id=\'tag_delete_0\']')); + Util.waitUntilElementIsVisible(deleteChip); + deleteChip.click(); + return this; + }; + + + this.deleteTagFromTagList = function () { + var deleteChip = element(by.xpath('//*[@id="tag_delete_0"]/mat-icon')); + Util.waitUntilElementIsVisible(deleteChip); + deleteChip.click(); + return this; + }; + this.getNewTagInput = function () { Util.waitUntilElementIsVisible(newTagInput); return newTagInput.getAttribute('value'); @@ -93,8 +108,9 @@ var TagPage = function () { return Util.waitUntilElementIsNotOnPage(tag); }; - this.checkTagListIsEmpty = function () { - Util.waitUntilElementIsNotOnPage(tagListRow); + this.checkTagIsNotDisplayedInTagListByNodeId = function (tagName) { + var tag = element(by.cssContainingText("span[id*='tag_name']", tagName)); + return Util.waitUntilElementIsNotOnPage(tag); }; this.checkTagIsDisplayedInTagListByNodeId = function (tagName) { @@ -102,6 +118,10 @@ var TagPage = function () { return Util.waitUntilElementIsVisible(tag); }; + this.checkTagListIsEmpty = function () { + Util.waitUntilElementIsNotOnPage(tagListRow); + }; + this.checkTagListByNodeIdIsEmpty = function () { return Util.waitUntilElementIsNotOnPage(tagListByNodeIdRow); }; diff --git a/e2e/process_attachmentList_actionMenu.e2e.ts b/e2e/process_attachmentList_actionMenu.e2e.ts index 83c4cbf2b8..3dee6f978a 100644 --- a/e2e/process_attachmentList_actionMenu.e2e.ts +++ b/e2e/process_attachmentList_actionMenu.e2e.ts @@ -129,7 +129,7 @@ describe('Attachment list action menu for processes', () => { attachmentListPage.checkFileIsRemoved(jpgFile.name); }); - it('[C279886Edit] Option menu functionality - Completed Process', () => { + it('[C279886] Option menu functionality - Completed Process', () => { processServicesPage.goToProcessServices().goToApp(app.title).clickProcessButton(); processFiltersPage.clickRunningFilterButton(); diff --git a/e2e/tag_component.e2e.ts b/e2e/tag_component.e2e.ts index c0ce5e1dec..3945713668 100644 --- a/e2e/tag_component.e2e.ts +++ b/e2e/tag_component.e2e.ts @@ -35,6 +35,7 @@ describe('Tag component', () => { let acsUser = new AcsUserModel(); let pdfFileModel = new FileModel({ 'name': resources.Files.ADF_DOCUMENTS.PDF.file_name }); + let deleteFile = new FileModel({ 'name': 'deleteFile.id' }); let sameTag = Util.generateRandomStringToLowerCase(); let tagList = [Util.generateRandomStringToLowerCase(), Util.generateRandomStringToLowerCase()]; let uppercaseTag = Util.generateRandomStringToUpperCase(); @@ -57,14 +58,18 @@ describe('Tag component', () => { let pdfUploadedFile = await uploadActions.uploadFile(this.alfrescoJsApi, pdfFileModel.location, pdfFileModel.name, '-my-'); + let uploadedDeleteFile = await uploadActions.uploadFile(this.alfrescoJsApi, deleteFile.location, deleteFile.name, '-my-'); + Object.assign(pdfFileModel, pdfUploadedFile.entry); + Object.assign(deleteFile, uploadedDeleteFile.entry); + loginPage.loginToContentServicesUsingUserModel(acsUser); done(); }); - it('Tag node ID', () => { + it('[C260374] Tag node ID', () => { tagPage.goToTagPage(); expect(tagPage.getNodeId()).toEqual(''); expect(tagPage.getNewTagPlaceholder()).toEqual('New Tag'); @@ -75,7 +80,7 @@ describe('Tag component', () => { expect(tagPage.getNewTagInput()).toEqual('a'); }); - it('New tag for specific Node ID', () => { + it('[C268151] New tag for specific Node ID', () => { tagPage.goToTagPage(); tagPage.insertNodeId(pdfFileModel.id); tagPage.addTag(tagList[0]); @@ -84,7 +89,7 @@ describe('Tag component', () => { tagPage.checkTagIsDisplayedInTagListByNodeId(tagList[0]); }); - it('Tag name already exists', () => { + it('[C260377] Tag name already exists', () => { tagPage.goToTagPage(); tagPage.insertNodeId(pdfFileModel.id); tagPage.addTag(sameTag); @@ -93,7 +98,7 @@ describe('Tag component', () => { expect(tagPage.getErrorMessage()).toEqual('Tag already exists'); }); - it('Multiple tags', () => { + it('[C260378] Multiple tags', () => { tagPage.goToTagPage(); tagPage.insertNodeId(pdfFileModel.id); tagPage.checkTagListIsOrderedAscending(); @@ -101,7 +106,7 @@ describe('Tag component', () => { tagPage.checkTagListContentServicesIsOrderedAscending(); }); - it('Tag text field', () => { + it('[C91326] Tag text field', () => { tagPage.goToTagPage(); tagPage.insertNodeId(pdfFileModel.id); @@ -125,4 +130,35 @@ describe('Tag component', () => { tagPage.checkTagIsDisplayedInTagList(nonLatinTag); tagPage.checkTagIsDisplayedInTagListByNodeId(nonLatinTag); }); + + + it('[C260375] Delete tag', () => { + let deleteTag = Util.generateRandomStringToUpperCase(); + + tagPage.goToTagPage(); + + tagPage.insertNodeId(deleteFile.id); + + tagPage.addTag(deleteTag); + + tagPage.checkTagIsDisplayedInTagList(deleteTag.toLowerCase()); + tagPage.checkTagIsDisplayedInTagListByNodeId(deleteTag.toLowerCase()); + + tagPage.deleteTagFromTagListByNodeId(); + + tagPage.checkTagIsNotDisplayedInTagList(deleteTag.toLowerCase()); + tagPage.checkTagIsNotDisplayedInTagListByNodeId(deleteTag.toLowerCase()); + + tagPage.insertNodeId(deleteFile.id); + + tagPage.addTag(deleteTag); + + tagPage.checkTagIsDisplayedInTagList(deleteTag.toLowerCase()); + tagPage.checkTagIsDisplayedInTagListByNodeId(deleteTag.toLowerCase()); + + tagPage.deleteTagFromTagList(); + + tagPage.checkTagIsNotDisplayedInTagList(deleteTag.toLowerCase()); + tagPage.checkTagIsNotDisplayedInTagListByNodeId(deleteTag.toLowerCase()); + }); });