Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/project/handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@ module.exports = function handler(event,context) {
if (!_.includes(getDirectories(resourcePath), resourceType))
return util.done("Invalid resourceType:" + resourceType, ev, context);

require(path.join(resourcePath,resourceType)).handler(ev,context);
try {
require(path.join(resourcePath, resourceType)).handler(ev, context);
} catch(e) {
util.done(e,ev,context);
}
};

function getDirectories(srcpath) {
Expand Down
15 changes: 15 additions & 0 deletions test/fixtures/project1/lib/resources/resource3/create.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
var create = require('../../../../../../lib/resource/create')
util = require('../../../../../../lib/util');

module.exports.handler = function(event,context) {
create.apply(this,[event,context,myCreate]);
};

var myCreate = function(err,event,context) {
if (err)
return util.done(err);

dont_fail_badly();

util.done(null,event,context,{id: 1, name: "First Resource"},1);
};
7 changes: 7 additions & 0 deletions test/fixtures/project1/lib/resources/resource3/delete.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
var destroy = require('../../../../../../lib/resource/delete')
util = require('../../../../../../lib/util');

// Bad function, no callback
module.exports.handler = function(event, context) {
destroy.apply(this, [event, context]);
};
5 changes: 5 additions & 0 deletions test/fixtures/project1/lib/resources/resource3/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
var handler = require('../../../../../../lib/resource/handler');

module.exports.handler = function() {
handler.apply(this,arguments);
};
7 changes: 7 additions & 0 deletions test/fixtures/project1/lib/resources/resource3/update.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
var update = require('../../../../../../lib/resource/update')
util = require('../../../../../../lib/util');

// Bad function, no callback
module.exports.handler = function(event, context) {
update.apply(this, [event, context]);
};
22 changes: 22 additions & 0 deletions test/integration/project1/project.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -261,5 +261,27 @@ describe('project1', function() {
});
});
});

describe("resource3", function() {

describe("create", function() {

it("should run without error", function(cb) {
var event = {
resourceType: "resource3",
requestType: "create"
};

var context = {
done: function(err,data,id) {
assert.equal(err, 'ReferenceError: dont_fail_badly is not defined');
cb();
}
};
project1.handler(event,context);
});
});

});
});
});