Skip to content

Commit

Permalink
78406: Test fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Atmire-Kristof
Atmire-Kristof committed Apr 13, 2021
1 parent 262cbb4 commit 226c31c
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 12 deletions.
18 changes: 12 additions & 6 deletions src/app/submission/edit/submission-edit.component.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,24 @@ import { RouterStub } from '../../shared/testing/router.stub';
import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
import { mockSubmissionObject } from '../../shared/mocks/submission.mock';
import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
import { ItemDataService } from '../../core/data/item-data.service';

describe('SubmissionEditComponent Component', () => {

let comp: SubmissionEditComponent;
let fixture: ComponentFixture<SubmissionEditComponent>;
let submissionServiceStub: SubmissionServiceStub;
let itemDataService: ItemDataService;
let router: RouterStub;

const submissionId = '826';
const route: ActivatedRouteStub = new ActivatedRouteStub();
const submissionObject: any = mockSubmissionObject;

beforeEach(waitForAsync(() => {
itemDataService = jasmine.createSpyObj('itemDataService', {
findByHref: createSuccessfulRemoteDataObject$(submissionObject.item),
});
TestBed.configureTestingModule({
imports: [
TranslateModule.forRoot(),
Expand All @@ -41,6 +46,7 @@ describe('SubmissionEditComponent Component', () => {
providers: [
{ provide: NotificationsService, useClass: NotificationsServiceStub },
{ provide: SubmissionService, useClass: SubmissionServiceStub },
{ provide: ItemDataService, useValue: itemDataService },
{ provide: TranslateService, useValue: getMockTranslateService() },
{ provide: Router, useValue: new RouterStub() },
{ provide: ActivatedRoute, useValue: route },
Expand All @@ -63,7 +69,7 @@ describe('SubmissionEditComponent Component', () => {
router = null;
});

it('should init properly when a valid SubmissionObject has been retrieved', fakeAsync(() => {
it('should init properly when a valid SubmissionObject has been retrieved',() => {

route.testParams = { id: submissionId };
submissionServiceStub.retrieveSubmission.and.returnValue(
Expand All @@ -78,9 +84,9 @@ describe('SubmissionEditComponent Component', () => {
expect(comp.sections).toBe(submissionObject.sections);
expect(comp.submissionDefinition).toBe(submissionObject.submissionDefinition);

}));
});

it('should redirect to mydspace when an empty SubmissionObject has been retrieved', fakeAsync(() => {
it('should redirect to mydspace when an empty SubmissionObject has been retrieved',() => {

route.testParams = { id: submissionId };
submissionServiceStub.retrieveSubmission.and.returnValue(createSuccessfulRemoteDataObject$({})
Expand All @@ -90,9 +96,9 @@ describe('SubmissionEditComponent Component', () => {

expect(router.navigate).toHaveBeenCalled();

}));
});

it('should not has effects when an invalid SubmissionObject has been retrieved', fakeAsync(() => {
it('should not has effects when an invalid SubmissionObject has been retrieved',() => {

route.testParams = { id: submissionId };
submissionServiceStub.retrieveSubmission.and.returnValue(observableOf(null));
Expand All @@ -104,6 +110,6 @@ describe('SubmissionEditComponent Component', () => {
expect(comp.selfUrl).toBeUndefined();
expect(comp.sections).toBeUndefined();
expect(comp.submissionDefinition).toBeUndefined();
}));
});

});
19 changes: 13 additions & 6 deletions src/app/submission/submit/submission-submit.component.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,24 @@ import { RouterStub } from '../../shared/testing/router.stub';
import { mockSubmissionObject } from '../../shared/mocks/submission.mock';
import { SubmissionSubmitComponent } from './submission-submit.component';
import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
import { ItemDataService } from '../../core/data/item-data.service';
import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';

describe('SubmissionSubmitComponent Component', () => {

let comp: SubmissionSubmitComponent;
let fixture: ComponentFixture<SubmissionSubmitComponent>;
let submissionServiceStub: SubmissionServiceStub;
let itemDataService: ItemDataService;
let router: RouterStub;

const submissionId = '826';
const submissionObject: any = mockSubmissionObject;

beforeEach(waitForAsync(() => {
itemDataService = jasmine.createSpyObj('itemDataService', {
findByHref: createSuccessfulRemoteDataObject$(submissionObject.item),
});
TestBed.configureTestingModule({
imports: [
TranslateModule.forRoot(),
Expand All @@ -38,6 +44,7 @@ describe('SubmissionSubmitComponent Component', () => {
providers: [
{ provide: NotificationsService, useClass: NotificationsServiceStub },
{ provide: SubmissionService, useClass: SubmissionServiceStub },
{ provide: ItemDataService, useValue: itemDataService },
{ provide: TranslateService, useValue: getMockTranslateService() },
{ provide: Router, useValue: new RouterStub() },
{ provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
Expand All @@ -60,7 +67,7 @@ describe('SubmissionSubmitComponent Component', () => {
router = null;
});

it('should init properly when a valid SubmissionObject has been retrieved', fakeAsync(() => {
it('should init properly when a valid SubmissionObject has been retrieved',() => {

submissionServiceStub.createSubmission.and.returnValue(observableOf(submissionObject));

Expand All @@ -72,19 +79,19 @@ describe('SubmissionSubmitComponent Component', () => {
expect(comp.sections).toBe(submissionObject.sections);
expect(comp.submissionDefinition).toBe(submissionObject.submissionDefinition);

}));
});

it('should redirect to mydspace when an empty SubmissionObject has been retrieved', fakeAsync(() => {
it('should redirect to mydspace when an empty SubmissionObject has been retrieved',() => {

submissionServiceStub.createSubmission.and.returnValue(observableOf({}));

fixture.detectChanges();

expect(router.navigate).toHaveBeenCalled();

}));
});

it('should not has effects when an invalid SubmissionObject has been retrieved', fakeAsync(() => {
it('should not has effects when an invalid SubmissionObject has been retrieved',() => {

submissionServiceStub.createSubmission.and.returnValue(observableOf(null));

Expand All @@ -94,6 +101,6 @@ describe('SubmissionSubmitComponent Component', () => {
expect(comp.collectionId).toBeUndefined();
expect(comp.selfUrl).toBeUndefined();
expect(comp.submissionDefinition).toBeUndefined();
}));
});

});

0 comments on commit 226c31c

Please sign in to comment.