Rebase went little bit wrong -II

This commit is contained in:
Vito Albano
2023-12-07 00:47:27 +00:00
parent bcf016fe8b
commit 162ddf34ce
6 changed files with 8 additions and 45 deletions

View File

@@ -6,13 +6,8 @@
padding-top: 0 !important;
width: 100%;
}
<<<<<<< Updated upstream
/* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */
.mat-select-value-text {
=======
.mat-mdc-select-value-text {
>>>>>>> Stashed changes
font-size: var(--theme-body-1-font-size);
}

View File

@@ -339,16 +339,11 @@ describe('StartProcessComponent', () => {
selectElement.click();
fixture.detectChanges();
<<<<<<< Updated upstream
fixture.componentInstance.inputAutocomplete.openPanel();
fixture.detectChanges();
// await fixture.whenStable();
const options: any = fixture.debugElement.queryAll(By.css('.mdc-list-item__primary-textk'));
=======
await fixture.whenStable();
const options: any = fixture.debugElement.queryAll(By.css('.mdc-list-item__primary-text'));
>>>>>>> Stashed changes
const options: any = fixture.debugElement.queryAll(By.css('.mdc-list-item__primary-textk'));
expect(options.length).toBe(2);
expect(options[0].nativeElement.innerText).toBe('My Process 1');