web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2024-11-24 08:42:25 +02:00
Code Releases Activity

@forbesjo added Android and iOS browser testing. closes #2538

Browse Source
This commit is contained in:
jforbes 2015-09-14 15:55:01 -07:00 committed by heff
parent 2c74d9e355
commit 2e1d051144
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -126,6 +126,7 @@ CHANGELOG
* @gkatsev made all sass variables !default ([view](https://github.com/videojs/video.js/pull/2574))
* @heff fixed the inline volume control and made it the default ([view](https://github.com/videojs/video.js/pull/2553))
* @forbesjo fixed webkit deprecation warnings ([view](https://github.com/videojs/video.js/pull/2558))
* @forbesjo added Android and iOS browser testing ([view](https://github.com/videojs/video.js/pull/2538))
--------------------

4
grunt.js
View File

@ -156,7 +156,9 @@ module.exports = function(grunt) {
ie11_bs: { browsers: ['ie11_bs'] },
ie10_bs: { browsers: ['ie10_bs'] },
ie9_bs: { browsers: ['ie9_bs'] },
ie8_bs: { browsers: ['ie8_bs'] }
ie8_bs: { browsers: ['ie8_bs'] },
android_bs: { browsers: ['android_bs'] },
ios_bs: { browsers: ['ios_bs'] }
},
vjsdocs: {
all: {

22
test/karma.conf.js
View File

@ -59,12 +59,12 @@ module.exports = function(config) {
runnerPort: 9100,
colors: true,
logLevel: config.LOG_INFO,
captureTimeout: 60000,
browserNoActivityTimeout: 60000,
captureTimeout: 300000,
browserNoActivityTimeout: 300000,
browserStack: {
name: process.env.TRAVIS_BUILD_NUMBER + process.env.TRAVIS_BRANCH,
pollingTimeout: 10000
pollingTimeout: 30000
},
customLaunchers: getCustomLaunchers(),
@ -99,7 +99,9 @@ module.exports = function(config) {
'ie11_bs',
'ie10_bs',
'ie9_bs',
'ie8_bs'
'ie8_bs',
'android_bs',
'ios_bs'
];
} else {
settings.browsers = ['Firefox'];
@ -162,6 +164,18 @@ function getCustomLaunchers(){
browser_version: '8',
os: 'Windows',
os_version: '7'
},
android_bs: {
base: 'BrowserStack',
os: 'android',
os_version: '4.4'
},
ios_bs: {
base: 'BrowserStack',
os: 'ios',
os_version: '8.3'
}
};
}