Merge branch 'master' into image-errors

Conflicts:
	test/mammoth.tests.js

1 files changed, 0 insertions, 10 deletions

diff --git a/test/testing.js b/test/testing.js
index d70f86e..cb37777 100644
--- a/test/testing.js
+++ b/test/testing.js
@@ -3,22 +3,12 @@ var fs = require("fs");
 var promises = require("../lib/promises");
 var _ = require("underscore");
 
-exports.test = test;
 exports.testPath = testPath;
 exports.testData = testData;
 exports.createFakeDocxFile = createFakeDocxFile;
 exports.createFakeFiles = createFakeFiles;
 
 
-function test(name, func) {
-    it(name, function(done) {
-        var result = func();
-        promises.when(result).then(function() {
-            done();
-        }).done();
-    });
-}
-
 function testPath(filename) {
     return path.join(__dirname, "test-data", filename);
 }