@@ -19,9 +19,14 @@ var escTCString = function (message) {
19
19
} ;
20
20
21
21
var getTestName = function ( result ) {
22
- return result . slice ( 1 ) . join ( ' ' ) ;
22
+ return result . description ;
23
23
} ;
24
24
25
+ var getSuiteName = function ( result ) {
26
+ return result . suite . join ( ' ' ) ;
27
+ } ;
28
+
29
+
25
30
var TeamcityReporter = function ( formatError , reportSlow ) {
26
31
BaseReporter . call ( this , formatError , reportSlow ) ;
27
32
@@ -37,7 +42,7 @@ var TeamcityReporter = function(formatError, reportSlow) {
37
42
38
43
this . specSuccess = function ( browser , result ) {
39
44
var browseResult = this . checkNewSuit ( browser , result ) ;
40
- var testName = getTestName ( result . suite ) ;
45
+ var testName = getTestName ( result ) ;
41
46
42
47
browseResult . log . push ( util . format ( this . TEST_START , escTCString ( testName ) ) ) ;
43
48
browseResult . log . push ( util . format ( this . TEST_END ,
@@ -46,7 +51,7 @@ var TeamcityReporter = function(formatError, reportSlow) {
46
51
47
52
this . specFailure = function ( browser , result ) {
48
53
var browseResult = this . checkNewSuit ( browser , result ) ;
49
- var testName = getTestName ( result . suite ) ;
54
+ var testName = getTestName ( result ) ;
50
55
51
56
browseResult . log . push ( util . format ( this . TEST_START , escTCString ( testName ) ) ) ;
52
57
browseResult . log . push ( util . format ( this . TEST_FAILED , escTCString ( testName ) ,
@@ -57,29 +62,31 @@ var TeamcityReporter = function(formatError, reportSlow) {
57
62
58
63
this . specSkipped = function ( browser , result ) {
59
64
var browseResult = this . checkNewSuit ( browser , result ) ;
60
- var testName = getTestName ( result . suite ) ;
65
+ var testName = getTestName ( result ) ;
61
66
62
67
browseResult . log . push ( util . format ( this . TEST_IGNORED , escTCString ( testName ) ) ) ;
63
68
} ;
64
69
65
70
this . checkNewSuit = function ( browser , result ) {
66
71
var browserResult = this . checkNewBrowser ( browser ) ;
67
- var suiteExists = browserResult . suits . indexOf ( result . suite [ 0 ] ) !== - 1 ;
72
+ var suiteName = getSuiteName ( result ) ;
73
+ var suiteExists = browserResult . suits . indexOf ( suiteName ) !== - 1 ;
68
74
69
75
if ( ! suiteExists ) {
70
76
if ( browserResult . suits . length > 0 ) {
71
77
browserResult . log . push ( util . format ( this . SUITE_END ,
72
78
escTCString ( browserResult . suits [ browserResult . suits . length - 1 ] ) ) ) ;
73
79
}
74
- browserResult . suits . push ( result . suite [ 0 ] ) ;
75
- browserResult . log . push ( util . format ( this . SUITE_START , escTCString ( result . suite [ 0 ] ) ) ) ;
80
+ browserResult . suits . push ( suiteName ) ;
81
+ browserResult . log . push ( util . format ( this . SUITE_START , escTCString ( suiteName ) ) ) ;
76
82
}
77
83
return browserResult ;
78
84
} ;
79
85
80
86
this . checkNewBrowser = function ( browser ) {
81
87
if ( ! this . browserResults [ browser . id ] ) {
82
88
this . browserResults [ browser . id ] = {
89
+ name : browser . name ,
83
90
log : [ ] ,
84
91
suits : [ ]
85
92
} ;
@@ -90,15 +97,15 @@ var TeamcityReporter = function(formatError, reportSlow) {
90
97
this . onRunComplete = function ( browsers , results ) {
91
98
var self = this ;
92
99
93
- Object . keys ( this . browserResults ) . forEach ( function ( key ) {
94
- var browserResult = self . browserResults [ key ] ;
100
+ Object . keys ( this . browserResults ) . forEach ( function ( browserId ) {
101
+ var browserResult = self . browserResults [ browserId ] ;
95
102
if ( browserResult . suits . length > 0 ) {
96
103
browserResult . log . push ( util . format ( self . SUITE_END ,
97
104
escTCString ( browserResult . suits [ browserResult . suits . length - 1 ] ) ) ) ;
98
105
}
99
- self . write ( self . BROWSER_START , key ) ;
106
+ self . write ( self . BROWSER_START , browserResult . name ) ;
100
107
self . write ( browserResult . log . join ( '\n' ) ) ;
101
- self . write ( self . BROWSER_END , key ) ;
108
+ self . write ( self . BROWSER_END , browserResult . name ) ;
102
109
} ) ;
103
110
104
111
this . writeCommonMsg ( browsers . map ( this . renderBrowser ) . join ( '\n' ) + '\n' ) ;
0 commit comments