Merge branch 'master' into image-errors

Conflicts:
	test/mammoth.tests.js

1 files changed, 10 insertions, 12 deletions

diff --git a/test/zipfile.tests.js b/test/zipfile.tests.js
index 1a0ab99..c838548 100644
--- a/test/zipfile.tests.js
+++ b/test/zipfile.tests.js
@@ -2,20 +2,18 @@ var assert = require("assert");
 
 var JSZip = require("jszip");
 
-var test = require("./testing").test;
+var test = require("./test")(module);
 var zipfile = require("../lib/zipfile");
 
-describe("zipfile", function() {
-    test('file in zip can be read after being written', function() {
-        var zip = emptyZipFile();
-        assert(!zip.exists("song/title"));
-        
-        zip.write("song/title", "Dark Blue");
-        
-        assert(zip.exists("song/title"));
-        return zip.read("song/title", "utf8").then(function(contents) {
-            assert.equal(contents, "Dark Blue");
-        });
+test('file in zip can be read after being written', function() {
+    var zip = emptyZipFile();
+    assert(!zip.exists("song/title"));
+    
+    zip.write("song/title", "Dark Blue");
+    
+    assert(zip.exists("song/title"));
+    return zip.read("song/title", "utf8").then(function(contents) {
+        assert.equal(contents, "Dark Blue");
     });
 });