Merge branch 'master' into image-errors

Conflicts:
	test/mammoth.tests.js

1 files changed, 29 insertions, 31 deletions

diff --git a/test/html/write.tests.js b/test/html/write.tests.js
index 531995f..9db8c79 100644
--- a/test/html/write.tests.js
+++ b/test/html/write.tests.js
@@ -1,40 +1,38 @@
 var assert = require("assert");
 
-var test = require("../testing").test;
+var test = require("../test")(module);
 var html = require("../../lib/html");
 var writers = require("../../lib/writers");
 
 
-describe("HTML write", function() {
-    test("text is HTML escaped", function() {
-        assert.equal(
-            generateString(html.text("<>&")),
-            "&lt;&gt;&amp;");
-    });
-    
-    test("double quotes outside of attributes are not escaped", function() {
-        assert.equal(
-            generateString(html.text('"')),
-            '"');
-    });
-    
-    test("element attributes are HTML escaped", function() {
-        assert.equal(
-            generateString(html.freshElement("p", {"x": "<"})),
-            '<p x="&lt;"></p>');
-    });
-    
-    test("double quotes inside attributes are escaped", function() {
-        assert.equal(
-            generateString(html.freshElement("p", {"x": '"'})),
-            '<p x="&quot;"></p>');
-    });
-    
-    test("element children are written", function() {
-        assert.equal(
-            generateString(html.freshElement("p", {}, [html.text("Hello")])),
-            '<p>Hello</p>');
-    });
+test("text is HTML escaped", function() {
+    assert.equal(
+        generateString(html.text("<>&")),
+        "&lt;&gt;&amp;");
+});
+
+test("double quotes outside of attributes are not escaped", function() {
+    assert.equal(
+        generateString(html.text('"')),
+        '"');
+});
+
+test("element attributes are HTML escaped", function() {
+    assert.equal(
+        generateString(html.freshElement("p", {"x": "<"})),
+        '<p x="&lt;"></p>');
+});
+
+test("double quotes inside attributes are escaped", function() {
+    assert.equal(
+        generateString(html.freshElement("p", {"x": '"'})),
+        '<p x="&quot;"></p>');
+});
+
+test("element children are written", function() {
+    assert.equal(
+        generateString(html.freshElement("p", {}, [html.text("Hello")])),
+        '<p>Hello</p>');
 });
 
 function generateString(node) {