Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Modify unit tests #501

Merged
merged 2 commits into from
Sep 25, 2019
Merged

Modify unit tests #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe83e74
Stop disabling logs during unit tests
abetomo Sep 11, 2019
a2388f2
Fixed output test
abetomo Sep 11, 2019
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
34 changes: 0 additions & 34 deletions test/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,18 +121,6 @@ const _awsRestore = () => {
awsMock.restore('Lambda')
}

const disableLog = () => {
['log', 'warn', 'info'].forEach((f) => {
console[f] = () => {}
})
}

const enableLog = () => {
['log', 'warn', 'info'].forEach((f) => {
if (String(console[f]) === '() => {}') delete console[f]
})
}

/* global before, after, beforeEach, afterEach, describe, it */
describe('lib/main', function () {
if (process.platform === 'win32') {
Expand Down Expand Up @@ -597,18 +585,14 @@ describe('lib/main', function () {
})

it('should not throw any errors if no script', () => {
disableLog()
return lambda._postInstallScript(program, codeDirectory).then((dummy) => {
enableLog()
assert.isUndefined(dummy)
})
})

it('should throw any errors if script fails', () => {
fs.writeFileSync(postInstallScriptPath, '___fails___')
disableLog()
return lambda._postInstallScript(program, codeDirectory).catch((err) => {
enableLog()
assert.instanceOf(err, Error)
assert.match(err.message, /^Error: Command failed:/)
})
Expand Down Expand Up @@ -654,9 +638,7 @@ describe('lib/main', function () {
it('Compress the file. `index.js` and `bin/node-lambda` are included and the permission is also preserved.', function () {
_timeout({ this: this, sec: 30 }) // give it time to zip

disableLog()
return lambda._zip(program, codeDirectory).then((data) => {
enableLog()
const archive = new Zip(data)
assert.include(archive.files['index.js'].name, 'index.js')
assert.include(archive.files['bin/node-lambda'].name, 'bin/node-lambda')
Expand Down Expand Up @@ -689,9 +671,7 @@ describe('lib/main', function () {
it('installs and zips with an index.js file and node_modules/aws-sdk (It is also a test of `_buildAndArchive`)', function () {
_timeout({ this: this, sec: 30 }) // give it time to zip

disableLog()
return lambda._archive(program).then((data) => {
enableLog()
const archive = new Zip(data)
const contents = Object.keys(archive.files).map((k) => {
return archive.files[k].name.toString()
Expand All @@ -714,9 +694,7 @@ describe('lib/main', function () {
fs.writeFileSync(path.join(buildDir, 'd', 'testb'), '...')

program.prebuiltDirectory = buildDir
disableLog()
return lambda._archive(program).then((data) => {
enableLog()
const archive = new Zip(data)
const contents = Object.keys(archive.files).map((k) => {
return archive.files[k].name.toString()
Expand All @@ -738,9 +716,7 @@ describe('lib/main', function () {
before(function () {
_timeout({ this: this, sec: 30 }) // give it time to zip

disableLog()
return lambda._zip(program, codeDirectory).then((data) => {
enableLog()
bufferExpected = data
fs.writeFileSync(testZipFile, data)
})
Expand Down Expand Up @@ -780,9 +756,7 @@ describe('lib/main', function () {
const filePath = path.join(path.resolve('/aaaa'), 'bbbb')
const _program = Object.assign({ deployZipfile: filePath }, program)
_timeout({ this: this, sec: 30 }) // give it time to zip
disableLog()
return lambda._archive(_program).then((data) => {
enableLog()
// same test as "installs and zips with an index.js file and node_modules/aws-sdk"
const archive = new Zip(data)
const contents = Object.keys(archive.files).map((k) => {
Expand Down Expand Up @@ -836,9 +810,7 @@ describe('lib/main', function () {
})

it('should create sample files', () => {
disableLog()
lambda.setup(program)
enableLog()

const libPath = path.join(__dirname, '..', 'lib')
targetFiles.forEach((targetFile) => {
Expand Down Expand Up @@ -1259,9 +1231,7 @@ describe('lib/main', function () {
program.eventFile = 'newEvent.json'
program.contextFile = 'newContext.json'

disableLog()
lambda.setup(program)
enableLog()

assert.equal(fs.readFileSync('newContext.json').toString(), '{"FOO"="bar"\n"BAZ"="bing"\n}')
assert.equal(fs.readFileSync('newEvent.json').toString(), '{"FOO"="bar"}')
Expand All @@ -1282,9 +1252,7 @@ describe('lib/main', function () {
describe('Lambda.prototype._deployToRegion()', () => {
it('simple test with mock', () => {
const params = lambda._params(program, null)
disableLog()
return lambda._deployToRegion(program, params, 'us-east-1').then((result) => {
enableLog()
assert.deepEqual(
result,
[
Expand All @@ -1300,9 +1268,7 @@ describe('lib/main', function () {
describe('Lambda.prototype.deploy()', () => {
it('simple test with mock', function () {
_timeout({ this: this, sec: 30 }) // give it time to zip
disableLog()
return lambda.deploy(program).then((result) => {
enableLog()
assert.isUndefined(result)
})
})
Expand Down
14 changes: 7 additions & 7 deletions test/node-lambda.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ describe('bin/node-lambda', () => {
this.timeout(10000) // give it time to multiple executions
_generateEventFile(eventObj)
_testMain({
stdoutRegExp: / no: 1 .+ no: 2 .+ no: 3 .+Success:/,
stdoutRegExp: /no: 1.+no: 2.+no: 3.+Success:/,
exitCode: 0
}, done)
})
Expand Down Expand Up @@ -228,15 +228,15 @@ describe('bin/node-lambda', () => {
])
let stdoutString = ''
run.stdout.on('data', (data) => {
stdoutString += data.toString().replace(/\r|\n/g, '')
stdoutString += data.toString().replace(/\r|\n|\s/g, '')
})

run.on('exit', (code) => {
const expected = 'Running index.handler==================================event ' +
'[ { asyncTest: false, callbackWaitsForEmptyEventLoop: true, callbackCode: \'callback(null);\', no: 1 }, ' +
'{ asyncTest: false, callbackWaitsForEmptyEventLoop: true, callbackCode: \'callback(null);\', no: 2 }, ' +
'{ asyncTest: false, callbackWaitsForEmptyEventLoop: true, callbackCode: \'callback(null);\', no: 3 } ]' +
'==================================Stopping index.handlerSuccess:'
const expected = 'Runningindex.handler==================================event' +
'[{asyncTest:false,callbackWaitsForEmptyEventLoop:true,callbackCode:\'callback(null);\',no:1},' +
'{asyncTest:false,callbackWaitsForEmptyEventLoop:true,callbackCode:\'callback(null);\',no:2},' +
'{asyncTest:false,callbackWaitsForEmptyEventLoop:true,callbackCode:\'callback(null);\',no:3}]' +
'==================================Stoppingindex.handlerSuccess:'

assert.equal(stdoutString, expected)
assert.equal(code, 0)
Expand Down