Skip to content

Commit

Permalink
Test Edge
Browse files Browse the repository at this point in the history
  • Loading branch information
malonecj committed Aug 29, 2018
1 parent ad09114 commit 72ca61a
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 12 deletions.
13 changes: 2 additions & 11 deletions config/karma.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'airbnb-js-shims/target/es2015';
var webpack = require('webpack');
var webpackConfig = require('./webpack.common.config.js');
var RewirePlugin = require("rewire-webpack");
Expand All @@ -25,7 +24,7 @@ module.exports = function (config) {
return BROWSERS.split(',');
}
if(RELEASE){
browsers = ['Chrome','Firefox','IE']
browsers = ['Chrome','Firefox','Edge']
}else if(DEBUG){
browsers = ['ChromeDebugging'];
}
Expand Down Expand Up @@ -149,7 +148,7 @@ module.exports = function (config) {
'karma-chrome-launcher',
'karma-firefox-launcher',
'karma-phantomjs-launcher-nonet',
'karma-ie-launcher',
'karma-edge-launcher',
'karma-jasmine',
'karma-jasmine-matchers',
'karma-webpack',
Expand All @@ -158,14 +157,6 @@ module.exports = function (config) {
],

customLaunchers: {
IE9: {
base: 'IE',
'x-ua-compatible': 'IE=EmulateIE9'
},
IE8: {
base: 'IE',
'x-ua-compatible': 'IE=EmulateIE8'
},
ChromeDebugging: {
base: 'Chrome',
flags: [ '--remote-debugging-port=9333' ],
Expand Down
15 changes: 15 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
"shallowequal": "^1.1.0"
},
"devDependencies": {
"airbnb-js-shims": "^2.1.0",
"avcoveralls": "^1.0.0",
"babel-core": "^6.26.3",
"babel-eslint": "^4.1.6",
Expand Down Expand Up @@ -72,6 +71,7 @@
"karma": "^1.1.0",
"karma-chrome-launcher": "^0.2.0",
"karma-coverage": "^0.4.0",
"karma-edge-launcher": "^0.4.2",
"karma-firefox-launcher": "^0.1.3",
"karma-ie-launcher": "^1.0.0",
"karma-jasmine": "^1.1.2",
Expand Down

0 comments on commit 72ca61a

Please sign in to comment.