fix(validation): empty files are not rejected

rnicholus · rnicholus · commit 483c66893842 · 2015-03-30T16:19:21.000-05:00
fixes FineUploader#1381
diff --git a/client/js/upload-data.js b/client/js/upload-data.js
@@ -74,7 +74,7 @@ qq.UploadData = function(uploaderProxy) {
                     name: spec.name,
                     originalName: spec.name,
                     uuid: spec.uuid,
-                    size: spec.size || -1,
+                    size: spec.size == null ? -1 : spec.size,
                     status: status
                 }) - 1;
 
diff --git a/test/unit/resources/empty.txt b/test/unit/resources/empty.txt
diff --git a/test/unit/submit-validate-cancel.js b/test/unit/submit-validate-cancel.js
@@ -244,7 +244,7 @@ if (qqtest.canDownloadFileAsBlob) {
         });
 
         describe("file rejection via internal validation", function() {
-            function setupUploader(limits, numBlobs, statusChangeLogic) {
+            function setupUploader(limits, numBlobsOrTheBlob, statusChangeLogic) {
                 var uploader = new qq.FineUploaderBasic({
                     autoUpload: false,
                     validation: limits,
@@ -255,19 +255,24 @@ if (qqtest.canDownloadFileAsBlob) {
                     }
                 });
 
-                qqtest.downloadFileAsBlob(testImgKey, testImgType).then(function(blob) {
-                    numBlobs = [].concat(numBlobs);
-                    qq.each(numBlobs, function(idx, num) {
-                        var blobs = [],
-                            i;
-
-                        for (i = 0; i < num; i++) {
-                            blobs.push(blob);
-                        }
+                if (qq.isBlob(numBlobsOrTheBlob)) {
+                    uploader.addFiles(numBlobsOrTheBlob);
+                }
+                else {
+                    qqtest.downloadFileAsBlob(testImgKey, testImgType).then(function(blob) {
+                        numBlobsOrTheBlob = [].concat(numBlobsOrTheBlob);
+                        qq.each(numBlobsOrTheBlob, function(idx, num) {
+                            var blobs = [],
+                                i;
+
+                            for (i = 0; i < num; i++) {
+                                blobs.push(blob);
+                            }
 
-                        uploader.addFiles(blobs);
+                            uploader.addFiles(blobs);
+                        });
                     });
-                });
+                }
             }
 
             it("prevents too many items from being submitted at once", function(done) {
@@ -318,6 +323,18 @@ if (qqtest.canDownloadFileAsBlob) {
                 });
             });
 
+            it("prevents empty files from being submitted", function(done) {
+                qqtest.downloadFileAsBlob("empty.txt", "text/plain").then(function(emptyFile) {
+                    setupUploader({}, emptyFile, function(id, oldStatus, newStatus) {
+                        if (newStatus === qq.status.REJECTED) {
+                            assert.equal(this.getUploads().length, 1);
+                            assert.equal(this.getUploads({status: qq.status.REJECTED}).length, 1);
+                            done();
+                        }
+                    });
+                });
+            });
+
             it("prevents files that are too large from being submitted", function(done) {
                 setupUploader({sizeLimit: 3265}, 1, function(id, oldStatus, newStatus) {
                     if (newStatus === qq.status.REJECTED) {
