fixing fhir-resource tests.

depot · Jan 16, 2023 · 36902b5 · 36902b5
1 parent d0c1e17
commit 36902b5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/...components/report-medical-history-condition/report-medical-history-condition.component.ts b/...components/report-medical-history-condition/report-medical-history-condition.component.ts
@@ -167,7 +167,7 @@ export class ReportMedicalHistoryConditionComponent implements OnInit {
  }
 
  genResourceId(relatedResource: ResourceFhir): string {
- return `/source/${relatedResource.source_id}/resource/${relatedResource.source_resource_type}/${relatedResource.source_resource_id}`
+ return `/source/${relatedResource?.source_id}/resource/${relatedResource?.source_resource_type}/${relatedResource?.source_resource_id}`
  }
 
 }
diff --git a/frontend/src/app/pages/report-labs/report-labs.component.spec.ts b/frontend/src/app/pages/report-labs/report-labs.component.spec.ts
@@ -1,16 +1,27 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ReportLabsComponent } from './report-labs.component';
+import {FastenApiService} from '../../services/fasten-api.service';
+import {NgbModalModule} from '@ng-bootstrap/ng-bootstrap';
+import {of} from 'rxjs';
 
 describe('ReportLabsComponent', () => {
  let component: ReportLabsComponent;
  let fixture: ComponentFixture<ReportLabsComponent>;
+ let mockedFastenApiService
 
  beforeEach(async () => {
+
+ mockedFastenApiService = jasmine.createSpyObj('FastenApiService', ['getResources'])
  await TestBed.configureTestingModule({
- declarations: [ ReportLabsComponent ]
+ declarations: [ ReportLabsComponent ],
+ providers: [{
+ provide: FastenApiService,
+ useValue: mockedFastenApiService
+ }]
  })
  .compileComponents();
+ mockedFastenApiService.getResources.and.returnValue(of([]));
 
  fixture = TestBed.createComponent(ReportLabsComponent);
  component = fixture.componentInstance;

diff --git a/frontend/src/lib/models/resources/allergy-intolerance-model.spec.ts b/frontend/src/lib/models/resources/allergy-intolerance-model.spec.ts
@@ -4,7 +4,8 @@ import * as example1Fixture from "../../fixtures/r4/resources/allergyIntolerance
 import * as example2Fixture from "../../fixtures/r4/resources/allergyIntolerance/example2.json";
 import * as example3Fixture from "../../fixtures/r4/resources/allergyIntolerance/example3.json";
 
-import * as example1DstuFixture from "../../fixtures/dstu2/resources/allergyIntolerance/example2.json"
+import * as example1DstuFixture from "../../fixtures/dstu2/resources/allergyIntolerance/example1.json"
+import * as example2DstuFixture from "../../fixtures/dstu2/resources/allergyIntolerance/example2.json"
 import * as example1Stu3Fixture from "../../fixtures/stu3/resources/allergyIntolerance/example1.json"
 import * as example2Stu3Fixture from "../../fixtures/stu3/resources/allergyIntolerance/example2.json"
 
@@ -86,7 +87,7 @@ describe('AllergyIntoleranceModel', () => {
  expected.category = ['medication']
  expected.patient = {reference: 'Patient/example'}
 
- expect(new AllergyIntoleranceModel(example3Fixture, fhirVersions.DSTU2)).toEqual(expected);
+ expect(new AllergyIntoleranceModel(example1DstuFixture, fhirVersions.DSTU2)).toEqual(expected);
  });
 
  it('should parse example2.json', () => {
@@ -107,7 +108,7 @@ describe('AllergyIntoleranceModel', () => {
  expected.category = []
  expected.patient = {reference: 'Patient/065b82c2aaa2'}
 
- expect(new AllergyIntoleranceModel(example1DstuFixture, fhirVersions.DSTU2)).toEqual(expected);
+ expect(new AllergyIntoleranceModel(example2DstuFixture, fhirVersions.DSTU2)).toEqual(expected);
  });
 
  })