Merge pull request #376 from lukeasrodgers/bugfix_getFormValues_for_multiple_forms

Bugfix: `getFormvalues` choked on >1 form with same field names.

@@ -455,10 +455,12 @@
          * Retrieves the value of a form field.
          * Retrieves the value of a form field.
          *
          *
          * @param  String  inputName  The for input name attr value
          * @param  String  inputName  The for input name attr value
+         * @param  Object  options    Object with formSelector, optional
          * @return Mixed
          * @return Mixed
          */
          */
-        this.getFieldValue = function getFieldValue(inputName) {
+        this.getFieldValue = function getFieldValue(inputName, options) {
             function getSingleValue(input) {
             function getSingleValue(input) {
+                var type;
                 try {
                 try {
                     type = input.getAttribute('type').toLowerCase();
                     type = input.getAttribute('type').toLowerCase();
                 } catch (e) {
                 } catch (e) {
@@ -474,6 +476,7 @@
                 return input.checked;
                 return input.checked;
             }
             }
             function getMultipleValues(inputs) {
             function getMultipleValues(inputs) {
+                var type;
                 type = inputs[0].getAttribute('type').toLowerCase();
                 type = inputs[0].getAttribute('type').toLowerCase();
                 if (type === 'radio') {
                 if (type === 'radio') {
                     var value;
                     var value;
@@ -491,7 +494,11 @@
                     return values;
                     return values;
                 }
                 }
             }
             }
-            var inputs = this.findAll('[name="' + inputName + '"]'), type;
+            var formSelector = '';
+            if (options && options.formSelector) {
+              formSelector = options.formSelector + ' ';
+            }
+            var inputs = this.findAll(formSelector + '[name="' + inputName + '"]');
             switch (inputs.length) {
             switch (inputs.length) {
                 case 0:  return null;
                 case 0:  return null;
                 case 1:  return getSingleValue(inputs[0]);
                 case 1:  return getSingleValue(inputs[0]);
@@ -512,7 +519,7 @@
             [].forEach.call(form.elements, function(element) {
             [].forEach.call(form.elements, function(element) {
                 var name = element.getAttribute('name');
                 var name = element.getAttribute('name');
                 if (name && !values[name]) {
                 if (name && !values[name]) {
-                    values[name] = self.getFieldValue(name);
+                    values[name] = self.getFieldValue(name, {formSelector: selector});
                 }
                 }
             });
             });
             return values;
             return values;

@@ -65,13 +65,21 @@ casper.test.begin('unexistent fields', 1, function(test) {
     });
     });
 });
 });
 
 
-casper.test.begin('multiple forms', 1, function(test) {
+casper.test.begin('multiple forms', 2, function(test) {
     casper.start('tests/site/multiple-forms.html', function() {
     casper.start('tests/site/multiple-forms.html', function() {
         this.fill('form[name="f2"]', {
         this.fill('form[name="f2"]', {
             yo: "ok"
             yo: "ok"
         }, true);
         }, true);
     }).then(function() {
     }).then(function() {
         test.assertUrlMatch(/\?f=f2&yo=ok$/, 'Casper.fill() handles multiple forms');
         test.assertUrlMatch(/\?f=f2&yo=ok$/, 'Casper.fill() handles multiple forms');
+    }).then(function() {
+        this.fill('form[name="f2"]', {
+            yo: "ok"
+        });
+        test.assertEquals(this.getFormValues('form[name="f2"]'), {
+            f: "f2",
+            yo: "ok"
+        }, 'Casper.getFormValues() retrieves filled values when multiple forms have same field names');
     }).run(function() {
     }).run(function() {
         test.done();
         test.done();
     });
     });