From 4fe4a3d3c156ed7216cb9de7045d2b6583c272c4 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Wed, 19 Sep 2018 13:21:17 +0100 Subject: [PATCH] delete files from viewer test add right testrail to userinfo test group some CS e2e in folders --- .../document_list_actions.e2e.ts | 0 .../document_list_component.e2e.ts | 0 .../document_list_pagination.e2e.ts | 0 .../{ => search}/search_component.e2e.ts | 0 .../{ => search}/search_filters.e2e.ts | 0 .../{ => search}/search_multiselect.e2e.ts | 0 .../{ => search}/search_page_component.e2e.ts | 0 e2e/core/pagination_empty_current_page.e2e.ts | 2 +- e2e/core/user_info_component.e2e.ts | 12 +++---- .../viewer_content_services_component.e2e.ts | 34 +++++++++---------- 10 files changed, 24 insertions(+), 24 deletions(-) rename e2e/content-services/{ => document-list}/document_list_actions.e2e.ts (100%) rename e2e/content-services/{ => document-list}/document_list_component.e2e.ts (100%) rename e2e/content-services/{ => document-list}/document_list_pagination.e2e.ts (100%) rename e2e/content-services/{ => search}/search_component.e2e.ts (100%) rename e2e/content-services/{ => search}/search_filters.e2e.ts (100%) rename e2e/content-services/{ => search}/search_multiselect.e2e.ts (100%) rename e2e/content-services/{ => search}/search_page_component.e2e.ts (100%) diff --git a/e2e/content-services/document_list_actions.e2e.ts b/e2e/content-services/document-list/document_list_actions.e2e.ts similarity index 100% rename from e2e/content-services/document_list_actions.e2e.ts rename to e2e/content-services/document-list/document_list_actions.e2e.ts diff --git a/e2e/content-services/document_list_component.e2e.ts b/e2e/content-services/document-list/document_list_component.e2e.ts similarity index 100% rename from e2e/content-services/document_list_component.e2e.ts rename to e2e/content-services/document-list/document_list_component.e2e.ts diff --git a/e2e/content-services/document_list_pagination.e2e.ts b/e2e/content-services/document-list/document_list_pagination.e2e.ts similarity index 100% rename from e2e/content-services/document_list_pagination.e2e.ts rename to e2e/content-services/document-list/document_list_pagination.e2e.ts diff --git a/e2e/content-services/search_component.e2e.ts b/e2e/content-services/search/search_component.e2e.ts similarity index 100% rename from e2e/content-services/search_component.e2e.ts rename to e2e/content-services/search/search_component.e2e.ts diff --git a/e2e/content-services/search_filters.e2e.ts b/e2e/content-services/search/search_filters.e2e.ts similarity index 100% rename from e2e/content-services/search_filters.e2e.ts rename to e2e/content-services/search/search_filters.e2e.ts diff --git a/e2e/content-services/search_multiselect.e2e.ts b/e2e/content-services/search/search_multiselect.e2e.ts similarity index 100% rename from e2e/content-services/search_multiselect.e2e.ts rename to e2e/content-services/search/search_multiselect.e2e.ts diff --git a/e2e/content-services/search_page_component.e2e.ts b/e2e/content-services/search/search_page_component.e2e.ts similarity index 100% rename from e2e/content-services/search_page_component.e2e.ts rename to e2e/content-services/search/search_page_component.e2e.ts diff --git a/e2e/core/pagination_empty_current_page.e2e.ts b/e2e/core/pagination_empty_current_page.e2e.ts index 2c50e82aca..c73f57db2c 100644 --- a/e2e/core/pagination_empty_current_page.e2e.ts +++ b/e2e/core/pagination_empty_current_page.e2e.ts @@ -77,7 +77,7 @@ describe('Pagination - returns to previous page when current is empty', () => { done(); }); - it('Pagination - returns to previous page when current is empty', () => { + it('[C274710] returns to previous page when current is empty', () => { contentServicesPage.navigateToFolder(folderModel.name); contentServicesPage.checkAcsContainer(); contentServicesPage.waitForTableBody(); diff --git a/e2e/core/user_info_component.e2e.ts b/e2e/core/user_info_component.e2e.ts index 1541767e42..b46173378f 100644 --- a/e2e/core/user_info_component.e2e.ts +++ b/e2e/core/user_info_component.e2e.ts @@ -73,7 +73,7 @@ describe('User Info component', () => { done(); }); - it('1. Enable Process Services and Content Services ', () => { + it('[C260111] Enable Process Services and Content Services ', () => { loginPage.goToLoginPage(); adfSettingsPage.setProviderEcmBpm(); loginPage.login(contentUserModel.id, contentUserModel.password); @@ -104,7 +104,7 @@ describe('User Info component', () => { userInfoDialog.closeUserProfile(); }); - it('2. Enable Content Services and disable Process Services ', () => { + it('[C260113] Enable Content Services and disable Process Services ', () => { loginPage.goToLoginPage(); adfSettingsPage.setProviderEcm(); loginPage.login(contentUserModel.id, contentUserModel.password); @@ -121,7 +121,7 @@ describe('User Info component', () => { userInfoDialog.closeUserProfile(); }); - it('3. Enable Process Services and disable Content Services ', () => { + it('[C260115] Enable Process Services and disable Content Services ', () => { loginPage.goToLoginPage(); adfSettingsPage.setProviderBpm(); loginPage.login(processUserModel.email, processUserModel.password); @@ -140,7 +140,7 @@ describe('User Info component', () => { userInfoDialog.closeUserProfile(); }); - it('4. Enable Process Services and Content Services ', async(done) => { + it('[C260117] Enable Process Services and Content Services ', async(done) => { browser.controlFlow().execute(async() => { await PeopleAPI.updateAvatarViaAPI(contentUserModel, acsAvatarFileModel, '-me-'); await PeopleAPI.getAvatarViaAPI(4, contentUserModel, '-me-', function (result) {}); @@ -156,7 +156,7 @@ describe('User Info component', () => { done(); }); - it('5. The profile picture is changed from APS', async () => { + it('[C260118] The profile picture is changed from APS', async () => { let users = new UsersActions(); await this.alfrescoJsApi.login(contentUserModel.email, contentUserModel.password); await users.changeProfilePictureAps(this.alfrescoJsApi, apsAvatarFileModel.getLocation()); @@ -171,7 +171,7 @@ describe('User Info component', () => { userInfoDialog.closeUserProfile(); }); - it('6. Delete the profile picture from ACS', () => { + it('[C260120] Delete the profile picture from ACS', () => { PeopleAPI.deleteAvatarViaAPI(contentUserModel, '-me-'); loginPage.goToLoginPage(); adfSettingsPage.setProviderEcm(); diff --git a/e2e/core/viewer_content_services_component.e2e.ts b/e2e/core/viewer_content_services_component.e2e.ts index a864ea755a..36d1b786a1 100644 --- a/e2e/core/viewer_content_services_component.e2e.ts +++ b/e2e/core/viewer_content_services_component.e2e.ts @@ -118,23 +118,19 @@ describe('Content Services Viewer', () => { done(); }); - /*afterAll((done) => { - NodesAPI.deleteContent(acsUser, pdfFile.getId(), () => { - done(); - }); - NodesAPI.deleteContent(acsUser, jpgFile.getId(), () => { - done(); - }); - NodesAPI.deleteContent(acsUser, mp4File.getId(), () => { - done(); - }); - NodesAPI.deleteContent(acsUser, pagesFile.getId(), () => { - done(); - }); - NodesAPI.deleteContent(acsUser, pptFile.getId(), () => { - done(); - }); - });*/ + afterAll(async (done) => { + let uploadActions = new UploadActions(); + + await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, pdfFile.getId()) + await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, protectedFile.getId()) + await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, docxFile.getId()) + await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, jpgFile.getId()) + await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, mp4File.getId()) + await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, pptFile.getId()) + await uploadActions.deleteFilesOrFolder(this.alfrescoJsApi, unsupportedFile.getId()) + + done(); + }); it('[C260038] Should display first page, toolbar and pagination when opening a .pdf file', () => { contentServicesPage.checkAcsContainer(); @@ -276,6 +272,8 @@ describe('Content Services Viewer', () => { it('[C260054] Should display "Preview couldn\'t be loaded" and viewer toolbar when opening an unsupported file', () => { viewerPage.viewFile(unsupportedFile.name); + browser.driver.sleep(3000); // wait open file + viewerPage.checkCloseButtonIsDisplayed(); viewerPage.checkFileNameIsDisplayed(unsupportedFile.name); viewerPage.checkFileThumbnailIsDisplayed(); @@ -348,6 +346,8 @@ describe('Content Services Viewer', () => { it('[C269109] Should not be able to open thumbnail pane before the pdf is loaded', () => { viewerPage.viewFile(pdfFile.name); + browser.driver.sleep(3000); // wait open file + viewerPage.checkThumbnailsBtnIsDisabled(); viewerPage.clickCloseButton();