Merge branch 'master' into js-unit-testing

2018-01-02 09:37:46 +01:00
parent d80c2f83fa 6eb8822059
commit 85401a1513
17 changed files with 128 additions and 36 deletions
--- a/js/test/PasteViewer.js
+++ b/js/test/PasteViewer.js
@@ -48,7 +48,7 @@ describe('PasteViewer', function () {
                results.push(
                    $('#placeholder').hasClass('hidden') &&
                    !$.PrivateBin.PasteViewer.isPrettyPrinted() &&
-                    $.PrivateBin.PasteViewer.getText() == text
+                    $.PrivateBin.PasteViewer.getText() == $('<div />').text(text).html()
                );
                if (format == 'markdown') {
                    results.push(