Chromium Code Reviews| Index: karma.conf.js |
| diff --git a/karma.conf.js b/karma.conf.js |
| index f0ebe6ce031ff19a38cb717b679f195c46820836..2d532036221f4998005f0f76313abb5527f534f8 100644 |
| --- a/karma.conf.js |
| +++ b/karma.conf.js |
| @@ -28,7 +28,7 @@ module.exports = function(config) { |
| 'test/codegen/expect/matcher/src/*.js', |
| 'test/codegen/expect/unittest/unittest.js', |
| 'test/codegen/expect/syncstar_syntax.js', |
| - 'test/codegen/expect/language/*.js', |
| + 'test/codegen/expect/language-all.js', |
|
vsm
2015/12/14 01:15:07
Karma ships each file as a separate script tag. F
|
| 'test/codegen/expect/language/sub/sub.js', |
| 'test/codegen/expect/language/*.lib', |
| 'test/browser/*.js', |
| @@ -86,7 +86,7 @@ module.exports = function(config) { |
| }, |
| }, |
| - browsers: ['Chrome'], |
| + browsers: ['ChromeCanary', 'Electron'], |
| // Continuous Integration mode |
| // if true, Karma captures browsers, runs the tests and exits |
| @@ -94,7 +94,7 @@ module.exports = function(config) { |
| }; |
| if (process.env.TRAVIS) { |
| - configuration.browsers = ['chrome_canary_travis']; |
| + configuration.browsers = ['chrome_canary_travis', 'Electron']; |
| configuration.autoWatch = false; |
| // Enable this for more logging on Travis. It is too much for Travis to |
| // automatically display, but still results in a downloadable raw log. |