File tree Expand file tree Collapse file tree 3 files changed +27
-20
lines changed
Expand file tree Collapse file tree 3 files changed +27
-20
lines changed Original file line number Diff line number Diff line change 1+ dist : xenial
12language : node_js
2- node_js :
3- - lts/*
3+ cache : npm
44before_install :
55 - npm install -g greenkeeper-lockfile@1
6- - export CHROME_BIN=/usr/bin/google-chrome
6+ before_script :
77 - export DISPLAY=:99.0
88 - sh -e /etc/init.d/xvfb start
9- before_script : greenkeeper-lockfile-update
9+ - greenkeeper-lockfile-update
1010after_script : greenkeeper-lockfile-upload
11-
1211after_failure :
1312 - npm ls --depth=1
1413after_success :
1514 - npm run assets
15+ addons :
16+ chrome : stable
17+
18+ env :
19+ global :
20+ - secure : K6JpKwMkfNaJix3Bb0tLjVMzHMJgtBXdd/dvfw1BMb9DCBpd81PqXbDs7yXCddUxnUPTBPxZCrQgWsw71Wn+qEoIG5MU3uOT5A2rBbx/yZonVAGv5ed/9w0xk0OzO383CmPMFqwqtp9YmdmqGjQBkYXVXJjTvNTOAExFSdhO+3U=
21+ - secure : GIbhjUJapvC70nIZVlhVyK+3KAD2TVKpiY/q412OO7V2izbvcM1tvU3LBoMZbROzrt5TT84tCoJDvHnrpL0OvxPwrzL5CUU7h4UTxhTOyQkEinbYAnWlW9wdrvtdczsEvANkFPqBZ53B3hVHZHMLOG8QRWaTBicF68vSHEJFqb4=
22+
1623notifications :
1724 irc :
1825 channels :
@@ -23,17 +30,4 @@ notifications:
2330 - http://pam.videojs.com/savage/travis
2431 slack :
2532 secure : LrF8K6mCYWlUt6SvdbGHazyQZSk/opKoiB/wgoGYaGc9+3wYXkVexY0WkO1m6wBKhUqXRAMVMFszr1wqKgdcxtItmFMMj8HqTLI1MVqgKqYX4Ux3CnEHJQiwxIk0aVL7lHLsZTXV/2Y0QIOYmAnCrgy46klETrk0ZuXf5okpu2Q=
26- env :
27- global :
28- - secure : K6JpKwMkfNaJix3Bb0tLjVMzHMJgtBXdd/dvfw1BMb9DCBpd81PqXbDs7yXCddUxnUPTBPxZCrQgWsw71Wn+qEoIG5MU3uOT5A2rBbx/yZonVAGv5ed/9w0xk0OzO383CmPMFqwqtp9YmdmqGjQBkYXVXJjTvNTOAExFSdhO+3U=
29- - secure : GIbhjUJapvC70nIZVlhVyK+3KAD2TVKpiY/q412OO7V2izbvcM1tvU3LBoMZbROzrt5TT84tCoJDvHnrpL0OvxPwrzL5CUU7h4UTxhTOyQkEinbYAnWlW9wdrvtdczsEvANkFPqBZ53B3hVHZHMLOG8QRWaTBicF68vSHEJFqb4=
30- sudo : false
31- dist : trusty
32- cache :
33- directories :
34- - node_modules
35- addons :
36- firefox : latest
37- apt :
38- packages :
39- - google-chrome-stable
33+
Original file line number Diff line number Diff line change @@ -7,6 +7,10 @@ module.exports = function(config) {
77 // see https://github.com/videojs/videojs-generate-karma-config
88 // for options
99 const options = {
10+ travisLaunchers ( defaults ) {
11+ delete defaults . travisFirefox ;
12+ return defaults ;
13+ } ,
1014 serverBrowsers ( defaults ) {
1115 return [ ] ;
1216 } ,
@@ -15,6 +19,15 @@ module.exports = function(config) {
1519
1620 config = generate ( config , options ) ;
1721
22+ config . proxies = config . proxies || { } ;
23+
24+ // disable warning logs for sourceset tests, by proxing to a remote host
25+ Object . assign ( config . proxies , {
26+ '/test/relative-one.mp4' : 'http://example.com/relative-one.mp4' ,
27+ '/test/relative-two.mp4' : 'http://example.com/relative-two.mp4' ,
28+ '/test/relative-three.mp4' : 'http://example.com/relative-three.mp4'
29+ } ) ;
30+
1831 config . files = [
1932 'dist/video-js.css' ,
2033 'test/globals-shim.js' ,
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ const blobSrc = {
1414 type : 'video/mp4'
1515} ;
1616const testSrc = {
17- src : 'http://vjs.zencdn.net/v/oceans .mp4' ,
17+ src : 'http://example.com/testSrc .mp4' ,
1818 type : 'video/mp4'
1919} ;
2020const sourceOne = { src : 'http://example.com/one.mp4' , type : 'video/mp4' } ;
You can’t perform that action at this time.
0 commit comments