From 4feb8c3f95986af49691c1cf1db0c69f39e44299 Mon Sep 17 00:00:00 2001 From: Marouan Bentaleb <38426175+marouanbentaleb@users.noreply.github.com> Date: Tue, 12 Mar 2019 09:55:50 +0000 Subject: [PATCH] [ADF-4208] Make the pipeline green again (#4419) * [ADF-4209] Fix Core tests * [ADF-4209] Fix Core tests * [ADF-4218] Fix Insight tests * Fix process-services-cloud tests --- e2e/core/pagination-empty-current-page.e2e.ts | 4 ++-- e2e/insights/analytics-component.e2e.ts | 1 - e2e/pages/adf/process-services/analyticsPage.ts | 4 +--- .../process-custom-filters.e2e.ts | 4 ++-- package.json | 15 ++++++++------- scripts/affected-libs.sh | 2 +- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/e2e/core/pagination-empty-current-page.e2e.ts b/e2e/core/pagination-empty-current-page.e2e.ts index 52ca310bb1..fd57e45abc 100644 --- a/e2e/core/pagination-empty-current-page.e2e.ts +++ b/e2e/core/pagination-empty-current-page.e2e.ts @@ -140,7 +140,7 @@ describe('Pagination - returns to previous page when current is empty', () => { it('[C297494] Should display content when navigating to a non-empty folder not in the first page', () => { contentServicesPage.goToDocumentList(); - contentServicesPage.navigateToFolder(parentFolderModel.name); + contentServicesPage.doubleClickRow(parentFolderModel.name); contentServicesPage.checkAcsContainer(); contentServicesPage.waitForTableBody(); @@ -157,7 +157,7 @@ describe('Pagination - returns to previous page when current is empty', () => { contentServicesPage.checkAcsContainer(); contentServicesPage.waitForTableBody(); - contentServicesPage.navigateToFolder(lastFolderResponse.entry.name); + contentServicesPage.doubleClickRow(lastFolderResponse.entry.name); contentServicesPage.checkContentIsDisplayed(pngFileInfo.name); viewerPage.viewFile(pngFileUploaded.entry.name); diff --git a/e2e/insights/analytics-component.e2e.ts b/e2e/insights/analytics-component.e2e.ts index 559fed009b..4a2d47d81b 100644 --- a/e2e/insights/analytics-component.e2e.ts +++ b/e2e/insights/analytics-component.e2e.ts @@ -25,7 +25,6 @@ import { Tenant } from '../models/APS/tenant'; import { User } from '../models/APS/user'; import AlfrescoApi = require('alfresco-js-api-node'); -import { browser } from 'protractor'; describe('Analytics Smoke Test', () => { diff --git a/e2e/pages/adf/process-services/analyticsPage.ts b/e2e/pages/adf/process-services/analyticsPage.ts index 6e1254354f..ff837660b5 100644 --- a/e2e/pages/adf/process-services/analyticsPage.ts +++ b/e2e/pages/adf/process-services/analyticsPage.ts @@ -21,9 +21,8 @@ import { element, by, protractor } from 'protractor'; export class AnalyticsPage { toolbarTitleInput = element(by.css('input[data-automation-id="reportName"]')); - toolbarTitleContainer = element(by.css('div[class="adf-report-title ng-star-inserted"]')); + toolbarTitleContainer = element(by.css('adf-toolbar-title')); toolbarTitle = element(by.xpath('//mat-toolbar/adf-toolbar-title/div/h4')); - reportContainer = element(by.css('div[class="adf-report-report-container"]')); reportMessage = element(by.css('div[class="ng-star-inserted"] span')); getReport(title) { @@ -33,7 +32,6 @@ export class AnalyticsPage { } changeReportTitle(title) { - Util.waitUntilElementIsVisible(this.reportContainer); Util.waitUntilElementIsVisible(this.toolbarTitleContainer); Util.waitUntilElementIsClickable(this.toolbarTitleContainer); this.toolbarTitleContainer.click(); diff --git a/e2e/process-services-cloud/process-custom-filters.e2e.ts b/e2e/process-services-cloud/process-custom-filters.e2e.ts index 3633bbca63..e0e101f33c 100644 --- a/e2e/process-services-cloud/process-custom-filters.e2e.ts +++ b/e2e/process-services-cloud/process-custom-filters.e2e.ts @@ -160,7 +160,7 @@ describe('Process list cloud', () => { .setAppNameDropDown(simpleApp).setProcessInstanceId(runningProcessInstance.entry.id); processCloudDemoPage.processListCloudComponent().getDataTable().checkSpinnerIsDisplayed().checkSpinnerIsNotDisplayed(); - tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkContentIsDisplayed(runningProcessInstance.entry.id); + processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedById(runningProcessInstance.entry.id); expect(processCloudDemoPage.editProcessFilterCloudComponent().getNumberOfAppNameOptions()).toBe(noOfApps); expect(processCloudDemoPage.editProcessFilterCloudComponent().checkAppNamesAreUnique()).toBe(true); browser.actions().sendKeys(protractor.Key.ESCAPE).perform(); @@ -176,7 +176,7 @@ describe('Process list cloud', () => { .setAppNameDropDown(simpleApp).setProcessInstanceId(switchProcessInstance.entry.id); processCloudDemoPage.processListCloudComponent().getDataTable().checkSpinnerIsDisplayed().checkSpinnerIsNotDisplayed(); - tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkContentIsDisplayed(switchProcessInstance.entry.id); + processCloudDemoPage.processListCloudComponent().checkContentIsDisplayedById(switchProcessInstance.entry.id); processCloudDemoPage.editProcessFilterCloudComponent().clickSaveAsButton(); processCloudDemoPage.editProcessFilterCloudComponent().editProcessFilterDialog().setFilterName('SwitchFilter').clickOnSaveButton(); expect(processCloudDemoPage.getActiveFilterName()).toBe('SwitchFilter'); diff --git a/package.json b/package.json index fd2cf6af0a..4e903dfc66 100644 --- a/package.json +++ b/package.json @@ -55,13 +55,14 @@ "process services-cloud" ], "dependencies": { - "@alfresco/adf-content-services": "3.1.0-beta4", - "@alfresco/adf-core": "3.1.0-beta4", - "@alfresco/adf-extensions": "3.1.0-beta4", - "@alfresco/adf-insights": "3.1.0-beta4", - "@alfresco/adf-process-services": "3.1.0-beta4", - "@alfresco/adf-process-services-cloud": "3.1.0-beta4", - "@alfresco/js-api": "3.1.0-beta4", + "@alfresco/adf-content-services": "3.1.0-beta5", + "@alfresco/adf-core": "3.1.0-beta5", + "@alfresco/adf-extensions": "3.1.0-beta5", + "@alfresco/adf-insights": "3.1.0-beta5", + "@alfresco/adf-process-services": "3.1.0-beta5", + "@alfresco/adf-process-services-cloud": "3.1.0-beta5", + "@alfresco/adf-testing": "3.1.0-beta5", + "@alfresco/js-api": "3.1.0-beta5", "@angular/animations": "7.0.3", "@angular/cdk": "7.0.3", "@angular/common": "7.0.3", diff --git a/scripts/affected-libs.sh b/scripts/affected-libs.sh index 2b32f48fd6..7eba357a97 100755 --- a/scripts/affected-libs.sh +++ b/scripts/affected-libs.sh @@ -88,7 +88,7 @@ done for i in "${libs[@]}" do if [ "$i" == "core" ] ; then - AFFECTED_LIBS="core$ content-services$ process-services$ process-services-cloud$ insights$ extensions$ " + AFFECTED_LIBS="core$ content-services$ process-services$ process-services-cloud$ insights$ extensions$ testing$" echo "${AFFECTED_LIBS}" exit 0 fi