Skip to content
Snippets Groups Projects
Commit e70c5122 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-6255: use ozgcloud-svgicon only

parent 556624d6
No related branches found
No related tags found
No related merge requests found
...@@ -71,8 +71,6 @@ export class VorgangViewE2EComponent { ...@@ -71,8 +71,6 @@ export class VorgangViewE2EComponent {
private readonly count: string = 'views-menu-item-count-'; private readonly count: string = 'views-menu-item-count-';
private readonly root: string = 'views-menu-item-'; private readonly root: string = 'views-menu-item-';
private readonly button: string = 'routing-button'; private readonly button: string = 'routing-button';
private readonly iconTag: string = 'ozgcloud-icon';
private readonly svgIconTag: string = 'ozgcloud-svgicon';
private rootId: string; private rootId: string;
...@@ -91,12 +89,4 @@ export class VorgangViewE2EComponent { ...@@ -91,12 +89,4 @@ export class VorgangViewE2EComponent {
public getButton() { public getButton() {
return this.getRoot().findTestElementWithClass(this.button); return this.getRoot().findTestElementWithClass(this.button);
} }
public getIcon() {
return this.getRoot().findElement(this.iconTag);
}
public getSvgIcon() {
return this.getRoot().findElement(this.svgIconTag);
}
} }
...@@ -49,7 +49,6 @@ import { ...@@ -49,7 +49,6 @@ import {
exist, exist,
notContainClass, notContainClass,
notExist, notExist,
shouldHaveAttribute,
} from '../../../support/cypress.util'; } from '../../../support/cypress.util';
import { loginAsSabine } from '../../../support/user-util'; import { loginAsSabine } from '../../../support/user-util';
import { createVorgang, initVorgang, objectIds } from '../../../support/vorgang-util'; import { createVorgang, initVorgang, objectIds } from '../../../support/vorgang-util';
...@@ -321,11 +320,7 @@ describe('Wiedervorlage erledigen/wiedereroeffnen', () => { ...@@ -321,11 +320,7 @@ describe('Wiedervorlage erledigen/wiedereroeffnen', () => {
}); });
it('should show red icon', () => { it('should show red icon', () => {
wait(2000, 'Flaky - wahrscheinlich wegen asynchroner Verarbeitung im BE'); exist(wiedervorlagenView.getRoot().findTestElementWithClass(locatorIconIsOverdue));
const svgIcon = wiedervorlagenView.getSvgIcon();
shouldHaveAttribute(svgIcon, 'data-test-class', locatorIconIsOverdue);
}); });
it('Open Vorgang-Detail-Page', () => { it('Open Vorgang-Detail-Page', () => {
...@@ -350,11 +345,7 @@ describe('Wiedervorlage erledigen/wiedereroeffnen', () => { ...@@ -350,11 +345,7 @@ describe('Wiedervorlage erledigen/wiedereroeffnen', () => {
}); });
it('should show default icon', () => { it('should show default icon', () => {
wait(2000, 'Flaky - wahrscheinlich wegen asynchroner Verarbeitung im BE'); exist(wiedervorlagenView.getRoot().findTestElementWithClass(locatorIconDefault));
const icon = wiedervorlagenView.getIcon();
shouldHaveAttribute(icon, 'data-test-class', locatorIconDefault);
}); });
}); });
}); });
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#5f6368"><path d="M480-120q-75 0-140.5-28.5t-114-77q-48.5-48.5-77-114T120-480q0-75 28.5-140.5t77-114q48.5-48.5 114-77T480-840q82 0 155.5 35T760-706v-94h80v240H600v-80h110q-41-56-101-88t-129-32q-117 0-198.5 81.5T200-480q0 117 81.5 198.5T480-200q105 0 183.5-68T756-440h82q-15 137-117.5 228.5T480-120Zm112-192L440-464v-216h80v184l128 128-56 56Z"/></svg>
\ No newline at end of file
...@@ -43,4 +43,5 @@ export enum Icons { ...@@ -43,4 +43,5 @@ export enum Icons {
VORGANG_VORPRUEFEN = 'vorgang_vorpruefen', VORGANG_VORPRUEFEN = 'vorgang_vorpruefen',
XDOMEA = 'xdomea_file', XDOMEA = 'xdomea_file',
PASTE_FROM_CLIPBOARD = 'paste_from_clipboard', PASTE_FROM_CLIPBOARD = 'paste_from_clipboard',
UPDATE = 'update',
} }
...@@ -6,6 +6,9 @@ ...@@ -6,6 +6,9 @@
></ozgcloud-svgicon> ></ozgcloud-svgicon>
</ng-container> </ng-container>
<ng-template #defaultFrist> <ng-template #defaultFrist>
<ozgcloud-icon icon="update" data-test-class="wiedervorlage-icon-default"></ozgcloud-icon> <ozgcloud-svgicon
svgIcon="update"
data-test-class="wiedervorlage-icon-default"
></ozgcloud-svgicon>
</ng-template> </ng-template>
</div> </div>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment