Merge pull request #112 from Veabers/master

fix: preproccess pause/resume for issue #108

Author: AidasK

src/flow.js

@@ -295,15 +295,13 @@
       if (this.opts.prioritizeFirstAndLastChunk) {
         each(this.files, function (file) {
           if (!file.paused && file.chunks.length &&
-            file.chunks[0].status() === 'pending' &&
-            file.chunks[0].preprocessState === 0) {
+            file.chunks[0].status() === 'pending') {
             file.chunks[0].send();
             found = true;
             return false;
           }
           if (!file.paused && file.chunks.length > 1 &&
-            file.chunks[file.chunks.length - 1].status() === 'pending' &&
-            file.chunks[0].preprocessState === 0) {
+            file.chunks[file.chunks.length - 1].status() === 'pending') {
             file.chunks[file.chunks.length - 1].send();
             found = true;
             return false;
@@ -318,7 +316,7 @@
       each(this.files, function (file) {
         if (!file.paused) {
           each(file.chunks, function (chunk) {
-            if (chunk.status() === 'pending' && chunk.preprocessState === 0) {
+            if (chunk.status() === 'pending') {
               chunk.send();
               found = true;
               return false;

test/uploadSpec.js

@@ -431,6 +431,30 @@ describe('upload file', function() {
     expect(preprocess).wasNotCalledWith(secondFile.chunks[0]);
   });
 
+  it('should resume preprocess chunks after pause', function () {
+    flow.opts.chunkSize = 1;
+    flow.opts.simultaneousUploads = 1;
+    flow.opts.testChunks = false;
+    var preprocess = jasmine.createSpy('preprocess');
+    var error = jasmine.createSpy('error');
+    var success = jasmine.createSpy('success');
+    flow.on('fileError', error);
+    flow.on('fileSuccess', success);
+    flow.opts.preprocess = preprocess;
+    flow.addFile(new Blob(['abc']));
+    var file = flow.files[0];
+    flow.upload();
+    for(var i=0; i<file.chunks.length; i++) {
+      expect(preprocess).wasCalledWith(file.chunks[i]);
+      file.chunks[i].preprocessFinished();
+      file.pause();
+      file.resume();
+      requests[requests.length-1].respond(200, [], "response");
+    }
+    expect(success).wasCalledWith(file, "response", file.chunks[file.chunks.length-1]);
+    expect(error).not.toHaveBeenCalled();
+  });
+
   it('should set chunk as a third event parameter', function () {
     var success = jasmine.createSpy('success');
     flow.on('fileSuccess', success);