Merge branch 'master' into image-errors

Conflicts:
	test/mammoth.tests.js

1 files changed, 19 insertions, 23 deletions

diff --git a/test/docx/notes-reader.tests.js b/test/docx/notes-reader.tests.js
index 85a49f5..1d4cf9c 100644
--- a/test/docx/notes-reader.tests.js
+++ b/test/docx/notes-reader.tests.js
@@ -4,36 +4,32 @@ var createFootnotesReader = require("../../lib/docx/notes-reader").createFootnot
 var BodyReader = require("../../lib/docx/body-reader").BodyReader;
 var documents = require("../../lib/documents");
 var XmlElement = require("../../lib/xml").Element;
-var test = require("../testing").test;
+var test = require("../test")(module);
 
 
-describe('readFootnotesXml', function() {
-    test('ID and body of footnote are read', function() {
-        var bodyReader = new BodyReader({});
-        var footnoteBody = [new XmlElement("w:p", {}, [])];
-        var footnotes = createFootnotesReader(bodyReader)(
-            new XmlElement("w:footnotes", {}, [
-                new XmlElement("w:footnote", {"w:id": "1"}, footnoteBody)
-            ])
-        );
-        assert.equal(footnotes.value.length, 1);
-        assert.deepEqual(footnotes.value[0].body, [new documents.Paragraph([])]);
-        assert.deepEqual(footnotes.value[0].noteId, "1");
-    });
+test('ID and body of footnote are read', function() {
+    var bodyReader = new BodyReader({});
+    var footnoteBody = [new XmlElement("w:p", {}, [])];
+    var footnotes = createFootnotesReader(bodyReader)(
+        new XmlElement("w:footnotes", {}, [
+            new XmlElement("w:footnote", {"w:id": "1"}, footnoteBody)
+        ])
+    );
+    assert.equal(footnotes.value.length, 1);
+    assert.deepEqual(footnotes.value[0].body, [new documents.Paragraph([])]);
+    assert.deepEqual(footnotes.value[0].noteId, "1");
 });
 
 footnoteTypeIsIgnored('continuationSeparator');
 footnoteTypeIsIgnored('separator');
 
 function footnoteTypeIsIgnored(type) {
-    describe('footnotes of type ' + type + ' are ignored', function() {
-        test('ID and body of footnote are read', function() {
-            var footnotes = createFootnotesReader()(
-                new XmlElement("w:footnotes", {}, [
-                    new XmlElement("w:footnote", {"w:id": "1", "w:type": type}, [])
-                ])
-            );
-            assert.equal(footnotes.value.length, 0);
-        });
+    test('footnotes of type ' + type + ' are ignored', function() {
+        var footnotes = createFootnotesReader()(
+            new XmlElement("w:footnotes", {}, [
+                new XmlElement("w:footnote", {"w:id": "1", "w:type": type}, [])
+            ])
+        );
+        assert.equal(footnotes.value.length, 0);
     });
 }