Merge pull request #30 from NHSDigital/validation/RemoveIsUKCoreCheck

Remove isUKCore check

Author: ryma2fhir

src/common.js.ts

@@ -695,10 +695,7 @@ export function buildCapabilityStatement(dir: string, file, api: any | void) {
     }
 }
 
-
-
-
-export function testFile( folderName: string, fileName: string, failOnWarning :boolean, isUKore: boolean)
+export function testFile( folderName: string, fileName: string, failOnWarning :boolean)
 {
     let client: AxiosInstance;
     let file = folderName + "/" + fileName;
@@ -813,27 +810,14 @@ export function testFile( folderName: string, fileName: string, failOnWarning :b
                 }
             }
             if (validate) {
-                if (!isUKore) {
-                    test('FHIR Validation', async () => {
-                        const response = await client.post('/$validate', resource).catch(function (error) {
-                            return error.response
-                        })
-                        expect(response.status === 200 || response.status === 400).toBeTruthy()
-                        resourceChecks(response, failOnWarning)
-                        expect(response.status).toEqual(200)
-                    });
-                } else {
-
-                    test('FHIR Validation - UKCore', async () => {
-                        const response = await client.post('/$validate?profile=https://fhir.hl7.org.uk/StructureDefinition/UKCore-' + json.resourceType, resource).catch(function (error) {
-                            return error.response
-                        })
-                        expect(response.status === 200 || response.status === 400).toBeTruthy()
-                        resourceChecks(response, failOnWarning)
-                        expect(response.status).toEqual(200)
+                test('FHIR Validation', async () => {
+                    const response = await client.post('/$validate', resource).catch(function (error) {
+                        return error.response
                     })
-                }
-
+                    expect(response.status === 200 || response.status === 400).toBeTruthy()
+                    resourceChecks(response, failOnWarning)
+                    expect(response.status).toEqual(200)
+                });
             }
         }
     )

src/validate.test.ts

@@ -18,8 +18,6 @@ const args = require('minimist')(process.argv.slice(2))
     let source = '../'
     let examples: string
 
-    let isUKCore = false
-
     let failOnWarning = false;
 
     if (args!= undefined) {
@@ -38,9 +36,7 @@ const args = require('minimist')(process.argv.slice(2))
         if (resource != undefined) {
             let pkg = JSON.parse(resource)
             if (pkg.name.startsWith('fhir.r4.ukcore') || pkg.name.startsWith('UKCore')) {
-                isUKCore = true;
                 gitHubSummary += 'Detected UKCore ' + NEW_LINE;
-
             }
             if (pkg.dependencies != undefined) {
                 for (let key in pkg.dependencies) {
@@ -116,7 +112,7 @@ function testFolderContent(dir : string, source: string) {
 
             } else {
                 if (!isIgnoreFile(dir,file)) {
-                    testFile( dir, file, failOnWarning, isUKCore)
+                    testFile( dir, file, failOnWarning)
                 }
             }
         })