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

Merge branch 'master' of git.ozg-sh.de:mgm/goofy

parents c9278775 64352de2
No related branches found
No related tags found
No related merge requests found
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
placeholder="Passwort für die Verschlüsselung"> placeholder="Passwort für die Verschlüsselung">
</goofy-client-text-editor> </goofy-client-text-editor>
<goofy-client-button-with-spinner data-test-id="forward-button" <goofy-client-button-with-spinner dataTestId="forward-button"
toolTip="Vorgang weiterleiten" toolTip="Vorgang weiterleiten"
icon="forward" icon="forward"
type="submit" type="submit"
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
class="create-button" class="create-button"
text="Kommentar" text="Kommentar"
icon="add" icon="add"
data-test-id="create-kommentar"> dataTestId="create-kommentar">
</goofy-client-button-with-spinner> </goofy-client-button-with-spinner>
</ng-container> </ng-container>
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
[disabled]="isDisabled" [disabled]="isDisabled"
[matTooltip]="toolTip" [matTooltip]="toolTip"
(click)="clickEmitter.emit($event)" (click)="clickEmitter.emit($event)"
[attr.data-test-id]="dataTestId"
data-test-class="icon-button"> data-test-class="icon-button">
<mat-icon <mat-icon
......
...@@ -16,6 +16,7 @@ export class ButtonWithSpinnerComponent { ...@@ -16,6 +16,7 @@ export class ButtonWithSpinnerComponent {
@Input() color: string = 'primary'; @Input() color: string = 'primary';
@Input() type: 'button' | 'submit' = 'button'; @Input() type: 'button' | 'submit' = 'button';
@Input() toolTip: string = ''; @Input() toolTip: string = '';
@Input() dataTestId: string;
@Output() public clickEmitter: EventEmitter<MouseEvent> = new EventEmitter<MouseEvent>(); @Output() public clickEmitter: EventEmitter<MouseEvent> = new EventEmitter<MouseEvent>();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment