Hardcode browser config

Because of http://stackoverflow.com/questions/22397300/travis-and-matrix-combinations
colejona · Oct 11, 2016 · d8e0303 · d8e0303
1 parent 0e1e392
commit d8e0303
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ node_js:
 - 5.4.1
 script: npm install && npm run build && npm run testfunc
 env:
-- "TEST_BROWSER_CONFIG={'name': 'chrome', 'version': '53.0', 'platform': 'Windows 10'}"
 - "TEST_STREAM={'url': 'http://www.streambox.fr/playlists/test_001/stream.m3u8', 'description': 'ARTE China,ABR', 'live': false , 'abr': true}"
 - "TEST_STREAM={'url': 'http://www.streambox.fr/playlists/x36xhzz/x36xhzz.m3u8', 'description': 'big buck bunny,ABR', 'live': false, 'abr': false}"
 - "TEST_STREAM={'url': 'http://www.streambox.fr/playlists/x36xhzz/url_6/193039199_mp4_h264_aac_hq_7.m3u8', 'description': 'big buck bunny,480p', 'live': false, 'abr': false}"

diff --git a/tests/functional/auto/hlsjs.js b/tests/functional/auto/hlsjs.js
@@ -4,12 +4,12 @@ var webdriver = require("selenium-webdriver");
 var chromedriver = require("chromedriver");
 var HttpServer = require("http-server");
 
-var onTravis = !!process.env.TRAVIS
+var onTravis = !!process.env.TRAVIS;
 var STREAM = onTravis ? JSON.parse(process.env.TEST_STREAM) : { url : 'http://www.streambox.fr/playlists/test_001/stream.m3u8', description : 'ARTE China,ABR', live : false , abr : true};
 if (!STREAM) {
   throw new Error("No stream.");
 }
-var BROWSER_CONFIG = onTravis ? JSON.parse(process.env.TEST_BROWSER_CONFIG) : { name : 'chrome' } 
+var BROWSER_CONFIG = onTravis ? {name : 'chrome', version : '53.0', platform : 'Windows 10'} : { name : 'chrome' };
 
 var browserDescription = BROWSER_CONFIG.name;
 if (BROWSER_CONFIG.version) {