From 6c81f2a8d5a15021b62d2a29c24fdf7286f13914 Mon Sep 17 00:00:00 2001 From: abetomo Date: Fri, 31 Mar 2017 10:53:30 +0900 Subject: [PATCH 1/2] Add tests for event_sources.json Changed to processing to create an array of file names and loop Because it was the same process --- test/main.js | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/test/main.js b/test/main.js index fc345c98..68168b16 100644 --- a/test/main.js +++ b/test/main.js @@ -423,26 +423,33 @@ describe('node-lambda', function () { }); describe('create sample files', function () { + const targetFiles = [ + '.env', + 'context.json', + 'event.json', + 'deploy.env', + 'event_sources.json' + ]; afterEach(function () { - fs.unlinkSync('.env'); - fs.unlinkSync('context.json'); - fs.unlinkSync('event.json'); - fs.unlinkSync('deploy.env'); + targetFiles.forEach(function(file) { + fs.unlinkSync(file); + }); }); it('should create sample files', function () { lambda.setup(program); - var envBoilerplateFile = __dirname + '/../lib/.env.example'; - var contextBoilerplateFile = __dirname + '/../lib/context.json.example'; - var eventBoilerplateFile = __dirname + '/../lib/event.json.example'; - var deployBoilerplateFile = __dirname + '/../lib/deploy.env.example'; + const libPath = `${__dirname}/../lib`; + targetFiles.forEach(function(targetFile) { + const boilerplateFile = `${libPath}/${targetFile}.example`; - assert.equal(fs.readFileSync('.env').toString(), fs.readFileSync(envBoilerplateFile).toString()); - assert.equal(fs.readFileSync('context.json').toString(), fs.readFileSync(contextBoilerplateFile).toString()); - assert.equal(fs.readFileSync('event.json').toString(), fs.readFileSync(eventBoilerplateFile).toString()); - assert.equal(fs.readFileSync('deploy.env').toString(), fs.readFileSync(deployBoilerplateFile).toString()); + assert.equal( + fs.readFileSync(targetFile).toString(), + fs.readFileSync(boilerplateFile).toString(), + targetFile + ); + }); }); }); From 7426bcf2ca438d3da0516f97c76342330d95fd5a Mon Sep 17 00:00:00 2001 From: abetomo Date: Fri, 31 Mar 2017 11:13:59 +0900 Subject: [PATCH 2/2] Add tests for event_sources.json Changed to processing to create an array of file names and loop Because it was the same process --- test/main.js | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/test/main.js b/test/main.js index 68168b16..7412e360 100644 --- a/test/main.js +++ b/test/main.js @@ -454,6 +454,11 @@ describe('node-lambda', function () { }); describe('check env vars before create sample files', function () { + const filesCreatedBySetup = [ + '.env', + 'deploy.env', + 'event_sources.json' + ]; beforeEach(function () { fs.writeFileSync('newContext.json', '{"FOO"="bar"\n"BAZ"="bing"\n}'); @@ -461,10 +466,11 @@ describe('node-lambda', function () { }); afterEach(function () { - fs.unlinkSync('.env'); fs.unlinkSync('newContext.json'); fs.unlinkSync('newEvent.json'); - fs.unlinkSync('deploy.env'); + filesCreatedBySetup.forEach(function(file) { + fs.unlinkSync(file); + }); }); it('should use existing sample files', function () { @@ -473,13 +479,19 @@ describe('node-lambda', function () { lambda.setup(program); - var envBoilerplateFile = __dirname + '/../lib/.env.example'; - var deployBoilerplateFile = __dirname + '/../lib/deploy.env.example'; - - assert.equal(fs.readFileSync('.env').toString(), fs.readFileSync(envBoilerplateFile).toString()); assert.equal(fs.readFileSync('newContext.json').toString(), '{"FOO"="bar"\n"BAZ"="bing"\n}'); assert.equal(fs.readFileSync('newEvent.json').toString(), '{"FOO"="bar"}'); - assert.equal(fs.readFileSync('deploy.env').toString(), fs.readFileSync(deployBoilerplateFile).toString()); + + const libPath = `${__dirname}/../lib`; + filesCreatedBySetup.forEach(function(targetFile) { + const boilerplateFile = `${libPath}/${targetFile}.example`; + + assert.equal( + fs.readFileSync(targetFile).toString(), + fs.readFileSync(boilerplateFile).toString(), + targetFile + ); + }); }); });