diff --git a/README.md b/README.md index 255bf5f097..65e95e279d 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ For details on what's coming next, see our [development roadmap](roadmap.md). |Chrome¹ |**Y** |**Y** |**Y** |**Y** |**Native**|**Y** | - | |Firefox¹ |**Y** |**Y** |**Y** |untested⁵|**Native**| - | - | |Edge¹ |**Y** | - | - | - | - | - | - | -|Edge Chromium|**Y** |**Y** | - |untested⁵|**Native**| - | - | +|Edge Chromium|**Y** |**Y** |**Y** |untested⁵|**Native**| - | - | |IE ≤ 10 | N | - | - | - | - | - | - | |IE 11 |**Y** ⁴ | - | - | - | - | - | - | |Safari¹ | - |**Y** | - | - |**iPadOS 13
Native**| - | - | diff --git a/build/test.py b/build/test.py index a51e8416ab..405c068016 100755 --- a/build/test.py +++ b/build/test.py @@ -74,13 +74,13 @@ def _GetDefaultBrowsers(): # For MP4 support on Linux Firefox, install gstreamer1.0-libav. # Opera on Linux only supports MP4 for Ubuntu 15.04+, so it is not in the # default list of browsers for Linux at this time. - return ['Chrome','Firefox'] + return ['Chrome','Edge','Firefox'] if shakaBuildHelpers.is_darwin(): - return ['Chrome','Firefox','Safari'] + return ['Chrome','Edge','Firefox','Safari'] if shakaBuildHelpers.is_windows() or shakaBuildHelpers.is_cygwin(): - return ['Chrome','Firefox','IE'] + return ['Chrome','Edge','Firefox','IE'] raise Error('Unrecognized system: %s' % platform.uname()[0]) diff --git a/karma.conf.js b/karma.conf.js index acb0aa9bf0..48f488fdb4 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -70,6 +70,7 @@ module.exports = (config) => { plugins: [ 'karma-*', // default plugins + '@*/karma-*', // default scoped plugins // An inline plugin which supplies the webdriver-screenshot middleware. { diff --git a/package.json b/package.json index 77fc43a52a..34c5f486e5 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ } ], "devDependencies": { + "@chiragrupani/karma-chromium-edge-launcher": "^2.1.0", "@teppeis/clutz": "^1.0.29-4c95e12.v20190929", "awesomplete": "^1.1.4", "babel-core": "^6.26.3", @@ -33,7 +34,7 @@ "jasmine-ajax": "^4.0.0", "jimp": "^0.11.0", "jsdoc": "github:joeyparrish/jsdoc#45c271fa", - "karma": "^6.1.1", + "karma": "^6.2.0", "karma-babel-preprocessor": "^7.0.0", "karma-chrome-launcher": "^2.2.0", "karma-coverage": "^1.1.2",