[DSC-648] Fix test

Author: atarix83

src/app/core/browse/search.manager.spec.ts

@@ -6,7 +6,7 @@ import { createPaginatedList } from '../../shared/testing/utils.test';
 import { SearchManager } from './search-manager';
 import { toRemoteData } from '../../browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec';
 import { Item } from '../shared/item.model';
-import { FindListOptions } from '../data/request.models';
+import { FindListOptions } from '../data/find-list-options.model';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { of } from 'rxjs';
 import { MetadataValue } from '../shared/metadata.models';

src/app/core/openaire/broker/topics/openaire-broker-topic-rest.service.spec.ts

@@ -6,7 +6,7 @@ import { cold, getTestScheduler } from 'jasmine-marbles';
 
 import { RequestService } from '../../../data/request.service';
 import { buildPaginatedList } from '../../../data/paginated-list.model';
-import { RequestEntry } from '../../../data/request.reducer';
+import { RequestEntry } from '../../../data/request-entry.model';
 import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../cache/object-cache.service';
 import { RestResponse } from '../../../cache/response.models';

src/app/core/openaire/reciter-suggestions/openaire-suggestions-data.service.spec.ts

@@ -6,7 +6,7 @@ import { cold, getTestScheduler } from 'jasmine-marbles';
 
 import { RequestService } from '../../data/request.service';
 import { buildPaginatedList } from '../../data/paginated-list.model';
-import { RequestEntry } from '../../data/request.reducer';
+import { RequestEntry } from '../../data/request-entry.model';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { RestResponse } from '../../cache/response.models';

src/app/item-page/edit-item-page/item-status/item-status.component.spec.ts

@@ -13,7 +13,6 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { of as observableOf } from 'rxjs';
 import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { ResearcherProfileService } from '../../../core/profile/researcher-profile.service';
 import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
 
 describe('ItemStatusComponent', () => {
@@ -58,7 +57,7 @@ describe('ItemStatusComponent', () => {
         { provide: ActivatedRoute, useValue: routeStub },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
         { provide: AuthorizationDataService, useValue: authorizationService },
-        { provide: ResearcherProfileService, useValue: orcidAuthService },
+        { provide: OrcidAuthService, useValue: orcidAuthService },
       ], schemas: [CUSTOM_ELEMENTS_SCHEMA]
     }).compileComponents();
   }));

src/app/menu.resolver.spec.ts

@@ -14,17 +14,17 @@ import { ScriptDataService } from './core/data/processes/script-data.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { MenuServiceStub } from './shared/testing/menu-service.stub';
 import { MenuID } from './shared/menu/menu-id.model';
-import { BrowseService } from './core/browse/browse.service';
 import { cold } from 'jasmine-marbles';
-import createSpy = jasmine.createSpy;
 import { createSuccessfulRemoteDataObject$ } from './shared/remote-data.utils';
 import { createPaginatedList } from './shared/testing/utils.test';
+import { SectionDataService } from './core/layout/section-data.service';
+import createSpy = jasmine.createSpy;
 
 const BOOLEAN = { t: true, f: false };
 const MENU_STATE = {
   id: 'some menu'
 };
-const BROWSE_DEFINITIONS = [
+const EXPLORE_SECTIONS_DEFINITIONS = [
   { id: 'definition1' },
   { id: 'definition2' },
   { id: 'definition3' },
@@ -34,16 +34,16 @@ describe('MenuResolver', () => {
   let resolver: MenuResolver;
 
   let menuService;
-  let browseService;
+  let sectionsService;
   let authorizationService;
   let scriptService;
 
   beforeEach(waitForAsync(() => {
     menuService = new MenuServiceStub();
     spyOn(menuService, 'getMenu').and.returnValue(observableOf(MENU_STATE));
 
-    browseService = jasmine.createSpyObj('browseService', {
-      getBrowseDefinitions: createSuccessfulRemoteDataObject$(createPaginatedList(BROWSE_DEFINITIONS))
+    sectionsService = jasmine.createSpyObj('SectionDataService', {
+      findVisibleSections: createSuccessfulRemoteDataObject$(createPaginatedList(EXPLORE_SECTIONS_DEFINITIONS))
     });
     authorizationService = jasmine.createSpyObj('authorizationService', {
       isAuthorized: observableOf(true)
@@ -57,7 +57,7 @@ describe('MenuResolver', () => {
       declarations: [AdminSidebarComponent],
       providers: [
         { provide: MenuService, useValue: menuService },
-        { provide: BrowseService, useValue: browseService },
+        { provide: SectionDataService, useValue: sectionsService },
         { provide: AuthorizationDataService, useValue: authorizationService },
         { provide: ScriptDataService, useValue: scriptService },
         {
@@ -123,19 +123,15 @@ describe('MenuResolver', () => {
         }));
       });
 
-      it('should include browse dropdown', () => {
+      it('should include explore sections', () => {
         expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, jasmine.objectContaining({
-          id: 'browse_global_by_definition1', parentID: 'browse_global', visible: true,
+          id: 'explore_definition1', visible: true,
         }));
         expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, jasmine.objectContaining({
-          id: 'browse_global_by_definition2', parentID: 'browse_global', visible: true,
+          id: 'explore_definition2', visible: true,
         }));
         expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, jasmine.objectContaining({
-          id: 'browse_global_by_definition3', parentID: 'browse_global', visible: true,
-        }));
-
-        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, jasmine.objectContaining({
-          id: 'browse_global', visible: true,
+          id: 'explore_definition3', visible: true,
         }));
       });
     });

src/app/openaire/broker/events/openaire-broker-events.component.spec.ts

@@ -5,7 +5,9 @@ import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/t
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { of as observableOf } from 'rxjs';
-import { OpenaireBrokerEventRestService } from '../../../core/openaire/broker/events/openaire-broker-event-rest.service';
+import {
+  OpenaireBrokerEventRestService
+} from '../../../core/openaire/broker/events/openaire-broker-event-rest.service';
 import { OpenaireBrokerEventsComponent } from './openaire-broker-events.component';
 import {
   getMockOpenaireBrokerEventRestService,
@@ -34,7 +36,7 @@ import {
   createSuccessfulRemoteDataObject,
   createSuccessfulRemoteDataObject$
 } from '../../../shared/remote-data.utils';
-import { FindListOptions } from '../../../core/data/request.models';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';

src/app/openaire/broker/topics/openaire-broker-topics.service.spec.ts

@@ -2,9 +2,11 @@ import { TestBed } from '@angular/core/testing';
 import { of as observableOf } from 'rxjs';
 import { OpenaireBrokerTopicsService } from './openaire-broker-topics.service';
 import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
-import { OpenaireBrokerTopicRestService } from '../../../core/openaire/broker/topics/openaire-broker-topic-rest.service';
+import {
+  OpenaireBrokerTopicRestService
+} from '../../../core/openaire/broker/topics/openaire-broker-topic-rest.service';
 import { PageInfo } from '../../../core/shared/page-info.model';
-import { FindListOptions } from '../../../core/data/request.models';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
 import {
   getMockOpenaireBrokerTopicRestService,
   openaireBrokerTopicObjectMoreAbstract,

src/app/shared/form/builder/form-builder.service.spec.ts

@@ -31,7 +31,9 @@ import {
 import { DynamicTagModel } from './ds-dynamic-form-ui/models/tag/dynamic-tag.model';
 import { DynamicListCheckboxGroupModel } from './ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model';
 import { DynamicQualdropModel } from './ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
-import { DynamicScrollableDropdownModel } from './ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
+import {
+  DynamicScrollableDropdownModel
+} from './ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
 import { DynamicRelationGroupModel } from './ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
 import { DynamicLookupModel } from './ds-dynamic-form-ui/models/lookup/dynamic-lookup.model';
 import { DynamicDsDatePickerModel } from './ds-dynamic-form-ui/models/date-picker/date-picker.model';
@@ -48,9 +50,9 @@ import { DynamicConcatModel } from './ds-dynamic-form-ui/models/ds-dynamic-conca
 import { DynamicLookupNameModel } from './ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model';
 import { DynamicRowArrayModel } from './ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
 import { FormRowModel } from '../../../core/config/models/config-submission-form.model';
-import {ConfigurationDataService} from '../../../core/data/configuration-data.service';
-import {createSuccessfulRemoteDataObject$} from '../../remote-data.utils';
-import {ConfigurationProperty} from '../../../core/shared/configuration-property.model';
+import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
+import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
 
 describe('FormBuilderService test suite', () => {
 
@@ -315,7 +317,6 @@ describe('FormBuilderService test suite', () => {
           relationshipConfig: undefined,
           submissionId: '1234',
           isDraggable: true,
-          showButtons: false,
           groupFactory: () => {
             return [
               new DynamicInputModel({ id: 'testFormRowArrayGroupInput' })

src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts

@@ -148,7 +148,7 @@ describe('SearchHierarchyFilterComponent', () => {
     comp.onSubmit(searchQuery);
 
     expect(router.navigate).toHaveBeenCalledWith(['', 'search'], Object({
-      queryParams: Object({ [mockFilterConfig.paramName]: [...values.map((value: FacetValue) => `${value.value},equals`), `${searchQuery}`] }),
+      queryParams: Object({ [mockFilterConfig.paramName]: [...values.map((value: FacetValue) => `${value.value},equals`), `${searchQuery},query`] }),
       queryParamsHandling: 'merge'
     }));
   });

src/app/submission/sections/form/section-form-operations.service.spec.ts

@@ -29,7 +29,9 @@ import {
 } from '../../../shared/mocks/form-models.mock';
 import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
 import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { DynamicRowArrayModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
+import {
+  DynamicRowArrayModel
+} from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
 
 describe('SectionFormOperationsService test suite', () => {
   let formBuilderService: any;
@@ -806,7 +808,6 @@ describe('SectionFormOperationsService test suite', () => {
           relationshipConfig: undefined,
           submissionId: '1234',
           isDraggable: true,
-          showButtons: false,
           groupFactory: () => {
             return [
               new DynamicInputModel({ id: 'testFormRowArrayGroupInput' })