File tree Expand file tree Collapse file tree 2 files changed +16
-25
lines changed
Expand file tree Collapse file tree 2 files changed +16
-25
lines changed Original file line number Diff line number Diff line change @@ -89,7 +89,7 @@ module.exports = (config) => {
8989
9090 client : {
9191 mocha : {
92- timeout : 5000
92+ timeout : 10000
9393 }
9494 } ,
9595
Original file line number Diff line number Diff line change @@ -4,29 +4,20 @@ const slSettings = require('@advanced-rest-client/testing-karma-sl/sl-settings.j
44const createBaseConfig = require ( './karma.conf.js' ) ;
55
66module . exports = ( config ) => {
7- const cnf = slSettings ( ) ;
8- cnf . sauceLabs . testName = 'api-console' ;
9- cnf . browsers = [
10- 'SL_Chrome' ,
11- 'SL_Chrome-1' ,
12- 'SL_Firefox' ,
13- 'SL_Firefox-1' ,
14- 'SL_Safari' ,
15- // 'SL_EDGE'
16- ] ;
17- if ( process . env . TRAVIS ) {
18- const buildLabel = 'TRAVIS #' + process . env . TRAVIS_BUILD_NUMBER + ' (' + process . env . TRAVIS_BUILD_ID + ')' ;
19-
20- cnf . browserStack = {
21- build : buildLabel ,
22- tunnelIdentifier : process . env . TRAVIS_JOB_NUMBER
23- } ;
24-
25- cnf . sauceLabs . build = buildLabel ;
26- cnf . sauceLabs . tunnelIdentifier = process . env . TRAVIS_JOB_NUMBER ;
27- }
28-
29- config . set ( merge ( createBaseConfig ( config ) , cnf ) ) ;
30-
7+ const slConfig = merge ( slSettings ( config ) , {
8+ sauceLabs : {
9+ testName : 'api-console' ,
10+ } ,
11+ } ) ;
12+ // slConfig.browsers = [
13+ // 'SL_Chrome',
14+ // 'SL_Chrome-1',
15+ // 'SL_Firefox',
16+ // 'SL_Firefox-1',
17+ // 'SL_Safari',
18+ // 'SL_Safari-1',
19+ // 'SL_EDGE',
20+ // ];
21+ config . set ( merge ( createBaseConfig ( config ) , slConfig ) ) ;
3122 return config ;
3223} ;
You can’t perform that action at this time.
0 commit comments