[test] Check ajax FormData and Blob handling

Makefile

@@ -108,6 +108,7 @@ lint: $(patsubst ${TESTDIR}/jio.storage/%.js, ${LINTDIR}/${TESTDIR}/jio.storage/
 	${LINTDIR}/node/jio.js \
 	${LINTDIR}/${TESTDIR}/node.js \
 	${LINTDIR}/${TESTDIR}/node/node-require.js \
+	${LINTDIR}/${TESTDIR}/node/ajax.tests.js \
 	$(patsubst ${SRCDIR}/jio.storage/%.js, ${LINTDIR}/jio.storage/%.js, $(wildcard ${SRCDIR}/jio.storage/*.js))
 
 #############################################

src/node/jio.js

@@ -19,7 +19,7 @@
  */
 
 /*global window */
-(function (window, jIO, Blob) {
+(function (window, jIO, Blob, RSVP) {
   "use strict";
 
   var FormData,
@@ -48,9 +48,12 @@
       // allow tests to check them
       param = Object.assign({}, param);
       // Blob is not supported by xhr2, so convert to ArrayBuffer instead
-      return jIO.util.readBlobAsArrayBuffer(param.data)
-        .then(function (data) {
-          param.data = data.target.result;
+      return new RSVP.Queue()
+        .push(function () {
+          return jIO.util.readBlobAsArrayBuffer(param.data);
+        })
+        .push(function (evt) {
+          param.data = evt.target.result;
           return originalAjax(param);
         });
     }
@@ -77,7 +80,7 @@
     return originalAjax(param);
   };
 
-}(window, window.jIO, window.Blob));
+}(window, window.jIO, window.Blob, window.RSVP));
 
 // Define a global variable to allow storages to access jIO
 var jIO = window.jIO,

test/node.js

@@ -48,6 +48,7 @@
   testrunner.run({
     code: 'test/node/node-require.js',
     tests: [
+      'test/node/ajax.tests.js',
       'test/jio/util.js',
       'test/queries/key.tests.js',
       'test/queries/key-schema.tests.js',

test/node/ajax.tests.js

+/*
+ * Copyright 2019, Nexedi SA
+ *
+ * This program is free software: you can Use, Study, Modify and Redistribute
+ * it under the terms of the GNU General Public License version 3, or (at your
+ * option) any later version, as published by the Free Software Foundation.
+ *
+ * You can also Link and Combine this program with other software covered by
+ * the terms of any of the Free Software licenses or any of the Open Source
+ * Initiative approved licenses and Convey the resulting work. Corresponding
+ * source of such a combination shall include the source code for all other
+ * software used.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * See COPYING file for full licensing terms.
+ * See https://www.nexedi.com/licensing for rationale and options.
+ */
+/*global FormData, sinon, RSVP, jIO, QUnit, XMLHttpRequest, Blob, ArrayBuffer*/
+(function (jIO, QUnit, FormData, Blob, ArrayBuffer) {
+  "use strict";
+  var test = QUnit.test,
+    equal = QUnit.equal,
+    stop = QUnit.stop,
+    start = QUnit.start,
+    expect = QUnit.expect,
+    ok = QUnit.ok,
+    module = QUnit.module;
+
+  /////////////////////////////////////////////////////////////////
+  // util.ajax
+  /////////////////////////////////////////////////////////////////
+  module("node.ajax", {
+    setup: function () {
+      this.server = sinon.fakeServer.create();
+      this.server.autoRespond = true;
+      this.server.autoRespondAfter = 5;
+
+      this.spySetRequestHeader = sinon.spy(XMLHttpRequest.prototype,
+                                           "setRequestHeader");
+    },
+    teardown: function () {
+      this.spySetRequestHeader.restore();
+      delete this.spySetRequestHeader;
+
+      this.server.restore();
+      delete this.server;
+    }
+  });
+
+  test("Blob data handling", function () {
+    stop();
+    expect(5);
+
+    var url = "https://www.example.org/com/bar",
+      server = this.server,
+      blob = new Blob(['abc']);
+
+    this.server.respondWith("POST", url, [200, {}, 'OK']);
+
+    return new RSVP.Queue()
+      .then(function () {
+        return jIO.util.ajax({
+          type: 'POST',
+          url: url,
+          data: blob
+        });
+      })
+      .then(function () {
+        equal(server.requests.length, 1);
+        equal(server.requests[0].method, "POST");
+        equal(server.requests[0].url, url);
+        ok(server.requests[0].requestBody instanceof ArrayBuffer);
+        return jIO.util.readBlobAsText(
+          new Blob([server.requests[0].requestBody])
+        );
+      })
+      .then(function (evt) {
+        equal(evt.target.result, 'abc');
+      })
+      .always(function () {
+        start();
+      });
+  });
+
+  test("FormData handling without headers", function () {
+    stop();
+    expect(7);
+
+    var url = "https://www.example.org/com/bar",
+      server = this.server,
+      context = this;
+
+    this.server.respondWith("POST", url, [200, {}, 'OK']);
+
+    return new RSVP.Queue()
+      .then(function () {
+        var form_data = new FormData();
+        form_data.append("foo", "bar");
+        form_data.append("foo2", "bar2", "barfilename2");
+        return jIO.util.ajax({
+          type: 'POST',
+          url: url,
+          data: form_data
+        });
+      })
+      .then(function () {
+        var content_type =
+          "multipart/form-data; boundary=----------------------------",
+          boundary;
+
+        equal(context.spySetRequestHeader.callCount, 1);
+
+        equal(context.spySetRequestHeader.firstCall.args[0], "Content-Type");
+        equal(context.spySetRequestHeader.firstCall.args[1].length,
+              content_type.length + 10);
+
+        boundary = context.spySetRequestHeader.firstCall.args[1].slice(
+          "multipart/form-data; boundary=".length
+        );
+
+        equal(server.requests.length, 1);
+        equal(server.requests[0].method, "POST");
+        equal(server.requests[0].url, url);
+        equal(server.requests[0].requestBody,
+              '--' + boundary +
+              '\r\nContent-Disposition: form-data; name="foo"\r\n\r\nbar\r\n' +
+              '--' + boundary +
+              '\r\nContent-Disposition: form-data; name="foo2"; ' +
+              'filename="barfilename2"\r\n\r\nbar2\r\n' +
+              '--' + boundary + '--\r\n'
+          );
+      })
+      .always(function () {
+        start();
+      });
+  });
+
+  test("FormData handling with headers", function () {
+    stop();
+    expect(9);
+
+    var url = "https://www.example.org/com/bar",
+      server = this.server,
+      context = this;
+
+    this.server.respondWith("POST", url, [200, {}, 'OK']);
+
+    return new RSVP.Queue()
+      .then(function () {
+        var form_data = new FormData();
+        form_data.append("foo", "bar");
+        form_data.append("foo2", "bar2", "barfilename2");
+        return jIO.util.ajax({
+          type: 'POST',
+          url: url,
+          data: form_data,
+          headers: {"bar": "foo"}
+        });
+      })
+      .then(function () {
+        var content_type =
+          "multipart/form-data; boundary=----------------------------",
+          boundary;
+
+        equal(context.spySetRequestHeader.callCount, 2);
+
+        equal(context.spySetRequestHeader.firstCall.args[0], "bar");
+        equal(context.spySetRequestHeader.firstCall.args[1], "foo");
+        equal(context.spySetRequestHeader.secondCall.args[0], "Content-Type");
+        equal(context.spySetRequestHeader.secondCall.args[1].length,
+              content_type.length + 10);
+
+        boundary = context.spySetRequestHeader.secondCall.args[1].slice(
+          "multipart/form-data; boundary=".length
+        );
+
+        equal(server.requests.length, 1);
+        equal(server.requests[0].method, "POST");
+        equal(server.requests[0].url, url);
+        equal(server.requests[0].requestBody,
+              '--' + boundary +
+              '\r\nContent-Disposition: form-data; name="foo"\r\n\r\nbar\r\n' +
+              '--' + boundary +
+              '\r\nContent-Disposition: form-data; name="foo2"; ' +
+              'filename="barfilename2"\r\n\r\nbar2\r\n' +
+              '--' + boundary + '--\r\n'
+          );
+      })
+      .always(function () {
+        start();
+      });
+  });
+}(jIO, QUnit, FormData, Blob, ArrayBuffer));
\ No newline at end of file