Merge remote-tracking branch 'origin/pr/63'

Conflicts:
	package.json
	test/index.html

package.json

@@ -8,7 +8,8 @@
     "grunt-contrib-nodeunit": "~0.2.0",
     "grunt-contrib-uglify": "~0.3.0",
     "happen": "^0.1.3",
-    "qunitjs": "1.14.0"
+    "qunitjs": "1.14.0",
+    "qunit-assert-html": "^0.2.1"
   },
   "description": "h1. wysihtml5x 0.4.1",
   "main": "Gruntfile.js",

test/dom/auto_link_test.js

@@ -1,6 +1,6 @@
 module("wysihtml5.dom.autoLink", {
   equal: function(actual, expected, message) {
-    return wysihtml5.assert.htmlEqual(actual, expected, message);
+    return QUnit.assert.htmlEqual(actual, expected, message);
   },
 
   autoLink: function(html) {
@@ -108,4 +108,4 @@ test("Basic test", function() {
     "&lt;b&gt;foo&lt;/b&gt; <a href=\"http://www.google.de\">http://www.google.de</a>",
     "Check if plain HTML markup isn't evaluated"
   );
-});
+});

test/dom/convert_to_list_test.js

@@ -1,6 +1,6 @@
 module("wysihtml5.dom.convertToList", {
   equal: function(actual, expected, message) {
-    return wysihtml5.assert.htmlEqual(actual, expected, message);
+    return QUnit.assert.htmlEqual(actual, expected, message);
   },
 
   convertToList: function(html, type) {
@@ -98,4 +98,4 @@ test("Test whether it doesn't convert dom trees that are already a list", functi
     this.convertToList("<ul><li>foo</li></ul>", "ol"),
     "<ul><li>foo</li></ul>"
   );
-});
+});

test/dom/parse_test.js

@@ -11,7 +11,7 @@ if (wysihtml5.browser.supported()) {
     },
 
     equal: function(actual, expected, message) {
-      return wysihtml5.assert.htmlEqual(actual, expected, message);
+      return QUnit.assert.htmlEqual(actual, expected, message);
     }
   });
 

test/dom/rename_element_test.js

@@ -1,6 +1,6 @@
 module("wysihtml5.dom.renameElement", {
   equal: function(actual, expected, message) {
-    return wysihtml5.assert.htmlEqual(actual, expected, message);
+    return QUnit.assert.htmlEqual(actual, expected, message);
   },
 
   renameElement: function(html, newNodeName) {
@@ -25,4 +25,4 @@ test("Basic tests", function() {
     this.renameElement('<p align="left" class="foo"></p>', "h2"),
     '<h2 align="left" class="foo"></h2>'
   );
-});
+});

test/dom/resolve_list_test.js

@@ -1,6 +1,6 @@
 module("wysihtml5.dom.resolveList", {
   equal: function(actual, expected, message) {
-    return wysihtml5.assert.htmlEqual(actual, expected, message);
+    return QUnit.assert.htmlEqual(actual, expected, message);
   },
 
   resolveList: function(html, useLineBreaks) {
@@ -75,4 +75,4 @@ test("Basic tests (useLineBreaks = false)", function() {
     this.resolveList("<ul><li><h1>foo</h1></li><li><div>bar</div></li><li>baz</li></ul>"),
     "<h1>foo</h1><div>bar</div><p>baz</p>"
   );
-});
+});

test/index.html

@@ -9,6 +9,7 @@
 
 <script src="../node_modules/qunitjs/qunit/qunit.js"></script>
 <script src="../node_modules/happen/happen.js"></script>
+<script src="../node_modules/qunit-assert-html/dist/qunit-assert-html.js"></script>
 
 <script src="../src/wysihtml5.js"></script>
 <script src="../lib/rangy/rangy-core.js"></script>
@@ -119,8 +120,6 @@
 <script src="../src/dom/contenteditable_area.js"></script>
 <!-- -->
 
-<script src="../src/assert/html_equal.js"></script>
-
 <script src="browser_test.js"></script>
 <script src="incompatible_test.js"></script>
 

test/quirks/clean_pasted_html_test.js

@@ -1,19 +1,19 @@
 if (wysihtml5.browser.supported()) {
   module("wysihtml5.quirks.cleanPastedHTML");
 
-  test("Basic test", function() {
-    wysihtml5.assert.htmlEqual(
+  test("Basic test", function(assert) {
+    assert.htmlEqual(
       wysihtml5.quirks.cleanPastedHTML("<u>See: </u><a href=\"http://www.google.com\"><u><b>best search engine</b></u></a>"),
       "<u>See: </u><a href=\"http://www.google.com\"><b>best search engine</b></a>",
       "Correctly removed <u> within <a>"
     );
   });
 
-  test("Non-breakable space test", function() {
-    wysihtml5.assert.htmlEqual(
+  test("Non-breakable space test", function(assert) {
+    assert.htmlEqual(
       wysihtml5.quirks.cleanPastedHTML("test&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"),
       "test &nbsp; &nbsp; ",
       "Correctly split nonbreakable spaces"
     );
   });
-}
+}