Merge branch 'master' into image-errors

Conflicts:
	test/mammoth.tests.js

1 files changed, 13 insertions, 15 deletions

diff --git a/test/html-paths.tests.js b/test/html-paths.tests.js
index 76a77ef..8d75b7c 100644
--- a/test/html-paths.tests.js
+++ b/test/html-paths.tests.js
@@ -1,22 +1,20 @@
 var assert = require("assert");
 
-var test = require("./testing").test;
+var test = require("./test")(module);
 var htmlPaths = require("../lib/html-paths");
 
 
-describe("html-paths", function() {
-    test("element can match multiple tag names", function() {
-        var pathPart = htmlPaths.element(["ul", "ol"]);
-        assert.ok(pathPart.matchesElement({tagName: "ul"}));
-        assert.ok(pathPart.matchesElement({tagName: "ol"}));
-        assert.ok(!pathPart.matchesElement({tagName: "p"}));
-    });
-    
-    test("element matches if attributes are the same", function() {
-        var pathPart = htmlPaths.element(["p"], {"class": "tip"});
-        assert.ok(!pathPart.matchesElement({tagName: "p"}));
-        assert.ok(!pathPart.matchesElement({tagName: "p", attributes: {"class": "tip help"}}));
-        assert.ok(pathPart.matchesElement({tagName: "p", attributes: {"class": "tip"}}));
-    });
+test("element can match multiple tag names", function() {
+    var pathPart = htmlPaths.element(["ul", "ol"]);
+    assert.ok(pathPart.matchesElement({tagName: "ul"}));
+    assert.ok(pathPart.matchesElement({tagName: "ol"}));
+    assert.ok(!pathPart.matchesElement({tagName: "p"}));
+});
+
+test("element matches if attributes are the same", function() {
+    var pathPart = htmlPaths.element(["p"], {"class": "tip"});
+    assert.ok(!pathPart.matchesElement({tagName: "p"}));
+    assert.ok(!pathPart.matchesElement({tagName: "p", attributes: {"class": "tip help"}}));
+    assert.ok(pathPart.matchesElement({tagName: "p", attributes: {"class": "tip"}}));
 });