fix(validation): rejected files may not have correct status

closes #1345
FineUploader · Jan 8, 2015 · 5d7c020 · 5d7c020
1 parent 6bae0f4
commit 5d7c020
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/client/js/uploader.basic.api.js b/client/js/uploader.basic.api.js
@@ -1543,7 +1543,7 @@
         _onValidateCallbackFailure: function(items, index, params, endpoint) {
             var nextIndex = index + 1;
 
-            this._fileOrBlobRejected(items[0].id, items[0].file.name);
+            this._fileOrBlobRejected(items[index].id, items[index].file.name);
 
             this._maybeProcessNextItemAfterOnValidateCallback(false, items, nextIndex, params, endpoint);
         },

diff --git a/test/unit/submit-validate-cancel.js b/test/unit/submit-validate-cancel.js
@@ -6,6 +6,7 @@ if (qqtest.canDownloadFileAsBlob) {
         var oldWrapCallbacks,
             testImgKey = "up.jpg",
             testImgType = "image/jpeg",
+            fileTestHelper = helpme.setupFileTests(),
             testBlob;
 
         before(function() {
@@ -97,6 +98,43 @@ if (qqtest.canDownloadFileAsBlob) {
             });
         });
 
+        it("handles a file rejected via onValidate callback", function(done) {
+            var filesValidated = 0,
+                uploader = new qq.FineUploaderBasic({
+                    validation: {
+                        stopOnFirstInvalidFile: false
+                    },
+                    callbacks: {
+                        onAllComplete: function(succeeded, failed) {
+                            assert.equal(succeeded.length, 1, "wrong succeeded count");
+                            assert.equal(failed.length, 0, "wrong failed count");
+                            assert.equal(uploader.getUploads({id: 0}).status, qq.status.UPLOAD_SUCCESSFUL);
+                            assert.equal(uploader.getUploads({id: 1}).status, qq.status.REJECTED);
+                            done();
+                        },
+                        onValidate: function(blobData, button) {
+                            qq.log("VALIDATING" + blobData.name);
+                            filesValidated++;
+
+                            if (filesValidated === 2) {
+                                return false;
+                            }
+                        }
+                    }
+                });
+
+            qqtest.downloadFileAsBlob(testImgKey, testImgType).then(function(blob) {
+                fileTestHelper.mockXhr();
+
+                uploader.addFiles([
+                    {blob: blob, name: "name1"},
+                    {blob: blob, name: "name2"}
+                ]);
+
+                fileTestHelper.getRequests()[0].respond(200, null, JSON.stringify({success: true}));
+            });
+        });
+
         describe("file rejection via callback", function() {
             function setupUploader(callback, blob, done, useQ) {
                 var uploader = new qq.FineUploaderBasic({