diff options
| -rw-r--r-- | .config/karma.es6.js | 161 | ||||
| -rw-r--r-- | spec/SpecRunner.html | 6 |
2 files changed, 50 insertions, 117 deletions
diff --git a/.config/karma.es6.js b/.config/karma.es6.js index a831334..7a7a875 100644 --- a/.config/karma.es6.js +++ b/.config/karma.es6.js @@ -1,115 +1,48 @@ -// Karma configuration -// Generated on Tue Oct 04 2016 13:53:46 GMT+0200 (CEST) - -module.exports = function(config) { - config.set({ - - // base path that will be used to resolve all patterns (eg. files, exclude) - basePath: '../', - - // frameworks to use - // available frameworks: https://npmjs.org/browse/keyword/karma-adapter - frameworks: ['jasmine'], - - - // list of files / patterns to load in the browser - files: [ - 'spec/RAFPlugin.js', - { - pattern: 'spec/fixtures/fixture.css', - included: false, - served: true - }, - { - pattern: 'spec/fixtures/pixel.png', - included: false, - served: true - }, - { - pattern: 'src/**/*.js', - included: false, - served: true, - type: 'modules' - }, - { - pattern: 'spec/helpers.js', - included: false, - served: true, - type: 'module' - }, - { - pattern: 'spec/setupBrowser.js', - included: true, - type: 'module' - }, - { - pattern: 'spec/spec/types/*.js', - included: true, - type: 'module' - } - ], - - proxies: { - '/fixtures/': '/base/spec/fixtures/' - }, - - - // list of files to exclude - exclude: [], - - - // preprocess matching files before serving them to the browser - // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor - preprocessors: { - // 'src/**/*.js': ['coverage'] - }, - - - // test results reporter to use - // possible values: 'dots', 'progress' - // available reporters: https://npmjs.org/browse/keyword/karma-reporter - reporters: ['progress'/*, 'coverage'*/], - - - // configure the coverage reporter - coverageReporter: { - // Specify a reporter type. - type: 'lcov', - dir: 'coverage/', - subdir: function(browser) { - // normalization process to keep a consistent browser name accross different OS - return browser.toLowerCase().split(/[ /-]/)[0]; // output the results into: './coverage/firefox/' - } - }, - - - // web server port - port: 9876, - - - // enable / disable colors in the output (reporters and logs) - colors: true, - - - // level of logging - // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG - logLevel: config.LOG_INFO, - - - // enable / disable watching file and executing tests whenever any file changes - autoWatch: false, - - - // start these browsers - // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher - browsers: [/*'ChromeHeadless', */'FirefoxHeadless'], - - // Continuous Integration mode - // if true, Karma captures browsers, runs the tests and exits - singleRun: false, - - // Concurrency level - // how many browser should be started simultaneous - concurrency: Infinity - }) +const karmaCommon = require('./karma.conf.common.js') + +module.exports = function (config) { + config.set( + Object.assign(karmaCommon(config), { + files: [ + 'spec/RAFPlugin.js', + { + pattern: 'spec/fixtures/fixture.css', + included: false, + served: true + }, + { + pattern: 'spec/fixtures/pixel.png', + included: false, + served: true + }, + { + pattern: 'src/**/*.js', + included: false, + served: true, + type: 'modules' + }, + { + pattern: 'spec/helpers.js', + included: false, + served: true, + type: 'module' + }, + { + pattern: 'spec/setupBrowser.js', + included: true, + type: 'module' + }, + { + pattern: 'spec/spec/types/*.js', + included: true, + type: 'module' + } + ], + + reporters: ['progress'], + browsers: ['ChromeHeadless', 'FirefoxHeadless'], + singleRun: false, + concurrency: Infinity + }) + ) } diff --git a/spec/SpecRunner.html b/spec/SpecRunner.html index c0bea56..e757924 100644 --- a/spec/SpecRunner.html +++ b/spec/SpecRunner.html @@ -56,9 +56,9 @@ <!-- include spec files here... --> - <script src="es5TestBundle.js"></script> + <!--<script src="es5TestBundle.js"></script>--> - <!-- <script src="spec/adopter.js"></script> + <script src="spec/adopter.js"></script> <script src="spec/arrange.js"></script> <script src="spec/array.js"></script> <script src="spec/bare.js"></script> @@ -104,6 +104,6 @@ <script src="spec/morphing.js"></script> <script src="spec/animator.js"></script> <script src="spec/runner.js"></script> - <script src="spec/queue.js"></script> --> + <script src="spec/queue.js"></script> </body> </html> |