Skip to content
Open
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
56 changes: 45 additions & 11 deletions lib/__tests__/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ describe( 'lib/index', function() {

expect( tester._event ).to.eql( {} );

let returnValue = tester.event( { one: 1 } );
let returnValue = tester.event( { one: 1, dummy: undefined } );

expect( returnValue ).to.equal( tester );
expect( tester._event ).to.eql( { one: 1 } );
Expand All @@ -309,8 +309,8 @@ describe( 'lib/index', function() {
tester.event( [ e1, e2 ] );

expect( tester._event ).to.be.an( 'Array' );
expect( tester._event[0] ).to.equal( e1 );
expect( tester._event[1] ).to.equal( e2 );
expect( tester._event[0] ).to.eql( e1 );
expect( tester._event[1] ).to.eql( e2 );
});

it( 'event is a function', function() {
Expand Down Expand Up @@ -429,7 +429,7 @@ describe( 'lib/index', function() {
return tester.expectResult( ( result ) => {

// should be the original object
expect( result ).to.equal( clientContext );
expect( result ).to.eql( clientContext );
});
});

Expand All @@ -456,7 +456,7 @@ describe( 'lib/index', function() {
return tester.expectResult( ( result ) => {

// should be the original object
expect( result ).to.equal( clientContext );
expect( result ).to.eql( clientContext );
});
});
});
Expand Down Expand Up @@ -1468,36 +1468,70 @@ describe( 'lib/index', function() {

await LambdaTester( (event, context) => {

context.succeed( 'ok' );
context.succeed( { ok: true, dummy: undefined } );
}).expectResult( (result) => {

expect( result ).to.equal( 'ok' );
expect( result ).to.eql( { ok: true } );
});
});

it( 'without strict mode, contextSucceed with no value', async function() {

await LambdaTester( (event, context) => {

context.succeed();
}).expectResult( (result) => {

expect( result ).to.equal( null );
});
});

it( 'without strict mode, callback', async function() {

await LambdaTester( (event, context, callback) => {

callback( null, 'ok' );
callback( null, { ok: true, dummy: undefined } );
}).expectResult( (result) => {

expect( result ).to.equal( 'ok' );
expect( result ).to.eql( { ok: true } );
});
});

it( 'without strict mode, callback with no value', async function() {

await LambdaTester( (event, context, callback) => {

callback( null );
}).expectResult( (result) => {

expect( result ).to.equal( null );
});
});

it( 'without strict mode, promise', async function() {

await LambdaTester( () => {

return Promise.resolve( 'ok' );
return Promise.resolve( { ok: true, dummy: undefined } );

}).expectResult( (result) => {

expect( result ).to.equal( 'ok' );
expect( result ).to.eql( { ok: true } );
});
});

it( 'without strict mode, promise with no value', async function() {

await LambdaTester( () => {

return Promise.resolve();

}).expectResult( (result) => {

expect( result ).to.equal( null );
});
});

it( 'without verifier', function() {

return LambdaTester( LAMBDA_SIMPLE_CALLBACK )
Expand Down
9 changes: 1 addition & 8 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,14 +148,7 @@ class LambdaTester {
evt = evt( lambdaEventMock );
}

if( isObject( evt ) && !Array.isArray( evt )) {

this._event = { ...evt };
}
else {

this._event = evt;
}
this._event = JSON.parse( JSON.stringify( evt ) )

return this;
}
Expand Down
13 changes: 9 additions & 4 deletions lib/runner.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@ async function runVerifier( verifier, result, additional ) {
}
}

// This function simulates the serialization process between the client and the lambda service.
function convertResult( result ) {
return result === undefined ? null : JSON.parse( JSON.stringify( result ) );
}

class LambdaRunner {

constructor( expectedState, verifier, options = {} ) {
Expand Down Expand Up @@ -164,14 +169,14 @@ class LambdaRunner {

let context = this._createContext( resolve, { startTime } );

let callback = ( err, result ) => resolve( { state: err ? States.callbackError : States.callbackResult, err, result } );
let callback = ( err, result ) => resolve( { state: err ? States.callbackError : States.callbackResult, err, result: convertResult( result ) } );

const ret = handler( this.event, context, callback );

if( isPromise( ret ) ) {

ret.then(
(result) => resolve( { state: States.promiseResolve, err: null, result } ),
(result) => resolve( { state: States.promiseResolve, err: null, result: convertResult( result ) } ),
(err) => resolve( { state: States.promiseReject, err, result: null } )
);
}
Expand Down Expand Up @@ -223,8 +228,8 @@ class LambdaRunner {
...this.context,

fail: ( err ) => resolve( { state: States.contextFail, err } ),
succeed: ( result ) => resolve( { state: States.contextSucceed, result } ),
done: ( err, result ) => resolve( { state: err ? States.contextFail : States.contextSucceed, err, result } ),
succeed: ( result ) => resolve( { state: States.contextSucceed, result: convertResult(result) } ),
done: ( err, result ) => resolve( { state: err ? States.contextFail : States.contextSucceed, err, result: convertResult( result ) } ),
getRemainingTimeInMillis: () => {

let remaining = this.timeout - (Date.now() - additional.startTime);
Expand Down