44var wd = require ( 'wd' ) ;
55wd . configureHttp ( { timeout : 180000 } ) ; // 3 minutes
66
7- var sauceConnectLauncher = require ( 'sauce-connect-launcher' ) ;
87var selenium = require ( 'selenium-standalone' ) ;
98var querystring = require ( "querystring" ) ;
109
@@ -14,9 +13,6 @@ var devserver = require('./dev-server.js');
1413
1514var testTimeout = 30 * 60 * 1000 ;
1615
17- var username = process . env . SAUCE_USERNAME ;
18- var accessKey = process . env . SAUCE_ACCESS_KEY ;
19-
2016var SELENIUM_VERSION = process . env . SELENIUM_VERSION || '3.141.0' ;
2117var CHROME_BIN = process . env . CHROME_BIN ;
2218var FIREFOX_BIN = process . env . FIREFOX_BIN ;
@@ -25,7 +21,7 @@ var FIREFOX_BIN = process.env.FIREFOX_BIN;
2521var bail = process . env . BAIL !== '0' ;
2622
2723// process.env.CLIENT is a colon separated list of
28- // (saucelabs| selenium) :browserName:browserVerion:platform
24+ // selenium:browserName:browserVerion:platform
2925var tmp = ( process . env . CLIENT || 'selenium:firefox' ) . split ( ':' ) ;
3026var client = {
3127 runner : tmp [ 0 ] || 'selenium' ,
@@ -50,13 +46,9 @@ if (process.env.PERF) {
5046
5147var qs = { remote : 1 } ;
5248
53- var sauceClient ;
54- var sauceConnectProcess ;
49+ var seleniumClient ;
5550var tunnelId = process . env . TRAVIS_JOB_NUMBER || 'tunnel-' + Date . now ( ) ;
5651
57- if ( client . runner === 'saucelabs' ) {
58- qs . saucelabs = true ;
59- }
6052if ( process . env . INVERT ) {
6153 qs . invert = process . env . INVERT ;
6254}
@@ -112,41 +104,15 @@ function startSelenium(callback) {
112104 process . exit ( 1 ) ;
113105 }
114106 selenium . start ( opts , function ( ) {
115- sauceClient = wd . promiseChainRemote ( ) ;
107+ seleniumClient = wd . promiseChainRemote ( ) ;
116108 callback ( ) ;
117109 } ) ;
118110 } ) ;
119111}
120112
121- function startSauceConnect ( callback ) {
122-
123- var options = {
124- username : username ,
125- accessKey : accessKey ,
126- tunnelIdentifier : tunnelId
127- } ;
128-
129- sauceConnectLauncher ( options , function ( err , sauceProcess ) {
130- if ( err ) {
131- console . error ( 'Failed to connect to saucelabs' ) ;
132- console . error ( err ) ;
133- return process . exit ( 1 ) ;
134- }
135- sauceConnectProcess = sauceProcess ;
136- sauceClient = wd . promiseChainRemote ( "localhost" , 4445 , username , accessKey ) ;
137- callback ( ) ;
138- } ) ;
139- }
140-
141113function closeClient ( callback ) {
142- sauceClient . quit ( ) . then ( function ( ) {
143- if ( sauceConnectProcess ) {
144- sauceConnectProcess . close ( function ( ) {
145- callback ( ) ;
146- } ) ;
147- } else {
148- callback ( ) ;
149- }
114+ seleniumClient . quit ( ) . then ( function ( ) {
115+ callback ( ) ;
150116 } ) ;
151117}
152118
@@ -244,29 +210,29 @@ function startTest() {
244210 new MochaSpecReporter ( runner ) ;
245211 new BenchmarkReporter ( runner ) ;
246212
247- sauceClient . init ( opts , function ( err ) {
213+ seleniumClient . init ( opts , function ( err ) {
248214 if ( err ) {
249215 testError ( err ) ;
250216 return ;
251217 }
252218 console . log ( 'Initialized' ) ;
253219
254- sauceClient . get ( testUrl , function ( err ) {
220+ seleniumClient . get ( testUrl , function ( err ) {
255221 if ( err ) {
256222 testError ( err ) ;
257223 return ;
258224 }
259225 console . log ( 'Successfully started' ) ;
260226
261- sauceClient . eval ( 'navigator.userAgent' , function ( err , userAgent ) {
227+ seleniumClient . eval ( 'navigator.userAgent' , function ( err , userAgent ) {
262228 if ( err ) {
263229 testError ( err ) ;
264230 } else {
265231 console . log ( 'Testing on:' , userAgent ) ;
266232
267233 /* jshint evil: true */
268234 var interval = setInterval ( function ( ) {
269- sauceClient . eval ( 'window.testEvents()' , function ( err , events ) {
235+ seleniumClient . eval ( 'window.testEvents()' , function ( err , events ) {
270236 if ( err ) {
271237 clearInterval ( interval ) ;
272238 testError ( err ) ;
@@ -301,9 +267,5 @@ function startTest() {
301267}
302268
303269devserver . start ( function ( ) {
304- if ( client . runner === 'saucelabs' ) {
305- startSauceConnect ( startTest ) ;
306- } else {
307- startSelenium ( startTest ) ;
308- }
270+ startSelenium ( startTest ) ;
309271} ) ;
0 commit comments