Fixed after rebase

Alfresco · May 23, 2024 · 9010db8 · 9010db8
1 parent 61235c2
commit 9010db8
Show file tree

Hide file tree

Showing 7 changed files with 119 additions and 107 deletions.
diff --git a/lib/core/feature-flags/src/lib/directives/features.directive.ts b/lib/core/feature-flags/src/lib/directives/features.directive.ts
@@ -58,7 +58,7 @@ export class FeaturesDirective implements OnDestroy {
     }
 
     ngOnDestroy() {
-        this.destroy$.next();
+        this.destroy$.next({});
         this.destroy$.complete();
     }
 }
diff --git a/lib/core/feature-flags/src/lib/directives/not-features.directive.ts b/lib/core/feature-flags/src/lib/directives/not-features.directive.ts
@@ -58,7 +58,7 @@ export class NotFeaturesDirective implements OnDestroy {
     }
 
     ngOnDestroy() {
-        this.destroy$.next();
+        this.destroy$.next({});
         this.destroy$.complete();
     }
 }
diff --git a/lib/core/src/lib/auth/guard/auth-guard-bpm.service.spec.ts b/lib/core/src/lib/auth/guard/auth-guard-bpm.service.spec.ts
@@ -23,10 +23,10 @@ import { RouterStateSnapshot, Router } from '@angular/router';
 import { MatDialog, MatDialogModule } from '@angular/material/dialog';
 import { TranslateModule } from '@ngx-translate/core';
 import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service';
-import { OidcAuthenticationService } from '../services/oidc-authentication.service';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { RedirectAuthService } from '../oidc/redirect-auth.service';
 import { EMPTY } from 'rxjs';
+import { OidcAuthenticationService } from '../oidc/oidc-authentication.service';
 
 describe('AuthGuardService BPM', () => {
     let authGuard: AuthGuardBpm;

diff --git a/lib/core/src/lib/auth/guard/auth-guard-ecm.service.spec.ts b/lib/core/src/lib/auth/guard/auth-guard-ecm.service.spec.ts
@@ -22,12 +22,12 @@ import { AuthenticationService } from '../services/authentication.service';
 import { RouterStateSnapshot, Router } from '@angular/router';
 import { MatDialog, MatDialogModule } from '@angular/material/dialog';
 import { TranslateModule } from '@ngx-translate/core';
-import { OidcAuthenticationService } from '../services/oidc-authentication.service';
 import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { RedirectAuthService } from '../oidc/redirect-auth.service';
 import { EMPTY } from 'rxjs';
+import { OidcAuthenticationService } from '../oidc/oidc-authentication.service';
 
 describe('AuthGuardService ECM', () => {
     let authGuard: AuthGuardEcm;

diff --git a/lib/core/src/lib/auth/services/authentication.service.spec.ts b/lib/core/src/lib/auth/services/authentication.service.spec.ts
@@ -21,7 +21,6 @@ import { CookieService } from '../../common/services/cookie.service';
 import { AppConfigService } from '../../app-config/app-config.service';
 import { TranslateModule } from '@ngx-translate/core';
 import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service';
-import { OidcAuthenticationService } from './oidc-authentication.service';
 import { AuthModule } from '../oidc/auth.module';
 import { HttpClientModule } from '@angular/common/http';
 import { CookieServiceMock } from '../../mock';
@@ -39,11 +38,7 @@ describe('AuthenticationService', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [
-                TranslateModule.forRoot(),
-                AuthModule.forRoot({ useHash: true }),
-                HttpClientModule
-            ],
+            imports: [TranslateModule.forRoot(), AuthModule.forRoot({ useHash: true }), HttpClientModule],
             providers: [
                 {
                     provide: CookieService,

diff --git a/lib/core/src/lib/form/components/widgets/multiline-text/multiline-text.widget.spec.ts b/lib/core/src/lib/form/components/widgets/multiline-text/multiline-text.widget.spec.ts
@@ -17,8 +17,17 @@
 
 import { HarnessLoader } from '@angular/cdk/testing';
 import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { MatInputHarness } from '@angular/material/input/testing';
 import { MatTooltipHarness } from '@angular/material/tooltip/testing';
+import { FormModel } from '../core/form.model';
+import { FormFieldModel } from '../core/form-field.model';
+import { FormFieldTypes } from '../core/form-field-types';
+import { MultilineTextWidgetComponentComponent } from './multiline-text.widget';
+import { ComponentFixture, getTestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { TranslationService } from '../../../../translation/translation.service';
+import { TranslationMock } from '../../../../mock/translation.service.mock';
 
 describe('MultilineTextWidgetComponentComponent', () => {
     let loader: HarnessLoader;
@@ -27,10 +36,11 @@ describe('MultilineTextWidgetComponentComponent', () => {
     let element: HTMLElement;
 
     beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [CoreTestingModule]
+        getTestBed().configureTestingModule({
+            imports: [TranslateModule.forRoot(), NoopAnimationsModule],
+            providers: [{ provide: TranslationService, useClass: TranslationMock }]
         });
-        fixture = TestBed.createComponent(MultilineTextWidgetComponentComponent);
+        fixture = getTestBed().createComponent(MultilineTextWidgetComponentComponent);
         widget = fixture.componentInstance;
         element = fixture.nativeElement;
         loader = TestbedHarnessEnvironment.loader(fixture);