@@ -66,7 +66,7 @@ describe('exec node', function() {
6666 n2 . on ( "input" , function ( msg ) {
6767 //console.log(msg);
6868 msg . should . have . property ( "payload" ) ;
69- msg . payload . should . be . a . String ;
69+ msg . payload . should . be . a . String ( ) ;
7070 msg . payload . should . equal ( "echo" ) ;
7171 } ) ;
7272 n3 . on ( "input" , function ( msg ) {
@@ -99,13 +99,13 @@ describe('exec node', function() {
9999 n2 . on ( "input" , function ( msg ) {
100100 //console.log(msg);
101101 msg . should . have . property ( "payload" ) ;
102- msg . payload . should . be . a . String ;
102+ msg . payload . should . be . a . String ( ) ;
103103 msg . payload . should . equal ( "echo and more" ) ;
104104 } ) ;
105105 n3 . on ( "input" , function ( msg ) {
106106 //console.log(msg);
107107 msg . should . have . property ( "payload" ) ;
108- msg . payload . should . be . a . String ;
108+ msg . payload . should . be . a . String ( ) ;
109109 msg . payload . should . equal ( "ECHO AND MORE" ) ;
110110 done ( ) ;
111111 child_process . exec . restore ( ) ;
@@ -130,11 +130,15 @@ describe('exec node', function() {
130130 var n4 = helper . getNode ( "n4" ) ;
131131 n2 . on ( "input" , function ( msg ) {
132132 //console.log("n2",msg);
133- msg . should . have . property ( "payload" ) ;
134- msg . payload . should . be . a . Buffer ;
135- msg . payload . length . should . equal ( 4 ) ;
136- done ( ) ;
137- child_process . exec . restore ( ) ;
133+ try {
134+ msg . should . have . property ( "payload" ) ;
135+ Buffer . isBuffer ( msg . payload ) . should . be . true ( ) ;
136+ msg . payload . length . should . equal ( 4 ) ;
137+ child_process . exec . restore ( ) ;
138+ done ( ) ;
139+ } catch ( err ) {
140+ done ( err ) ;
141+ }
138142 } ) ;
139143 n1 . receive ( { } ) ;
140144 } ) ;
@@ -183,10 +187,14 @@ describe('exec node', function() {
183187 var n4 = helper . getNode ( "n4" ) ;
184188 n2 . on ( "input" , function ( msg ) {
185189 //console.log(msg);
186- msg . should . have . property ( "payload" ) ;
187- msg . payload . should . be . a . String ;
188- msg . payload . should . equal ( "hello world\n" ) ;
189- done ( ) ;
190+ try {
191+ msg . should . have . property ( "payload" ) ;
192+ msg . payload . should . be . a . String ( ) ;
193+ msg . payload . should . equal ( "hello world\n" ) ;
194+ done ( ) ;
195+ } catch ( err ) {
196+ done ( err ) ;
197+ }
190198 } ) ;
191199 n1 . receive ( { payload :"hello world" } ) ;
192200 } ) ;
@@ -204,7 +212,7 @@ describe('exec node', function() {
204212 n2 . on ( "input" , function ( msg ) {
205213 //console.log(msg);
206214 msg . should . have . property ( "payload" ) ;
207- msg . payload . should . be . a . String ;
215+ msg . payload . should . be . a . String ( ) ;
208216 msg . payload . should . equal ( "12345 deg C\n" ) ;
209217 done ( ) ;
210218 } ) ;
@@ -222,16 +230,20 @@ describe('exec node', function() {
222230 var n3 = helper . getNode ( "n3" ) ;
223231 var n4 = helper . getNode ( "n4" ) ;
224232 n2 . on ( "input" , function ( msg ) {
225- msg . should . have . property ( "payload" ) ;
226- msg . payload . should . be . a . Buffer ;
227- msg . payload . length . should . equal ( 7 ) ;
228- done ( ) ;
233+ try {
234+ msg . should . have . property ( "payload" ) ;
235+ Buffer . isBuffer ( msg . payload ) . should . be . true ( ) ;
236+ msg . payload . length . should . equal ( 7 ) ;
237+ done ( ) ;
238+ } catch ( err ) {
239+ done ( err ) ;
240+ }
229241 } ) ;
230242 n1 . receive ( { payload :new Buffer ( [ 0x01 , 0x02 , 0x03 , 0x88 ] ) } ) ;
231243 } ) ;
232244 } ) ;
233245
234- it ( 'should now work if passed multiple words to spawn command' , function ( done ) {
246+ it ( 'should work if passed multiple words to spawn command' , function ( done ) {
235247 var flow = [ { id :"n1" , type :"exec" , wires :[ [ "n2" ] , [ "n3" ] , [ "n4" ] ] , command :"echo this now works" , addpay :false , append :"" , useSpawn :true } ,
236248 { id :"n2" , type :"helper" } , { id :"n3" , type :"helper" } , { id :"n4" , type :"helper" } ] ;
237249 helper . load ( execNode , flow , function ( ) {
@@ -241,14 +253,18 @@ describe('exec node', function() {
241253 var n4 = helper . getNode ( "n4" ) ;
242254 n2 . on ( "input" , function ( msg ) {
243255 msg . should . have . property ( "payload" ) ;
244- msg . payload . should . be . a . String ;
256+ msg . payload . should . be . a . String ( ) ;
245257 msg . payload . should . equal ( "this now works\n" ) ;
246258 } ) ;
247259 n4 . on ( "input" , function ( msg ) {
248- msg . should . have . property ( "payload" ) ;
249- msg . payload . should . be . a . String ;
250- msg . payload . should . equal ( 0 ) ;
251- done ( ) ;
260+ try {
261+ msg . should . have . property ( "payload" ) ;
262+ msg . payload . should . be . a . Number ( ) ;
263+ msg . payload . should . equal ( 0 ) ;
264+ done ( ) ;
265+ } catch ( err ) {
266+ done ( err ) ;
267+ }
252268 } ) ;
253269 n1 . receive ( { payload :null } ) ;
254270 } ) ;
@@ -264,7 +280,7 @@ describe('exec node', function() {
264280 var n4 = helper . getNode ( "n4" ) ;
265281 n4 . on ( "input" , function ( msg ) {
266282 msg . should . have . property ( "payload" ) ;
267- msg . payload . should . be . a . Number ;
283+ msg . payload . should . be . a . Number ( ) ;
268284 msg . payload . should . be . below ( 0 ) ;
269285 done ( ) ;
270286 } ) ;
@@ -282,12 +298,12 @@ describe('exec node', function() {
282298 var n4 = helper . getNode ( "n4" ) ;
283299 n3 . on ( "input" , function ( msg ) {
284300 msg . should . have . property ( "payload" ) ;
285- msg . payload . should . be . a . String ;
301+ msg . payload . should . be . a . String ( ) ;
286302 msg . payload . should . equal ( "mkdir: /foo/bar/doo: No such file or directory\n" ) ;
287303 } ) ;
288304 n4 . on ( "input" , function ( msg ) {
289305 msg . should . have . property ( "payload" ) ;
290- msg . payload . should . be . a . String ;
306+ msg . payload . should . be . a . Number ( ) ;
291307 msg . payload . should . equal ( 1 ) ;
292308 done ( ) ;
293309 } ) ;
0 commit comments