fixed karma-webpack, also added jasmine-ts to run tests in pure NodeJS

This commit is contained in:
alecmerdler 2017-01-19 20:02:57 -08:00
parent 8f0f16a551
commit 8dc9cf21d7
4 changed files with 7 additions and 9 deletions

View file

@ -4,7 +4,7 @@ var webpackConfig = require('./webpack.config');
module.exports = function(config) {
config.set({
basePath: '',
frameworks: ['jasmine', 'karma-typescript'],
frameworks: ['jasmine'],
files: [
// CDN resources
'node_modules/jquery/dist/jquery.js',
@ -28,7 +28,7 @@ module.exports = function(config) {
'static/lib/**/*.js',
// Application resources
'static/js/**/*.ts*',
'static/js/**/*.spec.ts*',
// Tests utils
'static/test/**/*.js',
@ -39,7 +39,8 @@ module.exports = function(config) {
preprocessors: {
'static/lib/ngReact/react.ngReact.min.js': ['webpack'],
'static/lib/angular-moment.min.js': ['webpack'],
'static/js/**/*.ts*': ['karma-typescript'],
// 'static/js/**/*.ts*': ['karma-typescript'],
'static/js/**/*.ts*': ['webpack'],
},
webpack: {
resolve: webpackConfig.resolve,