@@ -47,14 +47,14 @@ describe('raven.parsers', function() {
47
47
encrypted : true
48
48
} ,
49
49
connection : {
50
- remoteAddress : '69.69.69.69 '
50
+ remoteAddress : '127.0.0.1 '
51
51
}
52
52
} ;
53
53
var parsed = raven . parsers . parseRequest ( mockReq ) ;
54
54
parsed . should . have . property ( 'request' ) ;
55
55
parsed . request . url . should . equal ( 'https://mattrobenolt.com/some/path?key=value' ) ;
56
56
parsed . request . env . NODE_ENV . should . equal ( process . env . NODE_ENV ) ;
57
- parsed . request . env . REMOTE_ADDR . should . equal ( '69.69.69.69 ' ) ;
57
+ parsed . request . env . REMOTE_ADDR . should . equal ( '127.0.0.1 ' ) ;
58
58
} ) ;
59
59
60
60
describe ( '`headers` detection' , function ( ) {
@@ -303,12 +303,12 @@ describe('raven.parsers', function() {
303
303
headers : {
304
304
hostname : 'mattrobenolt.com' ,
305
305
} ,
306
- ip : '69.69.69.69 '
306
+ ip : '127.0.0.1 '
307
307
} ;
308
308
309
309
var parsed = raven . parsers . parseRequest ( mockReq ) ;
310
310
311
- parsed . request . env . REMOTE_ADDR . should . equal ( '69.69.69.69 ' ) ;
311
+ parsed . request . env . REMOTE_ADDR . should . equal ( '127.0.0.1 ' ) ;
312
312
} ) ;
313
313
314
314
it ( 'should detect ip via `req.connection.remoteAddress`' , function ( ) {
@@ -319,13 +319,13 @@ describe('raven.parsers', function() {
319
319
hostname : 'mattrobenolt.com' ,
320
320
} ,
321
321
connection : {
322
- remoteAddress : '69.69.69.69 '
322
+ remoteAddress : '127.0.0.1 '
323
323
}
324
324
} ;
325
325
326
326
var parsed = raven . parsers . parseRequest ( mockReq ) ;
327
327
328
- parsed . request . env . REMOTE_ADDR . should . equal ( '69.69.69.69 ' ) ;
328
+ parsed . request . env . REMOTE_ADDR . should . equal ( '127.0.0.1 ' ) ;
329
329
} ) ;
330
330
} ) ;
331
331
@@ -409,6 +409,61 @@ describe('raven.parsers', function() {
409
409
parsed . request . data . should . equal ( '{\"foo\":true}' ) ;
410
410
} ) ;
411
411
} ) ;
412
+
413
+ describe ( '`user` detection' , function ( ) {
414
+ it ( 'should assign req.user to kwargs' , function ( ) {
415
+ var mockReq = {
416
+ method : 'POST' ,
417
+ hostname : 'example.org' ,
418
+ url : '/some/path?key=value' ,
419
+ user : {
420
+ username : 'janedoe' ,
421
+ email : 'hello@janedoe.com'
422
+ }
423
+ } ;
424
+
425
+ var parsed = raven . parsers . parseRequest ( mockReq ) ;
426
+ parsed . should . have . property ( 'user' , {
427
+ username : 'janedoe' ,
428
+ email : 'hello@janedoe.com'
429
+ } ) ;
430
+ } ) ;
431
+
432
+ it ( 'should NOT assign req.user if already present in kwargs' , function ( ) {
433
+ var mockReq = {
434
+ method : 'POST' ,
435
+ hostname : 'example.org' ,
436
+ url : '/some/path?key=value' ,
437
+ user : {
438
+ username : 'janedoe' ,
439
+ email : 'hello@janedoe.com'
440
+ }
441
+ } ;
442
+
443
+ var parsed = raven . parsers . parseRequest ( mockReq , { user : { } } ) ;
444
+ parsed . should . have . property ( 'user' , { } ) ;
445
+ } ) ;
446
+
447
+ it ( 'should add ip address to user if available' , function ( ) {
448
+ var mockReq = {
449
+ method : 'POST' ,
450
+ hostname : 'example.org' ,
451
+ url : '/some/path?key=value' ,
452
+ ip : '127.0.0.1' ,
453
+ user : {
454
+ username : 'janedoe' ,
455
+ email : 'hello@janedoe.com'
456
+ }
457
+ } ;
458
+
459
+ var parsed = raven . parsers . parseRequest ( mockReq ) ;
460
+ parsed . should . have . property ( 'user' , {
461
+ username : 'janedoe' ,
462
+ email : 'hello@janedoe.com' ,
463
+ ip_address : '127.0.0.1'
464
+ } ) ;
465
+ } ) ;
466
+ } ) ;
412
467
} ) ;
413
468
414
469
describe ( '#parseError()' , function ( ) {
0 commit comments