From 3a1dcbfdff167e52f9e1f5d01143834a880f438b Mon Sep 17 00:00:00 2001 From: Supernomad Date: Wed, 24 Jun 2015 23:43:10 -0400 Subject: [PATCH] fixed a bug in the unit-tests for the chunked-upload-routes --- routes/chunked-download-routes.js | 9 ++--- test/routes/chunked-upload-routes-tests.js | 42 +++++++++++----------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/routes/chunked-download-routes.js b/routes/chunked-download-routes.js index e394dc8..418b492 100644 --- a/routes/chunked-download-routes.js +++ b/routes/chunked-download-routes.js @@ -1,5 +1,6 @@ /* global Buffer */ -var apiModels = require.main.require('libs/models/apiModels'), +var async = require('async'), + apiModels = require.main.require('libs/models/apiModels'), errorModels = require.main.require('libs/models/errorModels'), guidHelper = require.main.require('libs/helpers/guidHelper'), errorHelper = require.main.require('libs/helpers/errorHelper'), @@ -15,7 +16,7 @@ var debug = false, dataCache = null; var routes = { - "get": new apiModels.RouteHandler(routePrefix + "/:downloadId/:index", function (req, res) { + "get": new apiModels.RouteHandler(routePrefix + "/:downloadId/:index", function (req, res, next) { var index = parseInt(req.params.index); if (!guidHelper.isGuid(req.params.downloadId)){ throw errorModels.ValidationError("The supplied downloadId is not a valid v4 GUID"); @@ -48,7 +49,7 @@ var routes = { } }); }), - "post": new apiModels.RouteHandler(routePrefix, function (req, res) { + "post": new apiModels.RouteHandler(routePrefix, function (req, res, next) { var valid = validators.validateDownloadRequest(req.body); if(valid !== validators.valid) { throw errorModels.ValidationError(valid); @@ -68,7 +69,7 @@ var routes = { }); }); }), - "delete": new apiModels.RouteHandler(routePrefix + "/:downloadId", function (req, res) { + "delete": new apiModels.RouteHandler(routePrefix + "/:downloadId", function (req, res, next) { if (!guidHelper.isGuid(req.params.downloadId)){ throw errorModels.ValidationError("The supplied downloadId is not a valid v4 GUID"); } diff --git a/test/routes/chunked-upload-routes-tests.js b/test/routes/chunked-upload-routes-tests.js index 5e28cf9..23f5068 100644 --- a/test/routes/chunked-upload-routes-tests.js +++ b/test/routes/chunked-upload-routes-tests.js @@ -174,6 +174,27 @@ describe("chunked-upload-routes.js", function() { routes.put.handler.should.be.a.Function; }); + it('should handle an error thrown by the cache updating an upload', function() { + cache_mock.setReturnErrorOnCreate(true); + routes.put.handler({ + params: { + uploadId: uploadId, + index: 0 + }, + files: { + testFile: { + path: "random/path/to/nothing" + } + } + }, { + json: function(data) { + } + }, function(error) { + should.exist(error); + error.should.be.an.instanceOf(Error); + }); + }); + it('should throw a ServerError when the specified uploadId does not exist', function() { cache_mock.setReturnValue(false); routes.put.handler({ @@ -353,27 +374,6 @@ describe("chunked-upload-routes.js", function() { error.should.be.an.instanceOf(Error); }); }); - - it('should handle an error thrown by the cache updating an upload', function() { - cache_mock.setReturnErrorOnCreate(true); - routes.put.handler({ - params: { - uploadId: guidHelper.newGuid(), - index: 0 - }, - files: { - testFile: { - path: "random/path/to/nothing" - } - } - }, { - json: function(data) { - } - }, function(error) { - should.exist(error); - error.should.be.an.instanceOf(Error); - }); - }); }); describe("#DELETE", function() {