Merge branch 'master' into image-errors

Conflicts:
	test/mammoth.tests.js

1 files changed, 20 insertions, 22 deletions

diff --git a/test/docx/numbering-xml.tests.js b/test/docx/numbering-xml.tests.js
index fb28cb8..7ecacc2 100644
--- a/test/docx/numbering-xml.tests.js
+++ b/test/docx/numbering-xml.tests.js
@@ -2,31 +2,29 @@ var duck = require("duck");
 
 var readNumberingXml = require("../../lib/docx/numbering-xml").readNumberingXml;
 var XmlElement = require("../../lib/xml").Element;
-var test = require("../testing").test;
+var test = require("../test")(module);
 
 
-describe('readNumberingXml', function() {
-    test('w:num element inherits levels from w:abstractNum', function() {
-        var numbering = readNumberingXml(
-            new XmlElement("w:numbering", {}, [
-                new XmlElement("w:abstractNum", {"w:abstractNumId": "42"}, [
-                    new XmlElement("w:lvl", {"w:ilvl": "0"}, [
-                        new XmlElement("w:numFmt", {"w:val": "bullet"})
-                    ]),
-                    new XmlElement("w:lvl", {"w:ilvl": "1"}, [
-                        new XmlElement("w:numFmt", {"w:val": "decimal"})
-                    ])
+test('w:num element inherits levels from w:abstractNum', function() {
+    var numbering = readNumberingXml(
+        new XmlElement("w:numbering", {}, [
+            new XmlElement("w:abstractNum", {"w:abstractNumId": "42"}, [
+                new XmlElement("w:lvl", {"w:ilvl": "0"}, [
+                    new XmlElement("w:numFmt", {"w:val": "bullet"})
                 ]),
-                new XmlElement("w:num", {"w:numId": "47"}, [
-                    new XmlElement("w:abstractNumId", {"w:val": "42"})
+                new XmlElement("w:lvl", {"w:ilvl": "1"}, [
+                    new XmlElement("w:numFmt", {"w:val": "decimal"})
                 ])
+            ]),
+            new XmlElement("w:num", {"w:numId": "47"}, [
+                new XmlElement("w:abstractNumId", {"w:val": "42"})
             ])
-        );
-        duck.assertThat(numbering.findLevel("47", "0"), duck.hasProperties({
-            isOrdered: false
-        }));
-        duck.assertThat(numbering.findLevel("47", "1"), duck.hasProperties({
-            isOrdered: true
-        }));
-    });
+        ])
+    );
+    duck.assertThat(numbering.findLevel("47", "0"), duck.hasProperties({
+        isOrdered: false
+    }));
+    duck.assertThat(numbering.findLevel("47", "1"), duck.hasProperties({
+        isOrdered: true
+    }));
 });