From 2b26bbe78a1a2b8b427963a6c44c3853efdb737e Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 6 Mar 2020 03:52:12 +0200 Subject: Fix: img tag did not allow width and height. Removed swipebox from markdown editor img tag and updated marked markdown to newest version. Thanks to hradec and xet7 ! Closes #2956 --- packages/markdown/marked/test/helpers/helpers.js | 26 --------------- .../markdown/marked/test/helpers/html-differ.js | 38 ---------------------- 2 files changed, 64 deletions(-) delete mode 100644 packages/markdown/marked/test/helpers/helpers.js delete mode 100644 packages/markdown/marked/test/helpers/html-differ.js (limited to 'packages/markdown/marked/test/helpers') diff --git a/packages/markdown/marked/test/helpers/helpers.js b/packages/markdown/marked/test/helpers/helpers.js deleted file mode 100644 index 44632fcd..00000000 --- a/packages/markdown/marked/test/helpers/helpers.js +++ /dev/null @@ -1,26 +0,0 @@ -const marked = require('../../'); -const htmlDiffer = require('./html-differ.js'); - -beforeEach(() => { - marked.setOptions(marked.getDefaults()); - - jasmine.addMatchers({ - toRender: () => { - return { - compare: (spec, expected) => { - const result = {}; - const actual = marked(spec.markdown, spec.options); - result.pass = htmlDiffer.isEqual(expected, actual); - - if (result.pass) { - result.message = `${spec.markdown}\n------\n\nExpected: Should Fail`; - } else { - const diff = htmlDiffer.firstDiff(actual, expected); - result.message = `Expected: ${diff.expected}\n Actual: ${diff.actual}`; - } - return result; - } - }; - } - }); -}); diff --git a/packages/markdown/marked/test/helpers/html-differ.js b/packages/markdown/marked/test/helpers/html-differ.js deleted file mode 100644 index 44052be4..00000000 --- a/packages/markdown/marked/test/helpers/html-differ.js +++ /dev/null @@ -1,38 +0,0 @@ -const HtmlDiffer = require('@markedjs/html-differ').HtmlDiffer; -const htmlDiffer = new HtmlDiffer({ignoreSelfClosingSlash: true}); - -module.exports = { - isEqual: htmlDiffer.isEqual.bind(htmlDiffer), - firstDiff: (actual, expected, padding) => { - padding = padding || 30; - const result = htmlDiffer - .diffHtml(actual, expected) - .reduce((obj, diff) => { - if (diff.added) { - if (obj.firstIndex === null) { - obj.firstIndex = obj.expected.length; - } - obj.expected += diff.value; - } else if (diff.removed) { - if (obj.firstIndex === null) { - obj.firstIndex = obj.actual.length; - } - obj.actual += diff.value; - } else { - obj.actual += diff.value; - obj.expected += diff.value; - } - - return obj; - }, { - firstIndex: null, - actual: '', - expected: '' - }); - - return { - actual: result.actual.substring(result.firstIndex - padding, result.firstIndex + padding), - expected: result.expected.substring(result.firstIndex - padding, result.firstIndex + padding) - }; - } -}; -- cgit v1.2.3-1-g7c22