Refactored the code to be more simple

Author: larsvankleef

src/__tests__/validate.test.js

@@ -3,28 +3,38 @@ const { validate, email, length, required } = require('../validate')
 const defaultRules = {
   fields: {
     email: {
-      validator: (value) => {
+      validator: value => {
         return length(value, { max: 75 }) && email(value)
       },
       message: 'The given email address is invalid',
     },
     password: {
-      validator: (value) => {
+      validator: value => {
         return length(value, { min: 4, max: 18 })
       },
     },
     subscription: {
-      validator: (value) => {
+      validator: value => {
         return required(value)
-      }
-    }
-  }
+      },
+    },
+  },
 }
 
 it('initializes', () => {
   const fields = {}
   const rules = {}
-  validate( fields, { rules, } )
+  validate(fields, { rules })
+})
+
+it('returns invalid when there are no rules', () => {
+  const fields = {
+    password: 'homepage'
+  }
+  const rules = {}
+
+  const { valid } = validate(fields, { rules })
+  expect(valid).toEqual(false)
 })
 
 it('calls the correct validation checks and calls them with the current value', () => {
@@ -65,10 +75,43 @@ it('uses the given rules to validate against the fields', () => {
   const fields = {
     email: '[email protected]',
     password: 'password',
-    subscription: true
+    subscription: true,
   }
 
   const rules = defaultRules
-  const { valid } = validate( fields, { rules, } )
+  const { valid } = validate(fields, { rules })
   expect(valid).toEqual(true)
 })
+
+it('validates to false when one one of the validation rules returns false', () => {
+  const fields = {
+    email: '[email protected]',
+    password: 'password',
+  }
+
+  const rules = defaultRules
+  const { valid, results } = validate(fields, { rules })
+  expect(valid).toEqual(false)
+  expect(results).toMatchInlineSnapshot(`
+    Array [
+      Object {
+        "field": "email",
+        "message": "",
+        "valid": true,
+        "value": "[email protected]",
+      },
+      Object {
+        "field": "password",
+        "message": "",
+        "valid": true,
+        "value": "password",
+      },
+      Object {
+        "field": "subscription",
+        "message": "Validation failed for field 'subscription'",
+        "valid": false,
+        "value": undefined,
+      },
+    ]
+  `)
+})

src/validate.js

@@ -1,14 +1,10 @@
 function validate(fields, { rules }) {
-  if (isEmpty(fields)) {
-    return { valid: false, results: [] }
-  }
+  const checked = []
 
-  if (isEmpty(rules.fields)) {
+  if (!fields || !rules || !rules.fields ) {
     return { valid: false, results: [] }
   }
 
-  const checked = []
-
   Object.keys(rules.fields).forEach((field) => {
     const value = fields[field]
     const rule = rules.fields[field]
@@ -33,10 +29,6 @@ function validate(fields, { rules }) {
   }
 }
 
-function isEmpty(obj) {
-  return Object.keys(obj).length === 0
-}
-
 module.exports = {
   validate,
   ...require('./validation/index.js'),