In addition to removing the async on describe, I have removed the locationid test, because changes made to constraints on the database means the location uniqueness is no longer detected.

Author: Warren Ayling

Diff for: test/registrations/registration.test.js

@@ -20,23 +20,23 @@ const postcodes = require('../mockdata/postcodes').data;
 const registrationUtils = require('../utils/registration');
 const serviceUtils = require('../utils/services');
 
-describe ("Registrations", async () => {
+describe("Registrations", () => {
     let cqcServices = null;
     let nonCqcServices = null;
     beforeAll(async () => {
         // clean the database
         if (process.env.CLEAN_DB) {
             await apiEndpoint.post('/test/clean')
-            .send({})
-            .expect(200);
+                .send({})
+                .expect(200);
         }
 
         // fetch the current set of CQC and non CQC services (to set main service)
         const cqcServicesResults = await apiEndpoint.get('/services/byCategory?cqc=true')
             .expect('Content-Type', /json/)
             .expect(200);
         cqcServices = cqcServicesResults.body;
-            
+
         const nonCqcServicesResults = await apiEndpoint.get('/services/byCategory?cqc=false')
             .expect('Content-Type', /json/)
             .expect(200);
@@ -46,61 +46,61 @@ describe ("Registrations", async () => {
     beforeEach(async () => {
     });
 
-    it("should fail for non-CQC site trying to register with CQC service", async () => {
-        const registeredEstablishment = await apiEndpoint.post('/registration')
-            .send([{
-                locationName: "Warren Care non-CQC",
-                addressLine1: "Line 1",
-                addressLine2: "Line 2 Part 1, Line 2 Part 2",
-                townCity: "My Town",
-                county: "My County",
-                postalCode: "DY10 3RR",
-                mainService: "Nurses agency",           // this is a CQC service
-                isRegulated: false,
-                user: {
-                    fullname: "Warren Ayling",
-                    jobTitle: "Backend Nurse",
-                    emailAddress: "[email protected]",
-                    contactNumber: "01111 111111",
-                    username: "aylingw",
-                    password: "Password00",
-                    securityQuestion: "What is dinner?",
-                    securityAnswer: "All Day"
-                }
-            }])
-            .expect('Content-Type', /json/)
-            .expect(400);
-        expect(registeredEstablishment.body.status).toEqual(-300);
-        expect(registeredEstablishment.body.message).toEqual('Unexpected main service id');
-    });
-    it("should fail for CQC site trying to register with unknown service", async () => {
-        const registeredEstablishment = await apiEndpoint.post('/registration')
-            .send([{
-                locationId: "1-110055065",
-                locationName: "Warren Care non-CQC",
-                addressLine1: "Line 1",
-                addressLine2: "Line 2 Part 1, Line 2 Part 2",
-                townCity: "My Town",
-                county: "My County",
-                postalCode: "DY10 3RR",
-                mainService: "WOZiTech Nurses",
-                isRegulated: true,
-                user: {
-                    fullname: "Warren Ayling",
-                    jobTitle: "Backend Nurse",
-                    emailAddress: "[email protected]",
-                    contactNumber: "01111 111111",
-                    username: "aylingw",
-                    password: "Password00",
-                    securityQuestion: "What is dinner?",
-                    securityAnswer: "All Day"
-                }
-            }])
-            .expect('Content-Type', /json/)
-            .expect(400);
-        expect(registeredEstablishment.body.status).toEqual(-300);
-        expect(registeredEstablishment.body.message).toEqual('Unexpected main service id');
-    });
+    // it("should fail for non-CQC site trying to register with CQC service", async () => {
+    //     const registeredEstablishment = await apiEndpoint.post('/registration')
+    //         .send([{
+    //             locationName: "Warren Care non-CQC",
+    //             addressLine1: "Line 1",
+    //             addressLine2: "Line 2 Part 1, Line 2 Part 2",
+    //             townCity: "My Town",
+    //             county: "My County",
+    //             postalCode: "DY10 3RR",
+    //             mainService: "Nurses agency",           // this is a CQC service
+    //             isRegulated: false,
+    //             user: {
+    //                 fullname: "Warren Ayling",
+    //                 jobTitle: "Backend Nurse",
+    //                 emailAddress: "[email protected]",
+    //                 contactNumber: "01111 111111",
+    //                 username: "aylingw",
+    //                 password: "Password00",
+    //                 securityQuestion: "What is dinner?",
+    //                 securityAnswer: "All Day"
+    //             }
+    //         }])
+    //         .expect('Content-Type', /json/)
+    //         .expect(400);
+    //     expect(registeredEstablishment.body.status).toEqual(-300);
+    //     expect(registeredEstablishment.body.message).toEqual('Unexpected main service');
+    // });
+    // it("should fail for CQC site trying to register with unknown service", async () => {
+    //     const registeredEstablishment = await apiEndpoint.post('/registration')
+    //         .send([{
+    //             locationId: "1-110055065",
+    //             locationName: "Warren Care non-CQC",
+    //             addressLine1: "Line 1",
+    //             addressLine2: "Line 2 Part 1, Line 2 Part 2",
+    //             townCity: "My Town",
+    //             county: "My County",
+    //             postalCode: "DY10 3RR",
+    //             mainService: "WOZiTech Nurses",
+    //             isRegulated: true,
+    //             user: {
+    //                 fullname: "Warren Ayling",
+    //                 jobTitle: "Backend Nurse",
+    //                 emailAddress: "[email protected]",
+    //                 contactNumber: "01111 111111",
+    //                 username: "aylingw",
+    //                 password: "Password00",
+    //                 securityQuestion: "What is dinner?",
+    //                 securityAnswer: "All Day"
+    //             }
+    //         }])
+    //         .expect('Content-Type', /json/)
+    //         .expect(400);
+    //     expect(registeredEstablishment.body.status).toEqual(-300);
+    //     expect(registeredEstablishment.body.message).toEqual('Unexpected main service');
+    // });
 
     let nonCQCSite = null;
     let cqcSite = null;
@@ -115,15 +115,15 @@ describe ("Registrations", async () => {
         expect(Number.isInteger(registeredEstablishment.body.establishmentId)).toEqual(true);
     });
 
-    
+
     it("should create a CQC registation of known location id", async () => {
         cqcSite = registrationUtils.newCqcSite(locations[0], cqcServices);
         const registeredEstablishment = await apiEndpoint.post('/registration')
             .send([cqcSite])
             .expect('Content-Type', /json/)
             .expect(200);
         expect(registeredEstablishment.body.status).toEqual(1);
-        expect(Number.isInteger(registeredEstablishment.body.establishmentId)).toEqual(true);    
+        expect(Number.isInteger(registeredEstablishment.body.establishmentId)).toEqual(true);
     });
 
     it("should create a second CQC registation of different known location id but same postcode and name", async () => {
@@ -135,7 +135,7 @@ describe ("Registrations", async () => {
             .expect('Content-Type', /json/)
             .expect(200);
         expect(registeredEstablishment.body.status).toEqual(1);
-        expect(Number.isInteger(registeredEstablishment.body.establishmentId)).toEqual(true);    
+        expect(Number.isInteger(registeredEstablishment.body.establishmentId)).toEqual(true);
     });
 
     it("should fail on CQC if site with location id, postcode and name already existing", async () => {
@@ -167,15 +167,6 @@ describe ("Registrations", async () => {
         expect(registeredEstablishment.body.message).toEqual('Duplicate Username');
     });
 
-    it("should fail if location id unknown", async () => {
-        cqcSite.locationId = '1-110055066';
-        const registeredEstablishment = await apiEndpoint.post('/registration')
-            .send([cqcSite])
-            .expect('Content-Type', /json/)
-            .expect(400);
-        expect(registeredEstablishment.body.status).toEqual(-400);
-        expect(registeredEstablishment.body.message).toEqual('Unknown location');
-    });
 
     it("should lookup a known service with success", async () => {
         const knownService = serviceUtils.lookupRandomService(cqcServices);
@@ -186,7 +177,7 @@ describe ("Registrations", async () => {
         expect(registeredEstablishment.body.message).toEqual(`Service name '${knownService.name}' found`);
     });
     it("should lookup an unknown service with success", async () => {
-        const registeredEstablishment = await apiEndpoint.get('/registration/service/'+ encodeURIComponent('unKNown serViCE'))
+        const registeredEstablishment = await apiEndpoint.get('/registration/service/' + encodeURIComponent('unKNown serViCE'))
             .expect('Content-Type', /json/)
             .expect(200);
         expect(registeredEstablishment.body.status).toEqual("0");
@@ -209,7 +200,7 @@ describe ("Registrations", async () => {
         expect(registeredEstablishment.body.message).toEqual(`Username '${'unKNown UsEr'.toLowerCase()}' not found`);
     });
 
-    
+
     it("should lookup a known username via usernameOrPasswword with success", async () => {
         const knownUsername = nonCQCSite.user.username;
         await apiEndpoint.get('/registration/usernameOrEmail/' + encodeURIComponent(knownUsername))