diff options
author | Pierre Ossman <ossman@cendio.se> | 2018-07-13 15:06:34 +0200 |
---|---|---|
committer | Pierre Ossman <ossman@cendio.se> | 2018-07-16 13:32:35 +0200 |
commit | 7bcdbbc65b163f953ee4b113144bf68670fe8245 (patch) | |
tree | c34d793f6db79c5228144dc4c6840df188bfe768 /karma.conf.js | |
parent | 800abf12772cba42a5515356a9156802fe1f2af2 (diff) | |
download | novnc-7bcdbbc65b163f953ee4b113144bf68670fe8245.tar.gz |
Stop transpiling karma tests
This runs our code in the same manner as it would be used if loaded
directly in the browser. Includes the same kind of fallback for older
browsers.
Diffstat (limited to 'karma.conf.js')
-rw-r--r-- | karma.conf.js | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/karma.conf.js b/karma.conf.js index a455a9c..5cbd7a5 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -4,7 +4,6 @@ module.exports = (config) => { const customLaunchers = {}; let browsers = []; let useSauce = false; - let transpileToES5 = ['internet explorer'].includes(process.env.TEST_BROWSER_NAME); // use Sauce when running on Travis if (process.env.TRAVIS_JOB_NUMBER) { @@ -53,7 +52,7 @@ module.exports = (config) => { // frameworks to use // available frameworks: https://npmjs.org/browse/keyword/karma-adapter - frameworks: ['requirejs', 'mocha', 'sinon-chai'], + frameworks: ['mocha', 'sinon-chai'], // list of files / patterns to load in the browser (loaded in order) files: [ @@ -61,9 +60,11 @@ module.exports = (config) => { { pattern: 'app/webutil.js', included: false }, { pattern: 'core/**/*.js', included: false }, { pattern: 'vendor/pako/**/*.js', included: false }, + { pattern: 'vendor/browser-es-module-loader/dist/*.js*', included: false }, { pattern: 'tests/test.*.js', included: false }, { pattern: 'tests/fake.*.js', included: false }, { pattern: 'tests/assertions.js', included: false }, + 'vendor/promise.js', 'tests/karma-test-main.js', ], @@ -85,26 +86,6 @@ module.exports = (config) => { // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher browsers: browsers, - // preprocess matching files before serving them to the browser - // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor - preprocessors: { - 'app/localization.js': ['babel'], - 'app/webutil.js': ['babel'], - 'core/**/*.js': ['babel'], - 'tests/test.*.js': ['babel'], - 'tests/fake.*.js': ['babel'], - 'tests/assertions.js': ['babel'], - 'vendor/pako/**/*.js': ['babel'], - }, - - babelPreprocessor: { - options: { - presets: transpileToES5 ? ['es2015'] : [], - plugins: ['transform-es2015-modules-amd', 'syntax-dynamic-import'], - sourceMap: 'inline', - }, - }, - // test results reporter to use // possible values: 'dots', 'progress' // available reporters: https://npmjs.org/browse/keyword/karma-reporter |