Resolve redirected URLs & case-insensitive input type.

index.js

@@ -223,8 +223,6 @@ Osmosis.prototype.request = function (url, opts, callback, tries) {
                     self.command.log('[redirect] ' +
                                      url.href + ' -> ' + new_url);
                 }
-
-                url.href = new_url;
             });
 };
 

lib/Command.js

@@ -17,6 +17,8 @@ var Data     = require('./Data.js'),
  */
 
 function Command(parent) {
+    var self = this;
+
     if (Object.getPrototypeOf(parent) === Command.prototype) {
         // parent is a Command
         this.prev = parent;
@@ -98,8 +100,8 @@ Command.prototype = {
     }
 };
 
-Command.prototype.run = function () {
-    return this.instance.run();
+Command.prototype.run = function (context, data) {
+    return this.instance.run(context, data);
 };
 
 /**

lib/Data.js

@@ -79,7 +79,9 @@ Data.prototype.getObject = function () {
  */
 
 Data.prototype.setObject = function (object) {
-    return (this.object = object);
+    this.object = object;
+
+    return this;
 };
 
 /**
@@ -244,10 +246,10 @@ Data.prototype.toArray = function () {
         return object;
     }
 
-    if (object === undefined) {
+    if (this.isEmpty()) {
         this.setObject([]);
     } else {
-        this.setObject([object]);
+        this.setObject([ object ]);
     }
 
     return this.getObject();

lib/Form.js

@@ -117,7 +117,8 @@ form.getParams = function (node) {
                 value = input.textContent;
                 break;
             case 'input':
-                switch (input.getAttribute('type')) {
+                switch (input.getAttribute('type').toLowerCase()) {
+                    case 'radio':
                     case 'checkbox':
                         if (!input.hasAttribute('checked'))  {
                             break;

lib/Request.js

@@ -84,7 +84,7 @@ function Request(method, url, params, opts, tries, callback) {
         callback(null, res, document);
     })
     .on('redirect', function (href) {
-        extend(location, URL.parse(href));
+        extend(location, URL.parse(URL.resolve(location.href, href)));
     });
 }
 

lib/commands/then.js

@@ -65,8 +65,7 @@ function Then(callback, getContext) {
 
         getContext(context, function (context) {
             callback.call(self, context, data.getObject(), function (c, d) {
-                data.setObject(d);
-                next(c, data);
+                next(c, data.setObject(d));
 
                 if (length === 3 && calledDone === false) {
                     process.nextTick(done);

test/submit.js

@@ -5,6 +5,11 @@ var URL = require('url');
 
 var url = server.host + ':' + server.port;
 
+/*
+ * TODO: Add radio button tests
+ *       Add input[name] case-insensitivity tests
+ */
+
 module.exports.form1 = function (assert) {
     var calledThen = false;