@@ -80,20 +80,9 @@ var BrowserStackBrowser = function(id, emitter, args, logger,
80
80
this . id = id ;
81
81
this . name = browserName ;
82
82
83
- var bsConfig = config . browserStack ;
84
-
85
- var captureTimeout = 0 ;
86
-
87
- if ( config . captureTimeout ) {
88
- captureTimeout = config . captureTimeout ;
89
- }
90
-
91
- var retryLimit = 3 ;
92
- if ( bsConfig ) {
93
- if ( bsConfig . retryLimit ) {
94
- retryLimit = bsConfig . retryLimit ;
95
- }
96
- }
83
+ var bsConfig = config . browserStack || { } ;
84
+ var captureTimeout = config . captureTimeout || 0 ;
85
+ var retryLimit = bsConfig . retryLimit || 3 ;
97
86
98
87
this . start = function ( url ) {
99
88
@@ -106,24 +95,14 @@ var BrowserStackBrowser = function(id, emitter, args, logger,
106
95
// TODO(vojta): remove "version" (only for B-C)
107
96
browser_version : args . browser_version || args . version || 'latest' ,
108
97
url : url + '?id=' + id + '&return_url=about:blank' ,
109
- 'browserstack.tunnel' : true
98
+ 'browserstack.tunnel' : true ,
99
+ timeout : bsConfig . timeout ,
100
+ project : bsConfig . project ,
101
+ name : bsConfig . name || 'Karma test' ,
102
+ build : bsConfig . build || process . env . TRAVIS_BUILD_NUMBER || process . env . BUILD_NUMBER ||
103
+ process . env . BUILD_TAG || process . env . CIRCLE_BUILD_NUM || null
110
104
} ;
111
105
112
- if ( bsConfig ) {
113
- if ( bsConfig . timeout ) {
114
- settings . timeout = bsConfig . timeout ;
115
- }
116
- if ( bsConfig . name ) {
117
- settings . name = bsConfig . name ;
118
- }
119
- if ( bsConfig . build ) {
120
- settings . build = bsConfig . build ;
121
- }
122
- if ( bsConfig . project ) {
123
- settings . project = bsConfig . project ;
124
- }
125
- }
126
-
127
106
this . url = url ;
128
107
tunnel . then ( function ( ) {
129
108
client . createWorker ( settings , function ( error , worker ) {
0 commit comments