From 34400e95bffefdbfc35cbe255e6b6234408fdcec Mon Sep 17 00:00:00 2001 From: Asli Aykan Date: Tue, 14 Jan 2025 03:14:57 +0100 Subject: [PATCH] resolve conflicts --- .../channels-create-dialog.component.spec.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/javascript/spec/component/overview/course-conversations/dialogs/channels-create-dialog/channels-create-dialog.component.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/dialogs/channels-create-dialog/channels-create-dialog.component.spec.ts index 03e88a3f59d2..6e51aadf2278 100644 --- a/src/test/javascript/spec/component/overview/course-conversations/dialogs/channels-create-dialog/channels-create-dialog.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-conversations/dialogs/channels-create-dialog/channels-create-dialog.component.spec.ts @@ -4,7 +4,7 @@ import { ChannelsCreateDialogComponent } from 'app/overview/course-conversations import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { MockPipe, MockProvider } from 'ng-mocks'; import { Course } from 'app/entities/course.model'; -import { ChannelFormData } from 'app/overview/course-conversations/dialogs/channels-create-dialog/channel-form/channel-form.component'; +import { ChannelFormComponent, ChannelFormData } from 'app/overview/course-conversations/dialogs/channels-create-dialog/channel-form/channel-form.component'; import { By } from '@angular/platform-browser'; import { ChannelDTO } from 'app/entities/metis/conversation/channel.model'; import { initializeDialog } from '../dialog-test-helpers'; @@ -77,7 +77,7 @@ describe('ChannelsCreateDialogComponent', () => { it('should change channel scope type when channel scope type is changed in channel form', () => { expect(component.isCourseWideChannel).toBeFalse(); - const form: ChannelFormStubComponent = fixture.debugElement.query(By.directive(ChannelFormStubComponent)).componentInstance; + const form: ChannelFormComponent = fixture.debugElement.query(By.directive(ChannelFormComponent)).componentInstance; form.isCourseWideChannelChanged.emit(true); expect(component.isCourseWideChannel).toBeTrue(); }); @@ -117,7 +117,7 @@ describe('ChannelsCreateDialogComponent', () => { isCourseWideChannel: false, }; - const form: ChannelFormStubComponent = fixture.debugElement.query(By.directive(ChannelFormStubComponent)).componentInstance; + const form: ChannelFormComponent = fixture.debugElement.query(By.directive(ChannelFormComponent)).componentInstance; form.formSubmitted.emit(formData); expect(createChannelSpy).toHaveBeenCalledOnce();