fix: filter captures test

Greenstand · Dec 6, 2021 · 0a8caf0 · 0a8caf0
1 parent b67ce9e
commit 0a8caf0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/components/GrowerDetail.js b/src/components/GrowerDetail.js
@@ -160,10 +160,11 @@ const GrowerDetail = (props) => {
 				setLoading(true);
         let filter = new FilterModel();
         filter.planterId = growerId;
-        capturesContext.getAllCaptures({ filter }).then((response) => {
+        const captures = await capturesContext.getAllCaptures({ filter });
+				if (captures && captures.data) {
 					setVerificationStatus(emptyStatusCount);
           let statusCount = emptyStatusCount;
-          response.data.forEach(capture => {
+          captures.data.forEach(capture => {
             const verificationState = getVerificationStatus(
               capture.active,
               capture.approved,
@@ -178,7 +179,7 @@ const GrowerDetail = (props) => {
           });
           setVerificationStatus(statusCount);
 					setLoading(false);
-        })
+        }
       }
     }
     loadCaptures();

diff --git a/src/models/Filter.test.js b/src/models/Filter.test.js
@@ -11,7 +11,7 @@ describe('Filter, with initial values about this filter object', () => {
     filter.dateEnd = '2019-07-30';
     filter.approved = true;
     filter.active = true;
-    filter.planterId = '1';
+    filter.planterId = 1;
     filter.deviceIdentifier = '1';
     filter.planterIdentifier = '1';
   });
@@ -63,7 +63,7 @@ describe('Filter, with initial values about this filter object', () => {
 
   it('getWhereObj() should match: planterId=1', () => {
     expect(filter.getWhereObj()).toEqual(
-      expect.objectContaining({ planterId: '1' }),
+      expect.objectContaining({ planterId: 1 }),
     );
   });
 
@@ -91,10 +91,10 @@ describe('Filter, with initial values about this filter object', () => {
     //}}}
   });
 
-  describe('set planterId = ""', () => {
+  describe('set planterId = undefined', () => {
     //{{{
     beforeEach(() => {
-      filter.planterId = '';
+      filter.planterId = undefined;
     });
 
     it('loopback object should not match any [planterId]', () => {