Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tests/fix travis #5627

Merged
merged 4 commits into from Nov 28, 2018
Merged

Tests/fix travis #5627

merged 4 commits into from Nov 28, 2018

Conversation

@brandonocasey
Copy link
Contributor

@brandonocasey brandonocasey commented Nov 28, 2018

This pull request does three things:

  1. This should fix tests on travis by stopping tests from running on Firefox in travis. Tests will still run on browserstack Firefox. Testing on firefox was added in #5528, an investigation issue to get this working has been created as #5626

  2. This pull request also updates the travis config as outlined in: https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration

  3. Finally this pull request silences the logging from sourceset tests

Fixes #5616

language: node_js
node_js:
- lts/*
cache: npm
Copy link
Contributor Author

@brandonocasey brandonocasey Nov 28, 2018

Travis now supports a better method of cacheing


// disable warning logs for sourceset tests, by proxing to a remote host
Object.assign(config.proxies, {
'/test/relative-one.mp4': 'http://example.com/relative-one.mp4',
Copy link
Contributor Author

@brandonocasey brandonocasey Nov 28, 2018

This fixes warning logs in karma

@@ -14,7 +14,7 @@ const blobSrc = {
type: 'video/mp4'
};
const testSrc = {
src: 'http://vjs.zencdn.net/v/oceans.mp4',
src: 'http://example.com/testSrc.mp4',
Copy link
Contributor Author

@brandonocasey brandonocasey Nov 28, 2018

We should just point to a fake source

@gkatsev
Copy link
Member

@gkatsev gkatsev commented Nov 28, 2018

This fixes #5616

@gkatsev gkatsev merged commit 6c1056b into videojs:master Nov 28, 2018
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

2 participants