@becollective/utils 1.9.0 → 1.9.2

package/bundle.js

@@ -105,13 +105,17 @@ var isUnderSixteen = function isUnderSixteen(dateOfBirth) {
   var age = getAge(dateOfBirth);
   return isNaN(age) ? false : age < 16;
 };
-var isUnderAge = function isUnderAge(dateOfBirth, limit) {
-  if (!dateOfBirth || !moment(dateOfBirth).isValid()) {
+var isUnderAge = function isUnderAge(dateOfBirth, limit, maxAcknowledgedAge) {
+  if ((!dateOfBirth || !moment(dateOfBirth).isValid()) && !maxAcknowledgedAge) {
     return false;
   }
 
-  var age = getAge(dateOfBirth);
-  return isNaN(age) ? false : age < limit;
+  if (dateOfBirth) {
+    var age = getAge(dateOfBirth);
+    return isNaN(age) ? true : age < limit;
+  }
+
+  return maxAcknowledgedAge ? maxAcknowledgedAge < limit : true;
 };
 var datesByThemselves = function datesByThemselves(a, b) {
   if (!a.from) return 1;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@becollective/utils",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "description": "Common utilities",
   "main": "bundle.js",
   "scripts": {
-    "test": "NODE_ENV=localtest jest --config jestconfig.json --detectOpenHandles --verbose --forceExit",
+    "test": "npm run build && NODE_ENV=localtest jest --config jestconfig.json --detectOpenHandles --verbose --forceExit",
     "build": "rollup -c",
     "prepare": "npm run build"
   },

package/src/date-time.js

@@ -38,12 +38,16 @@ export const isUnderSixteen = (dateOfBirth) => {
   return isNaN(age) ? false : age < 16;
 };
 
-export const isUnderAge = (dateOfBirth, limit) => {
-  if (!dateOfBirth || !moment(dateOfBirth).isValid()) {
+export const isUnderAge = (dateOfBirth, limit, maxAcknowledgedAge) => {
+  if ((!dateOfBirth || !moment(dateOfBirth).isValid()) && !maxAcknowledgedAge) {
     return false;
   }
-  const age = getAge(dateOfBirth);
-  return isNaN(age) ? false : age < limit;
+
+  if(dateOfBirth) {
+    const age = getAge(dateOfBirth);
+    return isNaN(age) ? true : age < limit;
+  }
+  return maxAcknowledgedAge ? maxAcknowledgedAge < limit : true;
 };
 
 export const datesByThemselves = (a, b) => {

package/tests/date-time.test.js

@@ -56,8 +56,7 @@ describe('isUnderSixteen', () => {
   });
 });
 
-
-describe('isUnderAge', () => {
+describe('isUnderAge - dateOfBirth', () => {
   const refPoint = moment().subtract(13, 'years');
   const obj = {};
   test('Is not U13 if dob is 13 years ago', () => {
@@ -85,6 +84,30 @@ describe('isUnderAge', () => {
   });
 });
 
+describe('isUnderAge - maxAcknowledgedAge', () => {
+  const obj = {};
+  test('Is not U13 if maxAcknowledgedAge is 13 years ago', () => {
+    expect(isUnderAge(null, 13, 13)).toBe(false);
+    expect(isUnderAge(null, 13, 14)).toBe(false);
+  });
+
+  test('Is U13 if maxAcknowledgedAge is less than X years ago', () => {
+    expect(isUnderAge(null, 13, 10)).toBe(true);
+    expect(isUnderAge(null, 13, 12)).toBe(true);
+    expect(isUnderAge(null, 13, 12.5)).toBe(true);
+    expect(isUnderAge(null, 13, 13)).toBe(false);
+  });
+
+  test('Undefined maxAcknowledgedAge', () => {
+    expect(isUnderAge(null, 13, obj.notDefined)).toBe(false);
+  });
+  test('Null maxAcknowledgedAge', () => {
+    expect(isUnderAge(null, 13, null)).toBe(false);
+  });
+  test('Invalid value', () => {
+    expect(isUnderAge(null, 13, '13x')).toBe(false);
+  });
+});
 
 describe('isUnderAge - 10', () => {
   const refPoint = moment().subtract(10, 'years');
@@ -104,7 +127,6 @@ describe('isUnderAge - 10', () => {
   });
 });
 
-
 describe('isUnderAge - over 13', () => {
   const refPoint = moment().subtract(15, 'years');
   const obj = {};