resolve conflicts

ls1intum · Jan 14, 2025 · 34400e9 · 34400e9
1 parent a2131b9
commit 34400e9
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...rse-conversations/dialogs/channels-create-dialog/channels-create-dialog.component.spec.ts b/...rse-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();