* FIxed process-service cloud e2e

Alfresco · May 5, 2020 · 035286b · 035286b
1 parent cc7ccab
commit 035286b
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 25 deletions.
diff --git a/e2e/pages/adf/process-services/process-filters.page.ts b/e2e/pages/adf/process-services/process-filters.page.ts
@@ -33,7 +33,7 @@ export class ProcessFiltersPage {
     rows: Locator = by.css('adf-process-instance-list div[class="adf-datatable-body"] adf-datatable-row[class*="adf-datatable-row"]');
     tableBody: ElementFinder = element.all(by.css('adf-datatable div[class="adf-datatable-body"]')).first();
     nameColumn: Locator = by.css('div[class*="adf-datatable-body"] adf-datatable-row[class*="adf-datatable-row"] div[title="Name"] span');
-    processIcon: ElementFinder =  element(by.css('.adf-icon'));
+    processIcon: ElementFinder =  element(by.css('adf-icon[data-automation-id="adf-filter-icon"]'));
 
     async startProcess(): Promise<StartProcessPage> {
         await this.clickCreateProcessButton();

diff --git a/e2e/pages/adf/process-services/task-filters.page.ts b/e2e/pages/adf/process-services/task-filters.page.ts
@@ -21,7 +21,7 @@ import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing';
 export class TaskFiltersPage {
 
     filter;
-    taskIcon: ElementFinder =  element(by.css('.adf-icon'));
+    taskIcon: ElementFinder =  element(by.css('adf-icon[data-automation-id="adf-filter-icon"]'));
 
     constructor(filter: ElementFinder) {
         this.filter = filter;

diff --git a/...ces-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.html b/...ces-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.html
@@ -4,11 +4,11 @@
         <button (click)="selectFilterById(filter.id)"
           [attr.aria-label]="filter.name | translate"
           [id]="filter.id"
-          [attr.data-automation-id]="filter.name + '_filter'"
+          [attr.data-automation-id]="filter.key + '_filter'"
           mat-button
-          class="adf-action-button adf-full-width" fxLayout="row" fxLayoutAlign="space-between center">
-          <adf-icon *ngIf="showIcons" [value]="filter.icon"></adf-icon>
-          <span class="adf-action-button__label">{{ filter.name | translate }}</span>
+          class="adf-filter-action-button adf-full-width" fxLayout="row" fxLayoutAlign="space-between center">
+          <adf-icon data-automation-id="adf-filter-icon" *ngIf="showIcons" [value]="filter.icon"></adf-icon>
+          <span data-automation-id="adf-filter-label" class="adf-filter-action-button__label">{{ filter.name | translate }}</span>
         </button>
     </div>
 </ng-container>

diff --git a/...ces-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.scss b/...ces-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.scss
@@ -16,7 +16,7 @@
                 width: 100%;
             }
 
-            .adf-action-button .adf-action-button__label {
+            .adf-filter-action-button .adf-filter-action-button__label {
                 padding-left: 20px;
                 margin: 0 8px !important;
             }

diff --git a/...-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.spec.ts b/...-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.spec.ts
@@ -36,6 +36,7 @@ describe('ProcessFiltersCloudComponent', () => {
     const fakeGlobalFilter = [
         new ProcessFilterCloudModel({
             name: 'FakeAllProcesses',
+            key: 'FakeAllProcesses',
             icon: 'adjust',
             id: '10',
             status: ''
@@ -278,7 +279,7 @@ describe('ProcessFiltersCloudComponent', () => {
             done();
         });
 
-        const filterButton = fixture.debugElement.nativeElement.querySelector(`[data-automation-id="${fakeGlobalFilter[0].name}_filter"]`);
+        const filterButton = fixture.debugElement.nativeElement.querySelector(`[data-automation-id="${fakeGlobalFilter[0].key}_filter"]`);
         filterButton.click();
     });
 

diff --git a/...ess-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.html b/...ess-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.html
@@ -3,11 +3,11 @@
         <button (click)="selectFilterAndEmit(filter)"
           [attr.aria-label]="filter.name | translate"
           [id]="filter.id"
-          [attr.data-automation-id]="filter.name + '_filter'"
+          [attr.data-automation-id]="filter.key + '_filter'"
           mat-button
-          class="adf-action-button adf-full-width" fxLayout="row" fxLayoutAlign="space-between center">
-          <adf-icon *ngIf="showIcons" [value]="filter.icon"></adf-icon>
-          <span class="adf-action-button__label">{{ filter.name | translate }}</span>
+          class="adf-filter-action-button adf-full-width" fxLayout="row" fxLayoutAlign="space-between center">
+          <adf-icon data-automation-id="adf-filter-icon" *ngIf="showIcons" [value]="filter.icon"></adf-icon>
+          <span data-automation-id="adf-filter-label" class="adf-filter-action-button__label">{{ filter.name | translate }}</span>
         </button>
     </div>
 </ng-container>

diff --git a/...ess-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.scss b/...ess-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.scss
@@ -16,7 +16,7 @@
                 width: 100%;
             }
 
-            .adf-action-button .adf-action-button__label {
+            .adf-filter-action-button .adf-filter-action-button__label {
                 padding-left: 20px;
                 margin: 0 8px !important;
             }

diff --git a/...-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.spec.ts b/...-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.spec.ts
@@ -262,7 +262,7 @@ describe('TaskFiltersCloudComponent', () => {
 
         fixture.detectChanges();
         spyOn(component, 'selectFilterAndEmit').and.stub();
-        const filterButton = fixture.debugElement.nativeElement.querySelector(`[data-automation-id="${fakeGlobalFilter[1].name}_filter"]`);
+        const filterButton = fixture.debugElement.nativeElement.querySelector(`[data-automation-id="${fakeGlobalFilter[1].key}_filter"]`);
 
         filterButton.click();
         expect(component.selectFilterAndEmit).toHaveBeenCalledWith(fakeGlobalFilter[1]);

diff --git a/lib/process-services/src/lib/process-list/components/process-filters.component.html b/lib/process-services/src/lib/process-list/components/process-filters.component.html
@@ -4,8 +4,8 @@
       [id]="filter.id"
       [attr.data-automation-id]="filter.name + '_filter'"
       mat-button
-      class="adf-action-button adf-full-width" fxLayout="row" fxLayoutAlign="space-between center">
-      <adf-icon *ngIf="showIcon" [value]="getFilterIcon(filter.icon)"></adf-icon>
-      <span class="adf-action-button__label">{{ filter.name | translate }}</span>
+      class="adf-filter-action-button adf-full-width" fxLayout="row" fxLayoutAlign="space-between center">
+      <adf-icon data-automation-id="adf-filter-icon" *ngIf="showIcon" [value]="getFilterIcon(filter.icon)"></adf-icon>
+      <span data-automation-id="adf-filter-label" class="adf-filter-action-button__label">{{ filter.name | translate }}</span>
     </button>
 </div>
diff --git a/lib/process-services/src/lib/process-list/components/process-filters.component.scss b/lib/process-services/src/lib/process-list/components/process-filters.component.scss
@@ -16,7 +16,7 @@
                 width: 100%;
             }
 
-            .adf-action-button .adf-action-button__label {
+            .adf-filter-action-button .adf-filter-action-button__label {
                 padding-left: 20px;
                 margin: 0 8px !important;
             }

diff --git a/lib/process-services/src/lib/task-list/components/task-filters.component.html b/lib/process-services/src/lib/task-list/components/task-filters.component.html
@@ -4,10 +4,10 @@
       [id]="filter.id"
       [attr.data-automation-id]="filter.name + '_filter'"
       mat-button
-      class="adf-action-button adf-full-width" fxLayout="row" fxLayoutAlign="space-between center">
+      class="adf-filter-action-button adf-full-width" fxLayout="row" fxLayoutAlign="space-between center">
       <ng-container *ngIf="showIcon">
-        <adf-icon [value]="getFilterIcon(filter.icon)"></adf-icon>
+        <adf-icon data-automation-id="adf-filter-icon" [value]="getFilterIcon(filter.icon)"></adf-icon>
       </ng-container>
-      <span class="adf-action-button__label">{{ filter.name | translate }}</span>
+      <span data-automation-id="adf-filter-label" class="adf-filter-action-button__label">{{ filter.name | translate }}</span>
     </button>
 </div>
diff --git a/lib/process-services/src/lib/task-list/components/task-filters.component.scss b/lib/process-services/src/lib/task-list/components/task-filters.component.scss
@@ -16,7 +16,7 @@
                 width: 100%;
             }
 
-            .adf-action-button .adf-action-button__label {
+            .adf-filter-action-button .adf-filter-action-button__label {
                 padding-left: 20px;
                 margin: 0 8px !important;
             }

diff --git a/lib/testing/src/lib/process-services-cloud/pages/process-filters-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/process-filters-cloud-component.page.ts
@@ -26,7 +26,7 @@ export class ProcessFiltersCloudComponentPage {
 
     processFilters: ElementFinder = element(by.css("mat-expansion-panel[data-automation-id='Process Filters']"));
 
-    activeFilter: ElementFinder = element(by.css('.adf-active'));
+    activeFilter: ElementFinder = element(by.css('.adf-active [data-automation-id="adf-filter-label"]'));
     processFiltersList: ElementFinder = element(by.css('adf-cloud-process-filters'));
 
     async checkProcessFilterIsDisplayed(filterName: string): Promise<void> {

diff --git a/lib/testing/src/lib/process-services-cloud/pages/task-filters-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/task-filters-cloud-component.page.ts
@@ -23,7 +23,7 @@ export class TaskFiltersCloudComponentPage {
 
     filter: ElementFinder;
     taskFilters: ElementFinder = element(by.css(`mat-expansion-panel[data-automation-id='Task Filters']`));
-    activeFilter: ElementFinder = element(by.css('.adf-active'));
+    activeFilter: ElementFinder = element(by.css('.adf-active [data-automation-id="adf-filter-label"]'));
 
     async checkTaskFilterIsDisplayed(filterName: string): Promise<void> {
         this.filter = this.getTaskFilterLocatorByFilterName(filterName);

diff --git a/lib/testing/src/lib/process-services/pages/filters.page.ts b/lib/testing/src/lib/process-services/pages/filters.page.ts
@@ -23,7 +23,7 @@ export class FiltersPage {
 
     accordionMenu: ElementFinder = element(by.css('.app-processes-menu mat-accordion'));
     buttonWindow: ElementFinder = element(by.css('div > button[data-automation-id="btn-start-process"] > div'));
-    processIcon: ElementFinder =  element(by.css('.adf-icon'));
+    processIcon: ElementFinder =  element(by.css('adf-icon[data-automation-id="adf-filter-icon"]'));
 
     async clickFilterButton(filterElement: ElementFinder): Promise<void> {
         await BrowserActions.click(filterElement);