Merge remote-tracking branch 'origin/main' into CST-4981-statistics-are-always-accessible-even-if-are-restricted-to-administrator

# Conflicts:
#	src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.ts
#	src/app/navbar/navbar.component.spec.ts
#	src/app/navbar/navbar.component.ts
#	src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
This commit is contained in:
Giuseppe Digilio
2021-12-24 12:25:03 +01:00
70 changed files with 2260 additions and 1526 deletions

View File

@@ -13,9 +13,12 @@ import { MenuService } from '../shared/menu/menu.service';
import { MenuServiceStub } from '../shared/testing/menu-service.stub';
import { ActivatedRoute } from '@angular/router';
import { RouterTestingModule } from '@angular/router/testing';
import { BrowseService } from '../core/browse/browse.service';
import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
import { buildPaginatedList } from '../core/data/paginated-list.model';
import { BrowseDefinition } from '../core/shared/browse-definition.model';
import { BrowseByDataType } from '../browse-by/browse-by-switcher/browse-by-decorator';
import { Item } from '../core/shared/item.model';
import { createSuccessfulRemoteDataObject } from '../shared/remote-data.utils';
import { By } from '@angular/platform-browser';
import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
let comp: NavbarComponent;
@@ -48,9 +51,37 @@ const routeStub = {
describe('NavbarComponent', () => {
const menuService = new MenuServiceStub();
let browseDefinitions;
// waitForAsync beforeEach
beforeEach(waitForAsync(() => {
browseDefinitions = [
Object.assign(
new BrowseDefinition(), {
id: 'title',
dataType: BrowseByDataType.Title,
}
),
Object.assign(
new BrowseDefinition(), {
id: 'dateissued',
dataType: BrowseByDataType.Date,
metadataKeys: ['dc.date.issued']
}
),
Object.assign(
new BrowseDefinition(), {
id: 'author',
dataType: BrowseByDataType.Metadata,
}
),
Object.assign(
new BrowseDefinition(), {
id: 'subject',
dataType: BrowseByDataType.Metadata,
}
),
];
TestBed.configureTestingModule({
imports: [
TranslateModule.forRoot(),
@@ -62,8 +93,9 @@ describe('NavbarComponent', () => {
Injector,
{ provide: MenuService, useValue: menuService },
{ provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
{ provide: AuthorizationDataService, useValue: authorizationService },
{ provide: ActivatedRoute, useValue: routeStub },
{ provide: BrowseService, useValue: { getBrowseDefinitions: createSuccessfulRemoteDataObject$(buildPaginatedList(undefined, browseDefinitions)) } },
{ provide: AuthorizationDataService, useValue: authorizationService },
],
schemas: [NO_ERRORS_SCHEMA]
})