Adding better webpack bundling for tests and sinon support.

dzearing · dzearing · commit 488dd4d4517e · 2016-01-07T16:09:54.000-08:00
diff --git a/README.md b/README.md
@@ -141,6 +141,19 @@ Building the source will drop under the 'lib' folder, preserving the directory s
   **/*.d.ts - All typescript definitions will be dropped as well.
 ```
 
+# Tests
+
+In order for tests to work, we need to create a webpack bundle of all the tests and their dependencies. This process requires a tests.js file at
+your src root that has the following content:
+
+```typescript
+// require all modules ending in ".test." from the
+// current directory and all subdirectories
+
+var testsContext = require.context('../../lib', true, /.test.$/);
+
+testsContext.keys().forEach(testsContext);
+```
 
 # Adding custom build tasks to the task dependency tree
 
diff --git a/karma.conf.js b/karma.conf.js
@@ -7,8 +7,9 @@ let build = require('./lib/index');
 let testConfig = build.config.test;
 let path = require('path');
 let bindPolyfillPath = require.resolve('phantomjs-polyfill/bind-polyfill.js');
+let debugRun = (process.argv.indexOf('--debug') > -1);
 
-module.exports = function(config) {
+module.exports = function (config) {
 
   config.set({
 
@@ -18,12 +19,11 @@ module.exports = function(config) {
 
     // frameworks to use
     // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
-    //frameworks: ['mocha', 'common_js'],
-    frameworks: ['mocha'],
+    frameworks: testConfig.frameworks,
 
 
     // list of files / patterns to load in the browser
-    files: [ bindPolyfillPath ].concat(testConfig.paths.include),
+    files: [bindPolyfillPath].concat(testConfig.paths.include),
 
 
     // list of files to exclude
@@ -33,8 +33,7 @@ module.exports = function(config) {
     // preprocess matching files before serving them to the browser
     // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
     preprocessors: {
-      'lib/**/!(*.test).js': ['coverage', 'webpack'],
-      '**/*.test.js': ['webpack']
+      [ testConfig.paths.include[0] ]: [ 'webpack' ]
     },
 
 
@@ -53,9 +52,15 @@ module.exports = function(config) {
     },
 
     webpack: {
-    // webpack configuration
+      // webpack configuration
       module: {
-        postLoaders: [{
+        loaders: [
+          {
+            test: /sinon\.js$/,
+            loader: "imports?define=>false"
+          }
+        ],
+        postLoaders: debugRun ? null : [{
           test: /\.js/,
           exclude: /(test|node_modules|bower_components)/,
           loader: require.resolve('istanbul-instrumenter-loader')
@@ -77,6 +82,7 @@ module.exports = function(config) {
 
     plugins: [
       require('karma-mocha'),
+      require('karma-sinon'),
       require('istanbul-instrumenter-loader'),
       require('karma-coverage'),
       require('karma-mocha-clean-reporter'),
diff --git a/lib/options/test.d.ts b/lib/options/test.d.ts
@@ -1,11 +1,13 @@
 export interface ITestOptions {
+    frameworks: string[];
     paths: {
         sourceMatch: string[];
         include: string[];
         exclude: string[];
     };
 }
 declare var _default: {
+    frameworks: string[];
     paths: {
         sourceMatch: string[];
         include: string[];
diff --git a/lib/options/test.js b/lib/options/test.js
@@ -1,8 +1,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
+    frameworks: ['mocha', 'sinon'],
     paths: {
         sourceMatch: ['src/**/*.js'],
-        include: ['lib/**/*.test.js'],
+        include: ['lib/tests.js'],
         exclude: []
     }
 };
diff --git a/package.json b/package.json
@@ -26,11 +26,13 @@
     "gulp-texttojs": "^1.0.2",
     "gulp-tslint": "^3.3.0",
     "gulp-typescript": "^2.9.0",
+    "istanbul-instrumenter-loader": "^0.1.3",
     "karma": "^0.13.10",
     "karma-coverage": "^0.5.2",
     "karma-mocha": "^0.2.0",
     "karma-mocha-clean-reporter": "0.0.1",
     "karma-phantomjs-launcher": "^0.2.1",
+    "karma-sinon": "^1.0.4",
     "karma-webpack": "^1.7.0",
     "lodash": "^3.10.1",
     "merge2": "^0.3.6",
@@ -40,6 +42,7 @@
     "require-dir": "^0.3.0",
     "resolve": "^1.1.6",
     "run-sequence": "^1.1.4",
+    "sinon": "^1.17.2",
     "systemjs-builder": "^0.14.9",
     "typescript": "^1.6.2",
     "webpack": "^1.12.9"
diff --git a/src/options/test.ts b/src/options/test.ts
@@ -1,4 +1,5 @@
 export interface ITestOptions {
+  frameworks: string[];
   paths: {
     sourceMatch: string[];
     include: string[];
@@ -7,9 +8,10 @@ export interface ITestOptions {
 }
 
 export default {
+  frameworks: ['mocha', 'sinon'],
   paths: {
     sourceMatch: ['src/**/*.js'],
-    include: ['lib/**/*.test.js'],
+    include: ['lib/tests.js'],
     exclude: []
   }
 };
