Fixed conflicts
testing/ogGui-multibranch/pipeline/head This commit looks good Details

develop
Manuel Aranda Rosales 2025-06-26 16:05:23 +02:00
parent f528404725
commit 3a52ebee39
2 changed files with 11 additions and 5 deletions

View File

@ -15,10 +15,12 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { TranslateModule } from '@ngx-translate/core';
import { ToastrModule, ToastrService } from 'ngx-toastr';
import { ActivatedRoute, provideRouter } from '@angular/router';
import { NO_ERRORS_SCHEMA } from '@angular/core';
import { MatSelectModule } from '@angular/material/select';
import { MatExpansionModule } from "@angular/material/expansion";
import { MatIconModule } from "@angular/material/icon";
import { MatTooltipModule } from "@angular/material/tooltip";
import { LoadingComponent } from "../../../../../shared/loading/loading.component";
import { ScrollToTopComponent } from "../../../../../shared/scroll-to-top/scroll-to-top.component";
import { ConfigService } from '@services/config.service';
describe('DeployImageComponent', () => {
@ -32,7 +34,7 @@ describe('DeployImageComponent', () => {
};
await TestBed.configureTestingModule({
declarations: [DeployImageComponent, LoadingComponent],
declarations: [DeployImageComponent, LoadingComponent, ScrollToTopComponent],
imports: [
ReactiveFormsModule,
FormsModule,
@ -46,6 +48,8 @@ describe('DeployImageComponent', () => {
MatDividerModule,
MatRadioModule,
MatSelectModule,
MatIconModule,
MatTooltipModule,
BrowserAnimationsModule,
ToastrModule.forRoot(),
TranslateModule.forRoot()
@ -73,8 +77,7 @@ describe('DeployImageComponent', () => {
}
},
{ provide: ConfigService, useValue: mockConfigService }
],
schemas: [NO_ERRORS_SCHEMA]
]
})
.compileComponents();

View File

@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { RunScriptAssistantComponent } from './run-script-assistant.component';
import { DeployImageComponent } from "../deploy-image/deploy-image.component";
import { LoadingComponent } from "../../../../../shared/loading/loading.component";
import { ScrollToTopComponent } from "../../../../../shared/scroll-to-top/scroll-to-top.component";
import { FormBuilder, FormsModule, ReactiveFormsModule } from "@angular/forms";
import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from "@angular/material/dialog";
import { MatFormFieldModule } from "@angular/material/form-field";
@ -29,6 +30,7 @@ import {MatIconModule} from "@angular/material/icon";
import {MatCardModule} from "@angular/material/card";
import {MatButtonToggleModule} from "@angular/material/button-toggle";
import { MatChipsModule } from "@angular/material/chips";
import { MatTooltipModule } from "@angular/material/tooltip";
export function HttpLoaderFactory(http: HttpClient) {
return new TranslateHttpLoader(http);
@ -45,7 +47,7 @@ describe('RunScriptAssistantComponent', () => {
};
await TestBed.configureTestingModule({
declarations: [RunScriptAssistantComponent, DeployImageComponent, LoadingComponent],
declarations: [RunScriptAssistantComponent, DeployImageComponent, LoadingComponent, ScrollToTopComponent],
imports: [
ReactiveFormsModule,
FormsModule,
@ -65,6 +67,7 @@ describe('RunScriptAssistantComponent', () => {
MatCardModule,
MatButtonToggleModule,
MatChipsModule,
MatTooltipModule,
ToastrModule.forRoot(),
HttpClientTestingModule,
TranslateModule.forRoot({