diff --git a/src/app/teacher/create-run-dialog/create-run-dialog.component.spec.ts b/src/app/teacher/create-run-dialog/create-run-dialog.component.spec.ts index 6b8f450812a..1a04d0b61d9 100644 --- a/src/app/teacher/create-run-dialog/create-run-dialog.component.spec.ts +++ b/src/app/teacher/create-run-dialog/create-run-dialog.component.spec.ts @@ -3,14 +3,10 @@ import { TeacherService } from '../teacher.service'; import { CreateRunDialogComponent } from './create-run-dialog.component'; import { MatDialogRef, MatDialog } from '@angular/material/dialog'; import { MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { MatCheckboxModule } from '@angular/material/checkbox'; -import { MatRadioModule } from '@angular/material/radio'; -import { ReactiveFormsModule } from '@angular/forms'; import { Observable } from 'rxjs'; import { of } from 'rxjs'; import { Project } from '../../domain/project'; import { Run } from '../../domain/run'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; import { By } from '@angular/platform-browser'; import { Course } from '../../domain/course'; import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; @@ -40,7 +36,7 @@ export class MockTeacherService { const courses: Course[] = []; const course = new Course({ id: '1', name: 'Test' }); courses.push(course); - return Observable.create((observer) => { + return new Observable((observer) => { observer.next(courses); observer.complete(); }); @@ -106,24 +102,22 @@ describe('CreateRunDialogComponent', () => { { provide: MatDialogRef, useValue: { - afterClosed: () => { - return Observable.create((observer) => { + afterClosed: () => + new Observable((observer) => { observer.next({}); observer.complete(); - }); - }, + }), close: () => {} } }, { provide: MAT_DIALOG_DATA, useValue: { project: project } }, { provide: Router, useClass: MockRouter } - ], - schemas: [NO_ERRORS_SCHEMA] + ] }); fixture = TestBed.createComponent(CreateRunDialogComponent); component = fixture.componentInstance; component.project = project; - component.dialog = TestBed.get(MatDialog); + component.dialog = TestBed.inject(MatDialog); spyOn(component.dialog, 'closeAll').and.callThrough(); fixture.detectChanges(); }); diff --git a/src/app/teacher/create-run-dialog/create-run-dialog.component.ts b/src/app/teacher/create-run-dialog/create-run-dialog.component.ts index c319c9c31d7..beaa061d1e1 100644 --- a/src/app/teacher/create-run-dialog/create-run-dialog.component.ts +++ b/src/app/teacher/create-run-dialog/create-run-dialog.component.ts @@ -23,7 +23,6 @@ import { provideNativeDateAdapter } from '@angular/material/core'; import { MatIconModule } from '@angular/material/icon'; import { MatTooltipModule } from '@angular/material/tooltip'; import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatCardModule } from '@angular/material/card'; import { Router } from '@angular/router'; import { finalize } from 'rxjs/operators'; @@ -35,6 +34,7 @@ import { ListClassroomCoursesDialogComponent } from '../list-classroom-courses-d import { TeacherRun } from '../teacher-run'; import { MatDividerModule } from '@angular/material/divider'; import { MatRadioModule } from '@angular/material/radio'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; @Component({ imports: [ @@ -51,7 +51,7 @@ import { MatRadioModule } from '@angular/material/radio'; MatRadioModule, MatTooltipModule, MatFormFieldModule, - MatProgressSpinnerModule, + MatProgressBarModule, MatCardModule ], providers: [provideNativeDateAdapter()],