hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-13 13:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing tests

Browse Source
This commit is contained in:
Art Lowel
2020-02-17 17:45:02 +01:00
parent 4d3f85fafe
commit 39f1766391
11 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/core/cache/object-cache.service.spec.ts vendored
View File

@@ -54,9 +54,10 @@ describe('ObjectCacheService', () => {
beforeEach(() => {
init();
store = new Store<CoreState>(undefined, undefined, undefined);
linkServiceStub = jasmine.createSpyObj({
removeResolvedLinks: {}
});
linkServiceStub = {
removeResolvedLinks: (a) => a
};
spyOn(linkServiceStub, 'removeResolvedLinks').and.callThrough();
spyOn(store, 'dispatch');
service = new ObjectCacheService(store, linkServiceStub);

3
src/app/core/config/models/config-submission-definition.model.ts
View File

@@ -1,4 +1,4 @@
import { autoserialize, deserialize } from 'cerialize';
import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
import { typedObject } from '../../cache/builders/build-decorators';
import { PaginatedList } from '../../data/paginated-list';
import { HALLink } from '../../shared/hal-link.model';
@@ -10,6 +10,7 @@ import { ConfigObject } from './config.model';
* Class for the configuration describing the submission
*/
@typedObject
@inheritSerialization(ConfigObject)
export class SubmissionDefinitionModel extends ConfigObject {
static type = new ResourceType('submissiondefinition');

3
src/app/core/config/models/config-submission-section.model.ts
View File

@@ -1,4 +1,4 @@
import { autoserialize, deserialize } from 'cerialize';
import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
import { SectionsType } from '../../../submission/sections/sections-type';
import { typedObject } from '../../cache/builders/build-decorators';
import { HALLink } from '../../shared/hal-link.model';
@@ -14,6 +14,7 @@ export interface SubmissionSectionVisibility {
}
@typedObject
@inheritSerialization(ConfigObject)
export class SubmissionSectionModel extends ConfigObject {
static type = new ResourceType('submissionsection');

3
src/app/core/config/models/config-submission-uploads.model.ts
View File

@@ -1,4 +1,4 @@
import { autoserialize } from 'cerialize';
import { autoserialize, inheritSerialization } from 'cerialize';
import { typedObject } from '../../cache/builders/build-decorators';
import { ConfigObject } from './config.model';
import { AccessConditionOption } from './config-access-condition-option.model';
@@ -6,6 +6,7 @@ import { SubmissionFormsModel } from './config-submission-forms.model';
import { ResourceType } from '../../shared/resource-type';
@typedObject
@inheritSerialization(ConfigObject)
export class SubmissionUploadsModel extends ConfigObject {
static type = new ResourceType('submissionupload');
/**

1
src/app/core/config/models/config.model.ts
View File

@@ -9,6 +9,7 @@ export abstract class ConfigObject implements CacheableObject {
/**
* The name for this configuration
*/
@autoserialize
public name: string;
/**

2
src/app/core/data/collection-data.service.spec.ts
View File

@@ -126,7 +126,7 @@ describe('CollectionDataService', () => {
notificationsService = new NotificationsServiceStub();
translate = getMockTranslateService();
service = new CollectionDataService(requestService, rdbService, null, null, null, objectCache, halService, notificationsService, null, null, translate);
service = new CollectionDataService(requestService, rdbService, null, null, objectCache, halService, notificationsService, null, null, translate);
}
});

2
src/app/core/data/external-source.service.spec.ts
View File

@@ -49,7 +49,7 @@ describe('ExternalSourceService', () => {
halService = jasmine.createSpyObj('halService', {
getEndpoint: observableOf('external-sources-REST-endpoint')
});
service = new ExternalSourceService(requestService, rdbService, undefined, undefined, undefined, halService, undefined, undefined, undefined);
service = new ExternalSourceService(requestService, rdbService, undefined, undefined, halService, undefined, undefined, undefined);
}
beforeEach(() => {

2
src/app/core/data/relationship-type.service.spec.ts
View File

@@ -11,7 +11,7 @@ import { PaginatedList } from './paginated-list';
import { RelationshipTypeService } from './relationship-type.service';
import { RequestService } from './request.service';
describe('RelationshipTypeService', () => {
fdescribe('RelationshipTypeService', () => {
let service: RelationshipTypeService;
let requestService: RequestService;
let restEndpointURL;

18
src/app/core/dspace-rest-v2/dspace.serializer.spec.ts
View File

@@ -80,9 +80,9 @@ describe('DSpaceSerializer', () => {
it('should turn a model in to a valid document', () => {
const serializer = new DSpaceSerializer(TestModel);
const doc = serializer.serialize(testModels[0]);
expect(testModels[0].id).toBe(doc.id);
expect(testModels[0].name).toBe(doc.name);
expect(testModels[0]._links).toBeUndefined();
expect(doc.id).toBe(testModels[0].id);
expect(doc.name).toBe(testModels[0].name);
expect(doc._links).toBeUndefined();
});
});
@@ -93,12 +93,12 @@ describe('DSpaceSerializer', () => {
const serializer = new DSpaceSerializer(TestModel);
const doc = serializer.serializeArray(testModels);
expect(testModels[0].id).toBe(doc[0].id);
expect(testModels[0].name).toBe(doc[0].name);
expect(testModels[0]._links).toBeUndefined();
expect(testModels[1].id).toBe(doc[1].id);
expect(testModels[1].name).toBe(doc[1].name);
expect(testModels[1]._links).toBeUndefined();
expect(doc[0].id).toBe(testModels[0].id);
expect(doc[0].name).toBe(testModels[0].name);
expect(doc[0]._links).toBeUndefined();
expect(doc[1].id).toBe(testModels[1].id);
expect(doc[1].name).toBe(testModels[1].name);
expect(doc[1]._links).toBeUndefined();
});
});

4
src/app/submission/sections/upload/section-upload.component.spec.ts
View File

@@ -197,7 +197,9 @@ describe('SubmissionSectionUploadComponent test suite', () => {
submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState));
collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(mockCollection));
collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new Collection(), mockCollection, {
defaultAccessConditions: createSuccessfulRemoteDataObject$(mockDefaultAccessCondition)
})));
resourcePolicyService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(mockDefaultAccessCondition));

10
src/app/submission/sections/upload/section-upload.component.ts
View File

@@ -96,7 +96,7 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent {
public configMetadataForm$: Observable<SubmissionFormsModel>;
/**
* List of available access conditions that could be setted to files
* List of available access conditions that could be set to files
*/
public availableAccessConditionOptions: AccessConditionOption[]; // List of accessConditions that an user can select
@@ -161,10 +161,14 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent {
filter((submissionObject: SubmissionObjectEntry) => isNotUndefined(submissionObject) && !submissionObject.isLoading),
filter((submissionObject: SubmissionObjectEntry) => isUndefined(this.collectionId) || this.collectionId !== submissionObject.collection),
tap((submissionObject: SubmissionObjectEntry) => this.collectionId = submissionObject.collection),
flatMap((submissionObject: SubmissionObjectEntry) => this.collectionDataService.findById(submissionObject.collection, followLink('defaultAccessConditions'))),
flatMap((submissionObject: SubmissionObjectEntry) => this.collectionDataService.findById(submissionObject.collection)),
filter((rd: RemoteData<Collection>) => isNotUndefined((rd.payload))),
tap((collectionRemoteData: RemoteData<Collection>) => this.collectionName = collectionRemoteData.payload.name),
map((collectionRemoteData: RemoteData<Collection>) => (collectionRemoteData.payload as any).defaultAccessConditions),
flatMap((collectionRemoteData: RemoteData<Collection>) => {
return this.resourcePolicyService.findByHref(
(collectionRemoteData.payload as any)._links.defaultAccessConditions.href
);
}),
filter((defaultAccessConditionsRemoteData: RemoteData<ResourcePolicy>) =>
defaultAccessConditionsRemoteData.hasSucceeded),
tap((defaultAccessConditionsRemoteData: RemoteData<ResourcePolicy>) => {