Merge pull request #25 from JenkinsDev/hotfix/check_for_dom_objects_inside_forms

Hotfix: Check for dom objects inside forms

Author: JenkinsDev

.travis.yml

@@ -1,3 +1,3 @@
 language: node_js
 node_js:
-  - "0.10"
+  - "6"

Gruntfile.js

@@ -5,7 +5,7 @@ module.exports = function(grunt) {
         uglify: {
             options: {
                 banner: '/* \n' +
-                        ' * Copyright (c) 2013-2016 David Jenkins (<%= pkg.name %>) \n' +
+                        ' * Copyright (c) 2013-2017 David Jenkins (<%= pkg.name %>) \n' +
                         ' * See the file license.txt for copying permission. \n' +
                         ' * \n' +
                         ' * Simple, yet effective, vanilla JavaScript form validation "plugin." Validatinator is based off \n' +

README.md

@@ -1,6 +1,6 @@
 # Validatinator
 
-Current Release: 1.3.3
+Current Release: 1.3.4
 
 Validatinator is a simple, yet effective, vanilla JavaScript form validation
 "plugin." It is loosely based off of Laravel's validation system. Using

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "validatinator",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "homepage": "https://github.com/JenkinsDev/Validatinator",
   "authors": [
     "David Jenkins <david.nicholas.jenkins@gmail.com>"

changelog.md

@@ -1,5 +1,10 @@
 # Validatinator Changelog
 
+### Version 1.3.4
+
+* Hotfix: Validatinator.utils.getFieldsValue() should now correctly only return a field's value if it is truly a field within the form requested.
+* Hotfix [tests]: Added a bit of cleanup after DOM manipulation is done in tests.
+
 ### Version 1.3.3
 
 * Hotfix: Updated email regex to be less strict and follow RFC822.

dev/js/validatinator.core.js

@@ -73,15 +73,13 @@ Validatinator.prototype = {
             i;
 
         this.currentForm = formName;
-        // Since we are doing a fresh validation let's make sure our errors are all fresh as well!
         this.errors = {};
 
         for (var fieldName in this.validationInformation[formName]) {
             this.currentField = fieldName;
             currentFieldsValidations = this.validationInformation[formName][fieldName];
             currentFieldsValue = this.utils.getFieldsValue(this.currentForm, this.currentField);
 
-            // We need to set i here because it doesn't reset to zero by default and it is more idomatic to do it here.
             for (i = 0; i < currentFieldsValidations.length; i++) {
                 var method,
                     parameters = [];

dev/js/validatinator.utils.js

@@ -160,8 +160,8 @@ Validatinator.prototype.utils = {
 
             // We are running a simple test to see if the current field in the returned array is part of
             // our validating field or not.  If it is then grab it's value and break out of this test loop.
-            if (fieldElement.form.name === form) {
-                if((fieldElement.type == 'radio' || fieldElement.type == 'checkbox') && !fieldValue) {
+            if (fieldElement.form && fieldElement.form.name === form) {
+              if (['radio', 'checkbox'].indexOf(fieldElement.type) !== -1 && !fieldValue) {
                     if(fieldElement.checked) {
                         fieldValue = fieldElement.value;
                         break;

dev/tests/validatinator_utils_test.js

@@ -64,7 +64,7 @@ describe("Validatinator Utils", function() {
         expect(utils.isValueAnArray("not an array")).toBeFalsy();
     });
 
-    describe('Set Test Form For Value Retrieval', function() {
+    describe('getFieldsValue', function() {
         beforeEach(function() {
             // Creating our testing form.
             var myForm = document.createElement('form'),
@@ -76,16 +76,19 @@ describe("Validatinator Utils", function() {
             myForm.name = "my-form";
             firstName.name = "first-name";
             lastName.name = "last-name";
+
             gender.name = "gender";
             gender.type = "radio";
             gender.value = "male";
+
             languages.name = "languages";
             languages.type = "checkbox";
             languages.value = "english";
 
             lastName.value = "test";
 
             document.body.appendChild(myForm);
+
             // Now that our element is in the dom let's select it again.
             myForm = document.getElementsByName("my-form")[0];
 
@@ -96,21 +99,43 @@ describe("Validatinator Utils", function() {
             myForm.appendChild(languages);
         });
 
-        it('getFieldsValue should throw an error if there is no field to grab a value from, else return the field\'s value.', function() {
+        // Do proper cleanup after each of these tests.
+        afterEach(function() {
+            document.body.removeChild(document.querySelector('[name="my-form"]'));
+        });
+
+        it('should throw an error if the field doesn\'t exist.', function() {
             expect(utils.getFieldsValue("my-form", "first-name")).toEqual("");
             expect(utils.getFieldsValue("my-form", "last-name")).toEqual("test");
 
-            expect(function() { utils.getFieldsValue("my-form", "some-fake-field"); }).toThrow("Couldn't find the field element some-fake-field for the form my-form.");
+            expect(function() {
+                utils.getFieldsValue("my-form", "some-fake-field");
+            }).toThrow();
         });
 
-        it('getFieldsValue should only return the value from radio or checkbox if its actually selected/checked', function(){
+        it('should only return a value for radio or checkbox if its actually selected.', function() {
             expect(utils.getFieldsValue("my-form", "gender")).toEqual("");
             expect(utils.getFieldsValue("my-form", "languages")).toEqual("");
 
             document.getElementsByName("gender")[0].checked = true;
             document.getElementsByName("languages")[0].checked = true;
+
             expect(utils.getFieldsValue("my-form", "gender")).toEqual("male");
             expect(utils.getFieldsValue("my-form", "languages")).toEqual("english");
         });
+
+        it('should only evaluate field DOM objects that are within our form', function() {
+            // Test specific setup
+            var fieldName = "first-name";
+
+            var meta = document.createElement('meta');
+            meta.name = fieldName;
+            meta.value = "David";
+
+            var head = document.querySelector("head");
+            head.appendChild(meta);
+
+            expect(utils.getFieldsValue("my-form", fieldName)).toEqual("");
+        });
     });
-});
+});