@forbesjo removed android/ios tests to increase build stability. closes

videojs#2739
jgubman · Oct 26, 2015 · c85b526 · c85b526
1 parent 4598b38
commit c85b526
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 * @typcn bumped grunt-sass to ^1.0.0 to support node 4.x ([view](https://github.com/videojs/video.js/pull/2645))
 * @gkatsev removed unhelpful isCrossOrigin test ([view](https://github.com/videojs/video.js/pull/2715))
 * @forbesjo updated karma to use all installed browsers for unit tests ([view](https://github.com/videojs/video.js/pull/2708))
+* @forbesjo removed android/ios tests to increase build stability ([view](https://github.com/videojs/video.js/pull/2739))
 
 --------------------
 

diff --git a/build/grunt.js b/build/grunt.js
@@ -159,9 +159,7 @@ module.exports = function(grunt) {
       ie11_bs:      { browsers: ['ie11_bs'] },
       ie10_bs:      { browsers: ['ie10_bs'] },
       ie9_bs:       { browsers: ['ie9_bs'] },
-      ie8_bs:       { browsers: ['ie8_bs'] },
-      android_bs:   { browsers: ['android_bs'] },
-      ios_bs:       { browsers: ['ios_bs'] }
+      ie8_bs:       { browsers: ['ie8_bs'] }
     },
     vjsdocs: {
       all: {

diff --git a/test/karma.conf.js b/test/karma.conf.js
@@ -103,9 +103,7 @@ module.exports = function(config) {
         'ie11_bs',
         'ie10_bs',
         'ie9_bs',
-        'ie8_bs',
-        'android_bs',
-        'ios_bs'
+        'ie8_bs'
       ];
     } else {
       settings.browsers = ['Firefox'];
@@ -168,18 +166,6 @@ 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'
     }
   };
 }