fix: undefined query parameter will not crash the lib

AidasK · AidasK · commit 195ce4bfbd1f · 2013-09-15T15:40:44.000+03:00
diff --git a/src/resumable.js b/src/resumable.js
@@ -699,10 +699,14 @@
      * Abort current upload
      * @function
      */
-    abort: function () {
+    abort: function (reset) {
       this.currentSpeed = 0;
       this.averageSpeed = 0;
-      each(this.chunks, function (c) {
+      var chunks = this.chunks;
+      if (reset) {
+        this.chunks = [];
+      }
+      each(chunks, function (c) {
         if (c.status() === 'uploading') {
           c.abort();
           this.resumableObj.uploadNextChunk();
@@ -732,10 +736,9 @@
      * @function
      */
     bootstrap: function () {
-      this.abort();
+      this.abort(true);
       this.error = false;
       // Rebuild stack of chunks from file
-      this.chunks = [];
       this._prevProgress = 0;
       var round = this.resumableObj.opts.forceChunkSize ? Math.ceil : Math.floor;
       var chunks = Math.max(
@@ -1267,18 +1270,21 @@
    * @param {Object=} context Object to become context (`this`) for the iterator function.
    */
   function each(obj, callback, context) {
+    if (!obj) {
+      return ;
+    }
     var key;
     // Is Array?
     if (typeof(obj.length) !== 'undefined') {
       for (key = 0; key < obj.length; key++) {
         if (callback.call(context, obj[key], key) === false) {
-          return;
+          return ;
         }
       }
     } else {
       for (key in obj) {
         if (obj.hasOwnProperty(key) && callback.call(context, obj[key], key) === false) {
-          return;
+          return ;
         }
       }
     }
diff --git a/test/uploadSpec.js b/test/uploadSpec.js
@@ -31,22 +31,37 @@ describe('upload file', function() {
     xhr.restore();
   });
 
-  it('should test simple file upload with testing', function() {
-    resumable.addFile(new Blob(['file part']));
-    var file = resumable.files[0];
-    expect(file.isComplete()).toBeFalsy();
-    expect(file.isUploading()).toBeFalsy();
-    expect(file.chunks.length).toBe(1);
-    expect(file.progress()).toBe(0);
+  it('should pass query params', function() {
+    resumable.opts.query = {};
+    resumable.opts.target = 'file';
+    resumable.addFile(new Blob(['123']));
     resumable.upload();
     expect(requests.length).toBe(1);
-    expect(file.isComplete()).toBeFalsy();
-    expect(file.isUploading()).toBeTruthy();
-    requests[0].respond(200);
-    expect(file.isComplete()).toBeTruthy();
-    expect(file.isUploading()).toBeFalsy();
-    expect(file.progress()).toBe(1);
-    expect(resumable.progress()).toBe(1);
+    expect(requests[0].url).toContain('file');
+
+    resumable.opts.query = {a:1};
+    resumable.files[0].retry();
+    expect(requests.length).toBe(2);
+    expect(requests[1].url).toContain('file');
+    expect(requests[1].url).toContain('a=1');
+
+    resumable.opts.query = function (file, chunk) {
+      expect(file).toBe(resumable.files[0]);
+      expect(chunk).toBe(resumable.files[0].chunks[0]);
+      return {b:2};
+    };
+    resumable.files[0].retry();
+    expect(requests.length).toBe(3);
+    expect(requests[2].url).toContain('file');
+    expect(requests[2].url).toContain('b=2');
+    expect(requests[2].url).not.toContain('a=1');
+
+    resumable.opts.query = undefined;
+    resumable.files[0].retry();
+    expect(requests.length).toBe(4);
+    expect(requests[3].url).toContain('file');
+    expect(requests[3].url).not.toContain('a=1');
+    expect(requests[3].url).not.toContain('b=2');
   });
 
   it('should track file upload status with lots of chunks', function() {
