Implement fix for Karma prebundle

As described in the GitHub issue[1]. Unfortunately now we fail further
down the stack...

[1]: nikku/karma-browserify#63 (comment)

karma.conf.js

@@ -32,13 +32,12 @@ module.exports = function (karma) {
         browserify: {
             debug: true,
             prebundle: function (bundle) {
-                // This allows annotator-plugintools to require annotator as
-                // 'annotator' in the test environment.
-                bundle.require('./src/annotator', {expose: 'annotator'});
-                // This, for reasons that remain entirely unclear, fixes an
-                // issue where the above require doesn't seem to work, and the
-                // karma build dies saying "Cannot find module 'annotator' ..."
-                bundle.bundle();
+                // This is event is fired each time the bundle is built.
+                bundle.on('reset', function () {
+                    // This allows annotator-plugintools to require annotator
+                    // as 'annotator' in the test environment.
+                    bundle.require('./src/annotator', {expose: 'annotator'});
+                });
             }
         },
 

test/spec/annotator_spec.js

@@ -1,6 +1,6 @@
 var assert = require('assertive-chai').assert;
 
-var Annotator = require('../../src/annotator');
+var Annotator = require('annotator');
 
 describe("Annotator.noConflict()", function () {
     var _Annotator = null;

test/spec/bootstrap_spec.js

@@ -1,6 +1,6 @@
 var assert = require('assertive-chai').assert;
 
-var Annotator = require('../../src/annotator'),
+var Annotator = require('annotator'),
     $ = require('../../src/util').$;
 
 require('../../src/bootstrap');

test/spec/plugin/markdown_spec.js

@@ -1,6 +1,6 @@
 var assert = require('assertive-chai').assert;
 
-var Annotator = require('../../../src/annotator'),
+var Annotator = require('annotator'),
     Markdown = require('../../../src/plugin/markdown');
 
 var $ = Annotator.Util.$;

test/spec/plugin/tags_spec.js

@@ -1,6 +1,6 @@
 var assert = require('assertive-chai').assert;
 
-var Annotator = require('../../../src/annotator'),
+var Annotator = require('annotator'),
     Tags = require('../../../src/plugin/tags');
 
 var $ = Annotator.Util.$;

test/spec/plugin/unsupported_spec.js

@@ -1,4 +1,4 @@
-var Annotator = require('../../../src/annotator'),
+var Annotator = require('annotator'),
     Unsupported = require('../../../src/plugin/unsupported').Unsupported;
 
 describe('Unsupported plugin', function () {