Skip to content

Commit

Permalink
test: Allow testing with Edge Chromium in Karma (#3265)
Browse files Browse the repository at this point in the history
  • Loading branch information
Álvaro Velad Galván committed Mar 30, 2021
1 parent 229b638 commit e610806
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -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<br>Native**| - | - |
Expand Down
6 changes: 3 additions & 3 deletions build/test.py
Expand Up @@ -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])

Expand Down
1 change: 1 addition & 0 deletions karma.conf.js
Expand Up @@ -70,6 +70,7 @@ module.exports = (config) => {

plugins: [
'karma-*', // default plugins
'@*/karma-*', // default scoped plugins

// An inline plugin which supplies the webdriver-screenshot middleware.
{
Expand Down
3 changes: 2 additions & 1 deletion package.json
Expand Up @@ -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",
Expand All @@ -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",
Expand Down

0 comments on commit e610806

Please sign in to comment.