From 97ad54a4f8c7418acafe6c4d4c0f9b2bad6cfb25 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Fri, 19 Apr 2019 19:53:45 +0200 Subject: [PATCH] [no-issue] fix test plus fix update script (#4629) * fix test plus * fix test lint * increase timeout * increase timeout --- .travis.yml | 2 +- .../permissions/site-permissions.e2e.ts | 2 +- .../version/version-actions.e2e.ts | 7 ++- .../task-header-cloud.e2e.ts | 2 +- e2e/search/search-multiselect.e2e.ts | 53 +++++++++---------- e2e/search/search-page-component.e2e.ts | 17 +----- scripts/update-project.sh | 2 +- 7 files changed, 35 insertions(+), 50 deletions(-) diff --git a/.travis.yml b/.travis.yml index 05bb0fd9bd..5f6faa47bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -131,7 +131,7 @@ jobs: if: tag =~ .*beta.* script: ./scripts/update-project.sh -gnu -t $GITHUB_TOKEN -n Activiti/activiti-modeling-app' - stage: Update children projects dependency # Test alfresco-admin-app - name: Update alfresco modeler activiti app + name: Update alfresco admin app if: tag =~ .*beta.* script: ./scripts/update-project.sh -gnu -t $GITHUB_TOKEN -n 'Alfresco/alfresco-admin-app' - stage: e2e Test # Test core diff --git a/e2e/content-services/permissions/site-permissions.e2e.ts b/e2e/content-services/permissions/site-permissions.e2e.ts index 62ee1d85b1..1215ac8e74 100644 --- a/e2e/content-services/permissions/site-permissions.e2e.ts +++ b/e2e/content-services/permissions/site-permissions.e2e.ts @@ -180,7 +180,7 @@ describe('Permissions Component', function () { permissionsPage.checkAddPermissionDialogIsDisplayed(); permissionsPage.checkSearchUserInputIsDisplayed(); - browser.sleep(7000); + browser.sleep(10000); permissionsPage.searchUserOrGroup(consumerUser.getId()); permissionsPage.clickUserOrGroup(consumerUser.getFirstName()); diff --git a/e2e/content-services/version/version-actions.e2e.ts b/e2e/content-services/version/version-actions.e2e.ts index 63bc6b18fe..bb073232df 100644 --- a/e2e/content-services/version/version-actions.e2e.ts +++ b/e2e/content-services/version/version-actions.e2e.ts @@ -56,6 +56,11 @@ describe('Version component actions', () => { 'location': resources.Files.ADF_DOCUMENTS.PNG.file_location }); + const bigFileToCancel = new FileModel({ + 'name': resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_name, + 'location': resources.Files.ADF_DOCUMENTS.LARGE_FILE.file_location + }); + beforeAll(async (done) => { const uploadActions = new UploadActions(); @@ -156,7 +161,7 @@ describe('Version component actions', () => { browser.executeScript(' setTimeout(() => {document.querySelector(\'mat-icon[class*="adf-file-uploading-row__action"]\').click();}, 1000)'); versionManagePage.showNewVersionButton.click(); - versionManagePage.uploadNewVersionFile(fileModelVersionTwo.location); + versionManagePage.uploadNewVersionFile(bigFileToCancel.location); versionManagePage.closeVersionDialog(); await expect(new UploadDialog().getTitleText()).toEqual('Upload canceled'); diff --git a/e2e/process-services-cloud/task-header-cloud.e2e.ts b/e2e/process-services-cloud/task-header-cloud.e2e.ts index 3f80507399..f007a6166e 100644 --- a/e2e/process-services-cloud/task-header-cloud.e2e.ts +++ b/e2e/process-services-cloud/task-header-cloud.e2e.ts @@ -145,6 +145,6 @@ describe('Task Header cloud component', () => { tasksCloudDemoPage.myTasksFilter().clickTaskFilter(); tasksCloudDemoPage.taskListCloudComponent().checkContentIsDisplayedByName(basicCreatedTaskName); tasksCloudDemoPage.taskListCloudComponent().selectRow(basicCreatedTaskName); - expect(taskDetailsCloudDemoPage.getReleaseButtonText()).toBe('Release'); + expect(taskDetailsCloudDemoPage.getReleaseButtonText()).toBe('UNCLAIM'); }); }); diff --git a/e2e/search/search-multiselect.e2e.ts b/e2e/search/search-multiselect.e2e.ts index f895a70f64..1aaafa32d1 100644 --- a/e2e/search/search-multiselect.e2e.ts +++ b/e2e/search/search-multiselect.e2e.ts @@ -78,18 +78,7 @@ describe('Search Component - Multi-Select Facet', () => { txtFile = await uploadActions.uploadFile(this.alfrescoJsApi, txtFileInfo.location, txtFileInfo.name, '-my-'); txtFileSite = await uploadActions.uploadFile(this.alfrescoJsApi, txtFileInfo.location, txtFileInfo.name, site.entry.guid); - await browser.driver.sleep(15000); - - loginPage.loginToContentServicesUsingUserModel(acsUser); - - searchDialog.checkSearchIconIsVisible(); - searchDialog.clickOnSearchIcon(); - searchDialog.enterTextAndPressEnter(`${randomName}`); - - userOption = `${acsUser.firstName} ${acsUser.lastName}`; - - searchFiltersPage.checkSearchFiltersIsDisplayed(); - searchFiltersPage.creatorCheckListFiltersPage().filterBy(userOption); + await browser.driver.sleep(20000); done(); }); @@ -108,6 +97,16 @@ describe('Search Component - Multi-Select Facet', () => { }); it('[C280054] Should be able to select multiple items from a search facet filter', () => { + loginPage.loginToContentServicesUsingUserModel(acsUser); + + searchDialog.checkSearchIconIsVisible(); + searchDialog.clickOnSearchIcon(); + searchDialog.enterTextAndPressEnter(`${randomName}`); + + userOption = `${acsUser.firstName} ${acsUser.lastName}`; + + searchFiltersPage.checkSearchFiltersIsDisplayed(); + searchFiltersPage.creatorCheckListFiltersPage().filterBy(userOption); searchFiltersPage.fileTypeCheckListFiltersPage().filterBy('Plain Text'); expect(searchResultsPage.numberOfResultsDisplayed()).toBe(2); @@ -163,23 +162,20 @@ describe('Search Component - Multi-Select Facet', () => { jpgFile = await uploadActions.uploadFile(this.alfrescoJsApi, jpgFileInfo.location, jpgFileInfo.name, site.entry.guid); - await browser.driver.sleep(15000); + await browser.driver.sleep(20000); + done(); + }); + + it('[C280056] Should be able to select multiple items from multiple search facet filters', () => { loginPage.loginToContentServicesUsingUserModel(userUploadingImg); searchDialog.checkSearchIconIsVisible(); searchDialog.clickOnSearchIcon(); searchDialog.enterTextAndPressEnter(`*${randomName}*`); - done(); - }); - - it('[C280056] Should be able to select multiple items from multiple search facet filters', () => { - searchFiltersPage.checkSearchFiltersIsDisplayed(); - searchFiltersPage.creatorCheckListFiltersPage().filterBy(`${userUploadingTxt.firstName} ${userUploadingTxt.lastName}`); - searchFiltersPage.creatorCheckListFiltersPage().filterBy(`${userUploadingImg.firstName} ${userUploadingImg.lastName}`); searchResultsPage.checkContentIsDisplayed(txtFile.entry.name); @@ -217,15 +213,7 @@ describe('Search Component - Multi-Select Facet', () => { }); txtFile = await uploadActions.uploadFile(this.alfrescoJsApi, txtFileInfo.location, txtFileInfo.name, '-my-'); - await browser.driver.sleep(15000); - - loginPage.loginToContentServicesUsingUserModel(acsUser); - - searchDialog.checkSearchIconIsVisible(); - searchDialog.clickOnSearchIcon(); - searchDialog.enterTextAndPressEnter(`*${randomName}*`); - - searchFiltersPage.checkSearchFiltersIsDisplayed(); + await browser.driver.sleep(20000); done(); }); @@ -237,6 +225,13 @@ describe('Search Component - Multi-Select Facet', () => { }); it('[C280058] Should update filter facets items number when another filter facet item is selected', () => { + loginPage.loginToContentServicesUsingUserModel(acsUser); + + searchDialog.checkSearchIconIsVisible(); + searchDialog.clickOnSearchIcon(); + searchDialog.enterTextAndPressEnter(`*${randomName}*`); + + searchFiltersPage.checkSearchFiltersIsDisplayed(); searchFiltersPage.fileTypeCheckListFiltersPage().filterBy('Plain Text'); searchFiltersPage.creatorCheckListFiltersPage().filterBy(`${acsUser.firstName} ${acsUser.lastName}`); diff --git a/e2e/search/search-page-component.e2e.ts b/e2e/search/search-page-component.e2e.ts index 7b5114ab45..9ae2bccb50 100644 --- a/e2e/search/search-page-component.e2e.ts +++ b/e2e/search/search-page-component.e2e.ts @@ -22,7 +22,6 @@ import { LoginPage } from '@alfresco/adf-testing'; import { SearchDialog } from '../pages/adf/dialog/searchDialog'; import { ContentServicesPage } from '../pages/adf/contentServicesPage'; import { SearchResultsPage } from '../pages/adf/searchResultsPage'; -import { FilePreviewPage } from '../pages/adf/filePreviewPage'; import { AcsUserModel } from '../models/ACS/acsUserModel'; import { FolderModel } from '../models/ACS/folderModel'; @@ -54,7 +53,6 @@ describe('Search component - Search Page', () => { const contentServicesPage = new ContentServicesPage(); const searchDialog = new SearchDialog(); const searchResultPage = new SearchResultsPage(); - const filePreviewPage = new FilePreviewPage(); const acsUser = new AcsUserModel(); const emptyFolderModel = new FolderModel({ 'name': 'search' + StringUtil.generateRandomString() }); @@ -98,7 +96,7 @@ describe('Search component - Search Page', () => { await uploadActions.createEmptyFiles(this.alfrescoJsApi, adminFileNames, newFolderModelUploaded.entry.id); - browser.driver.sleep(10000); + browser.driver.sleep(15000); loginPage.loginToContentServicesUsingUserModel(acsUser); @@ -112,19 +110,6 @@ describe('Search component - Search Page', () => { searchResultPage.checkNoResultMessageIsDisplayed(); }); - it('[C260265] Should display file previewer when opening a file from search results', () => { - searchDialog - .clickOnSearchIcon() - .enterTextAndPressEnter(firstFileModel.name); - - searchResultPage.checkContentIsDisplayed(firstFileModel.name); - searchResultPage.navigateToFolder(firstFileModel.name); - - browser.driver.sleep(200); - - filePreviewPage.closePreviewWithButton(); - }); - it('[C272810] Should display only files corresponding to search', () => { searchDialog .clickOnSearchIcon() diff --git a/scripts/update-project.sh b/scripts/update-project.sh index 9ed0490cd4..ed3ff9af09 100755 --- a/scripts/update-project.sh +++ b/scripts/update-project.sh @@ -39,7 +39,7 @@ done rm -rf $TEMP_GENERATOR_DIR; -git clone https://$TOKEN@github.com/Alfresco/$NAME_REPO.git $TEMP_GENERATOR_DIR +git clone https://$TOKEN@github.com/$NAME_REPO.git $TEMP_GENERATOR_DIR cd $TEMP_GENERATOR_DIR git checkout development