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

Merge branch 'master' into w2p-61493_Configurable-entities-master-merge

Browse Source 
Conflicts:
	src/app/+item-page/item-page.module.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.ts
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-page.module.ts
	src/app/core/shared/dspace-object.model.ts
	src/app/core/shared/item.model.ts
	src/app/core/shared/metadata.models.ts
	src/app/core/shared/resource-type.ts
	src/app/shared/services/route.service.spec.ts
	src/app/shared/services/route.service.ts
	src/app/thumbnail/thumbnail.component.html
This commit is contained in:
Kristof De Langhe
2019-04-01 15:52:53 +02:00
parent 8996716d71 f54a3a4d6b
commit 9766a65c3a
419 changed files with 26843 additions and 2191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/shared/form/form.component.spec.ts
View File

@@ -10,7 +10,7 @@ import {
DynamicFormValidationService,
DynamicInputModel
} from '@ng-dynamic-forms/core';
import { Store } from '@ngrx/store';
import { Store, StoreModule } from '@ngrx/store';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { TranslateModule } from '@ngx-translate/core';
@@ -124,7 +124,6 @@ function init() {
}
};
store = new MockStore<FormState>(formState);
}
describe('FormComponent test suite', () => {
@@ -144,6 +143,7 @@ describe('FormComponent test suite', () => {
FormsModule,
ReactiveFormsModule,
NgbModule.forRoot(),
StoreModule.forRoot({}),
TranslateModule.forRoot()
],
declarations: [
@@ -157,9 +157,7 @@ describe('FormComponent test suite', () => {
FormComponent,
FormService,
{ provide: GLOBAL_CONFIG, useValue: config },
{
provide: Store, useValue: store
}
{ provide: Store, useClass: MockStore }
],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
});
@@ -177,6 +175,7 @@ describe('FormComponent test suite', () => {
testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
testComp = testFixture.componentInstance;
});
afterEach(() => {
testFixture.destroy();
@@ -194,6 +193,7 @@ describe('FormComponent test suite', () => {
beforeEach(() => {
formFixture = TestBed.createComponent(FormComponent);
store = TestBed.get(Store);
formComp = formFixture.componentInstance; // FormComponent test instance
formComp.formId = 'testForm';
formComp.formModel = TEST_FORM_MODEL;
@@ -384,6 +384,7 @@ describe('FormComponent test suite', () => {
beforeEach(() => {
formFixture = TestBed.createComponent(FormComponent);
store = TestBed.get(Store);
formComp = formFixture.componentInstance; // FormComponent test instance
formComp.formId = 'testFormArray';
formComp.formModel = TEST_FORM_MODEL_WITH_ARRAY;