@@ -7,31 +7,33 @@ if (!Array.isArray) {
77}
88
99beforeEach ( function ( ) {
10- this . addMatchers ( {
11- toMatchStackFrame : function ( expected ) {
12- var actual = this . actual ;
13- var message = '' ;
14- if ( actual . getFunctionName ( ) !== expected [ 0 ] ) {
15- message += 'expected functionName: ' + actual . getFunctionName ( ) + ' to equal ' + expected [ 0 ] + '\n' ;
16- }
17- if ( Array . isArray ( actual . getArgs ( ) ) && Array . isArray ( expected [ 1 ] ) ) {
18- if ( actual . getArgs ( ) . join ( ) !== expected [ 1 ] . join ( ) ) {
19- message += 'expected args: ' + actual . getArgs ( ) + ' to equal ' + expected [ 1 ] + '\n' ;
10+ jasmine . addMatchers ( {
11+ toMatchStackFrame : function ( ) {
12+ return {
13+ compare : function ( actual , expected ) {
14+ var message = '' ;
15+ if ( actual . getFunctionName ( ) !== expected [ 0 ] ) {
16+ message += 'expected functionName: ' + actual . getFunctionName ( ) + ' to equal ' + expected [ 0 ] + '\n' ;
17+ }
18+ if ( Array . isArray ( actual . getArgs ( ) ) && Array . isArray ( expected [ 1 ] ) ) {
19+ if ( actual . getArgs ( ) . join ( ) !== expected [ 1 ] . join ( ) ) {
20+ message += 'expected args: ' + actual . getArgs ( ) + ' to equal ' + expected [ 1 ] + '\n' ;
21+ }
22+ } else if ( actual . getArgs ( ) !== expected [ 1 ] ) {
23+ message += 'expected args: ' + actual . getArgs ( ) + ' to equal ' + expected [ 1 ] + '\n' ;
24+ }
25+ if ( actual . getFileName ( ) !== expected [ 2 ] ) {
26+ message += 'expected fileName: ' + actual . getFileName ( ) + ' to equal ' + expected [ 2 ] + '\n' ;
27+ }
28+ if ( actual . getLineNumber ( ) !== expected [ 3 ] ) {
29+ message += 'expected lineNumber: ' + actual . getLineNumber ( ) + ' to equal ' + expected [ 3 ] + '\n' ;
30+ }
31+ if ( actual . getColumnNumber ( ) !== expected [ 4 ] ) {
32+ message += 'expected columnNumber: ' + actual . getColumnNumber ( ) + ' to equal ' + expected [ 4 ] + '\n' ;
33+ }
34+ return { pass : message === '' , message : message } ;
2035 }
21- } else if ( actual . getArgs ( ) !== expected [ 1 ] ) {
22- message += 'expected args: ' + actual . getArgs ( ) + ' to equal ' + expected [ 1 ] + '\n' ;
23- }
24- if ( actual . getFileName ( ) !== expected [ 2 ] ) {
25- message += 'expected fileName: ' + actual . getFileName ( ) + ' to equal ' + expected [ 2 ] + '\n' ;
26- }
27- if ( actual . getLineNumber ( ) !== expected [ 3 ] ) {
28- message += 'expected lineNumber: ' + actual . getLineNumber ( ) + ' to equal ' + expected [ 3 ] + '\n' ;
29- }
30- if ( actual . getColumnNumber ( ) !== expected [ 4 ] ) {
31- message += 'expected columnNumber: ' + actual . getColumnNumber ( ) + ' to equal ' + expected [ 4 ] + '\n' ;
32- }
33- this . message = function ( ) { return message } ;
34- return message === '' ;
36+ } ;
3537 }
3638 } ) ;
3739} ) ;
0 commit comments