Fixed some more unit-tests

supernomad · Jun 21, 2015 · c0a75d7 · c0a75d7
1 parent 13dfb37
commit c0a75d7
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 34 deletions.
diff --git a/routes/chunked-upload-routes.js b/routes/chunked-upload-routes.js
@@ -63,43 +63,45 @@ var routes = {
 		}
 
 		dataCache.restore(req.params.uploadId, function(error, keyVal) {
-			errorHelper.genericErrorHandler(error, debug);
-			var file = {};
-			var upload = keyVal.value;
-			for (var key in req.files) {
-				if (req.files.hasOwnProperty(key)) {
-					file = req.files[key];
-					break;
-				}
-			}
-
-			function readCallback(error, data) {
-				errorHelper.genericErrorHandler(error, debug);
-				io.WriteFileChunk(upload.TempPath, data, 0, data.length, index * upload.ChunkSize, writeChunkCallback);
-			}
-
-			function writeChunkCallback(error) {
+			if(typeHelper.doesExist(keyVal.value)) {
+				console.log(keyVal);
 				errorHelper.genericErrorHandler(error, debug);
-				if (upload.chunks.every(function(val){
-					return val === true;
-				})) 
-				{
-					io.RenameFile(upload.TempPath, upload.FinalPath, renameCallback);
-				} else {
-					res.json(new apiModels.ApiResponse(routePrefix, {}, "Chunk Recieved"));
+				var file = {};
+				var upload = keyVal.value;
+				for (var key in req.files) {
+					if (req.files.hasOwnProperty(key)) {
+						file = req.files[key];
+						break;
+					}
 				}
-			}
-
-			function renameCallback(error) {
-				errorHelper.genericErrorHandler(error, debug);
-				dataCache.delete(upload.id, function(error, count) {
+
+				function readCallback(error, data) {
 					errorHelper.genericErrorHandler(error, debug);
-				});
-
-				res.json(new apiModels.ApiResponse(routePrefix, {}, "Upload Complete"));
-			};
+					io.WriteFileChunk(upload.TempPath, data, 0, data.length, index * upload.ChunkSize, writeChunkCallback);
+				}
+
+				function writeChunkCallback(error) {
+					errorHelper.genericErrorHandler(error, debug);
+					if (upload.chunks.every(function(val){
+						return val === true;
+					})) 
+					{
+						io.RenameFile(upload.TempPath, upload.FinalPath, renameCallback);
+					} else {
+						res.json(new apiModels.ApiResponse(routePrefix, {}, "Chunk Recieved"));
+					}
+				}
+
+				function renameCallback(error) {
+					errorHelper.genericErrorHandler(error, debug);
+					dataCache.delete(upload.id, function(error, count) {
+						errorHelper.genericErrorHandler(error, debug);
+					});
+
+					res.json(new apiModels.ApiResponse(routePrefix, {}, "Upload Complete"));
+				};
+
 
-			if(upload) {
 				upload.chunks[index] = true;
 				dataCache.update(upload.Id, upload, defaultTtl, function(error, success) {
 					errorHelper.genericErrorHandler(error, debug);

diff --git a/test/routes/chunked-upload-routes-tests.js b/test/routes/chunked-upload-routes-tests.js
@@ -205,7 +205,7 @@ describe("chunked-upload-routes.js", function() {
 				routes.put.handler({
 					params: {
 						uploadId: guidHelper.newGuid(),
-						index: "woot"
+						index: 0
 					},
 					files: {
 						testFile: {