Merge pull request xmldom#132 from karfau/switch-to-jest-expect

karfau · Sep 24, 2020 · 6db038f · 6db038f
2 parents 6b01a35 + d58ad01
commit 6db038f
Show file tree

Hide file tree

Showing 22 changed files with 1,111 additions and 802 deletions.
diff --git a/test/dom-parser.test.js b/test/dom-parser.test.js
@@ -42,7 +42,10 @@ describe('DOMParser', () => {
 	describe('parseFromString', () => {
 		test('should use minimal entity map for default mime type', () => {
 			const XML = '<xml attr="&quot;">&lt; &amp;</xml>'
-			expect(new DOMParser().parseFromString(XML).toString()).toEqual(XML)
+
+			const actual = new DOMParser().parseFromString(XML).toString()
+
+			expect(actual).toEqual(XML)
 		})
 
 		test('should provide access to textContent and attribute values', () => {
@@ -69,6 +72,7 @@ describe('DOMParser', () => {
 			const textTags = document.getElementsByTagName('text')
 
 			expect(textTags.length).toEqual(3)
+
 			const expectedText = ['first', 'second', 'last']
 			for (let i = 0; i < textTags.length; i++) {
 				const textTag = textTags[i]

diff --git a/test/error/__snapshots__/xml-error.test.js.snap b/test/error/__snapshots__/xml-error.test.js.snap
@@ -0,0 +1,96 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`html vs xml: html attribute (miss quote) 1`] = `
+Object {
+  "actual": "<img attr=\\"1\\" xmlns=\\"http://www.w3.org/1999/xhtml\\"/>",
+  "warning": Array [
+    "[xmldom warning]	attribute \\"1\\" missed quot(\\")!!
+@#[line:1,col:1]",
+  ],
+}
+`;
+
+exports[`html vs xml: invalid xml node "<r" 1`] = `
+Object {
+  "actual": "<r/>",
+  "error": Array [
+    "[xmldom error]	unexpected end of input
+@#[line:1,col:1]",
+  ],
+  "warning": Array [
+    "[xmldom warning]	unclosed xml attribute
+@#[line:1,col:1]",
+  ],
+}
+`;
+
+exports[`html vs xml: invalid xml node "<test><!--" 1`] = `
+Object {
+  "actual": "<test/>",
+  "error": Array [
+    "[xmldom error]	Unclosed comment
+@#[line:1,col:7]",
+  ],
+  "warning": Array [
+    "[xmldom warning]	unclosed xml attribute
+@#[line:1,col:1]",
+  ],
+}
+`;
+exports[`html vs xml: unclosed document in text/xml 1`] = `
+Object {
+  "actual": "<img/>",
+  "warning": Array [
+    "[xmldom warning]	unclosed xml attribute
+@#[line:1,col:1]",
+  ],
+}
+`;
+
+exports[`html vs xml: unclosed document in text/html 1`] = `
+Object {
+  "actual": "<img xmlns=\\"http://www.w3.org/1999/xhtml\\"/>",
+}
+`;
+
+exports[`html vs xml: text/html attribute (missing =) 1`] = `
+Object {
+  "actual": "<scxml xmlns=\\"http://www.w3.org/2005/07/scxml\\" version=\\"1.0\\" profile=\\"ecmascript\\" id=\\"scxmlRoot\\" initial=\\"start\\">
+
+  <!--
+      some comment (next line is empty)
+
+  -->
+
+  <state id=\\"start\\" name=\\"start\\">
+    <transition event=\\"init\\" name=\\"init\\" target=\\"main_state\\"/>
+  </state>
+
+  </scxml>",
+  "warning": Array [
+    "[xmldom warning]	attribute value must after \\"=\\"
+@#[line:10,col:5]",
+  ],
+}
+`;
+
+exports[`html vs xml: text/xml attribute (missing =) 1`] = `
+Object {
+  "actual": "<scxml xmlns=\\"http://www.w3.org/2005/07/scxml\\" version=\\"1.0\\" profile=\\"ecmascript\\" id=\\"scxmlRoot\\" initial=\\"start\\">
+
+  <!--
+      some comment (next line is empty)
+
+  -->
+
+  <state id=\\"start\\" name=\\"start\\">
+    <transition event=\\"init\\" name=\\"init\\" target=\\"main_state\\"/>
+  </state>
+
+  </scxml>",
+  "warning": Array [
+    "[xmldom warning]	attribute value must after \\"=\\"
+@#[line:10,col:5]",
+  ],
+}
+`;
diff --git a/test/error/error.test.js b/test/error/error.test.js
@@ -1,145 +1,83 @@
 'use strict'
 
-var DOMParser = require('../../lib/dom-parser').DOMParser
-const assert = require('../assert')
+const { DOMParser } = require('../../lib/dom-parser')
 
-var xml =
-	'<scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"\n\
-       profile="ecmascript" id="scxmlRoot" initial="start">\n\
-\n\
-  <!--\n\
-      some comment (next line is empty)\n\
-\n\
-  -->\n\
-\n\
-  <state id="start" name="start">\n\
-    <transition event"init" name="init" target="main_state" />\n\
-  </state>\n\
-\n\
-  </scxml>'
-var error = []
-var parser = new DOMParser({
-	locator: {},
-	errorHandler: {
-		error: function (msg) {
-			error.push(msg)
-		},
-	},
-})
-var doc = parser.parseFromString(xml, 'text/html')
-var doc = parser.parseFromString(
-	'<html><body title="1<2"><table>&lt;;test</body></body></html',
-	'text/html'
-)
+const XML_ERROR = '<html><body title="1<2"><table&lt;;test</body></body></html>'
+const XML_ERROR_AND_WARNING = '<html disabled><1 1="2"/></body></html>'
 
-describe('errorHandle', () => {
+describe('errorHandler', () => {
 	it('only single function with two args builds map', () => {
-		var error = {}
-		var parser = new DOMParser({
+		const errors = {}
+		const parser = new DOMParser({
 			errorHandler: function (key, msg) {
-				error[key] = msg
+				errors[key] = msg
 			},
 		})
-		var doc = parser.parseFromString(
-			'<html disabled><1 1="2"/></body></html>',
-			'text/xml'
-		)
-		assert.isTrue(
-			typeof error.warning === 'string',
-			'error.warning: ' + String(error.warning)
-		)
-		assert.isTrue(
-			typeof error.error === 'string',
-			'error.error: ' + String(error.error)
-		)
-	})
 
-	it('only one function with one argument builds list', () => {
-		var error = []
-		var parser = new DOMParser({
-			errorHandler: function (msg) {
-				error.push(msg)
-			},
-		})
-		var doc = parser.parseFromString(
-			'<html disabled><1 1="2"/></body></html>',
-			'text/xml'
-		)
-		error.map(function (e) {
-			error[/^\[xmldom (\w+)\]/.exec(e)[1]] = e
+		parser.parseFromString(XML_ERROR_AND_WARNING, 'text/xml')
+
+		expect(errors).toMatchObject({
+			warning: expect.stringMatching(/.*/),
+			error: expect.stringMatching(/.*/),
 		})
-		assert.isTrue(
-			typeof error.warning === 'string',
-			'error.warning:' + error.warning
-		)
-		assert.isTrue(typeof error.error === 'string', 'error.error:' + error.error)
 	})
 
-	it('compare one function with only one key', () => {
-		var error = []
-		var errorMap = []
-		const faulty = '<html><body title="1<2">test</body></html>'
-		new DOMParser({
+	it('only one function with one argument builds list', () => {
+		const errors = []
+		const parser = new DOMParser({
 			errorHandler: function (msg) {
-				error.push(msg)
+				errors.push(msg)
 			},
-		}).parseFromString(faulty, 'text/xml')
-		Array.from(['warn', 'warning', 'error', 'fatalError']).forEach((k) => {
-			var errorHandler = { [k]: [] }
-			errorHandler[k] = function (msg) {
-				errorMap[k].push(msg)
-			}
-			new DOMParser({ errorHandler: errorHandler }).parseFromString(
-				faulty,
-				'text/xml'
-			)
-			assert.isTrue(errorHandler[k].length > 0, 'expected entries for ' + k)
 		})
-		var error2 = []
-		for (var n in errorMap) {
-			error2 = error2.concat(errorMap[n])
-			assert(error.length, errorMap[n].length)
-		}
 
-		assert(
-			error2.sort().join(','),
-			error.sort().join(','),
-			'expected same messages'
-		)
+		parser.parseFromString(XML_ERROR_AND_WARNING, 'text/xml')
+
+		expect(errors).toMatchObject([/\[xmldom warning]/, /\[xmldom error]/])
 	})
 
+	it.each(['warning', 'error'])(
+		'errorHandler for only one level: %s',
+		(level) => {
+			const errors = []
+			const parser = new DOMParser({
+				errorHandler: {
+					[level]: function (msg) {
+						errors.push(msg)
+					},
+				},
+			})
+
+			parser.parseFromString(XML_ERROR_AND_WARNING, 'text/xml')
+
+			expect(errors).toHaveLength(1)
+		}
+	)
+	it.todo(
+		'errorHandler for only one level: fatalError'
+		/*
+		I was not able to create a test case for a fatalError.
+		It might need to be removed from the API, since all but one cases are in comments
+		and an error is thrown instead. The one case left I was not able to reproduce.
+		*/
+	)
+
 	it('error function throwing is not caught', () => {
-		var error = []
-		var parser = new DOMParser({
-			locator: {},
+		const errors = []
+		const ERROR_MSG = 'FROM TEST'
+
+		const parser = new DOMParser({
+			locator: {}, // removing the locator makes the test fail!
 			errorHandler: {
 				error: function (msg) {
-					error.push(msg)
-					throw new Error('from throwing errroHandler.error')
+					errors.push(msg)
+					throw new Error(ERROR_MSG)
 				},
 			},
 		})
-		var doc1 = parser.parseFromString(
-			'<html><body title="1<2"><table>&lt;;test</body></body></html>',
-			'text/html'
-		)
-		try {
-			var doc2 = parser.parseFromString(
-				'<html><body title="1<2"><table&lt;;test</body></body></html>',
-				'text/html'
-			)
-		} catch (e) {
-			if (e.message !== 'from throwing errroHandler.error') throw e
-		}
-		assert.isTrue(
-			error.length > 0 &&
-				error.every((e) => /\n@#\[line\:\d+,col\:\d+\]/.test(e)),
-			'line,col must record:' + JSON.stringify(error)
-		)
-		assert(
-			doc1,
-			'<html xmlns="http://www.w3.org/1999/xhtml"><body title="1&lt;2"><table></table>&lt;;test</body></html>'
-		)
-		assert(doc2, undefined)
+
+		expect(() => {
+			parser.parseFromString(XML_ERROR, 'text/html')
+		}).toThrow(ERROR_MSG)
+		expect(errors).toMatchObject([/\n@#\[line\:\d+,col\:\d+\]/])
 	})
 })