More comprehensive testing including fromTo and error cases. All PASS.

elliottmangham · elliottmangham · commit 254f0b8758a7 · 2024-10-28T13:01:11.000Z
diff --git a/__tests__/index.test.js b/__tests__/index.test.js
@@ -137,4 +137,132 @@ describe('ContentFetch', () => {
 		expect(onStart).toHaveBeenCalled()
 		expect(onEnd).toHaveBeenCalled()
 	})
+
+	// Test fromTo method
+	test('fromTo fetches and injects content', async () => {
+		document.body.innerHTML = `
+			<div id="source">Source Content</div>
+			<div id="target"></div>
+		`
+
+		const mockHtml = '<div class="content">New Content</div>'
+		mockFetch.mockResolvedValueOnce({
+			ok: true,
+			text: () =>
+				Promise.resolve(`
+				<html>
+					<body>
+						<div id="source">${mockHtml}</div>
+					</body>
+				</html>
+			`),
+		})
+
+		await contentFetch.fromTo(
+			{
+				selector: '#source',
+				url: 'http://localhost/test',
+			},
+			{
+				destination: '#target',
+			},
+		)
+
+		expect(document.querySelector('#target').innerHTML).toContain('New Content')
+	})
+
+	// Test fromTo with callbacks
+	test('fromTo executes callbacks', async () => {
+		document.body.innerHTML = `
+			<div id="source">Source Content</div>
+			<div id="target"></div>
+		`
+
+		const onStartFrom = jest.fn()
+		const onEndFrom = jest.fn()
+		const onStartTo = jest.fn()
+		const onEndTo = jest.fn()
+
+		const mockHtml = '<div class="content">New Content</div>'
+		mockFetch.mockResolvedValueOnce({
+			ok: true,
+			text: () =>
+				Promise.resolve(`
+				<html>
+					<body>
+						<div id="source">${mockHtml}</div>
+					</body>
+				</html>
+			`),
+		})
+
+		await contentFetch.fromTo(
+			{
+				selector: '#source',
+				url: 'http://localhost/test',
+				onStart: onStartFrom,
+				onEnd: onEndFrom,
+			},
+			{
+				destination: '#target',
+				onStart: onStartTo,
+				onEnd: onEndTo,
+			},
+		)
+
+		// Remove setTimeout and directly check callbacks
+		expect(onStartFrom).toHaveBeenCalled()
+		expect(onEndFrom).toHaveBeenCalled()
+		expect(onStartTo).toHaveBeenCalled()
+		expect(onEndTo).toHaveBeenCalled()
+	})
+
+	// Test fromTo error handling
+	test('fromTo handles errors properly', async () => {
+		const onError = jest.fn()
+
+		// Expect the promise to reject
+		await expect(
+			contentFetch.fromTo(
+				{
+					selector: '#nonexistent',
+					onError,
+				},
+				{
+					destination: '#target',
+				},
+			),
+		).rejects.toThrow('Element not found for selector: #nonexistent')
+
+		// Verify onError was called
+		expect(onError).toHaveBeenCalled()
+		expect(onError).toHaveBeenCalledWith(
+			expect.objectContaining({
+				message: 'Element not found for selector: #nonexistent',
+			}),
+		)
+	})
+
+	// Test abortFetch
+	test('abortFetch cancels ongoing requests', async () => {
+		const abortSpy = jest.spyOn(contentFetch.controller, 'abort')
+		const clearSpy = jest.spyOn(contentFetch.cache, 'clear')
+
+		contentFetch.abortFetch()
+
+		expect(abortSpy).toHaveBeenCalled()
+		expect(clearSpy).toHaveBeenCalled()
+		expect(contentFetch.controller).toBeDefined() // New controller created
+	})
+
+	// Test cache clearing on abort
+	test('abortFetch clears cache', async () => {
+		// Pre-populate cache
+		contentFetch.cache.set('test-key', 'test-data')
+		expect(contentFetch.cache.size).toBe(1)
+
+		contentFetch.abortFetch()
+
+		expect(contentFetch.cache.size).toBe(0)
+	})
 })
diff --git a/src/index.js b/src/index.js
@@ -264,12 +264,13 @@ export default class ContentFetch {
 	}
 
 	fromTo(fromParams, toParams) {
-		this.from(fromParams)
+		return this.from(fromParams)
 			.then((html) => {
 				return this.to({ ...toParams, data: html })
 			})
 			.catch((error) => {
-				// errors are handled in from() and to()
+				// Handle errors and return the rejected promise
+				return Promise.reject(error)
 			})
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -264,12 +264,13 @@ export default class ContentFetch {`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`fromTo(fromParams, toParams) {`
`267`		`- this.from(fromParams)`
	`267`	`+ return this.from(fromParams)`
`268`	`268`	`.then((html) => {`
`269`	`269`	`return this.to({ ...toParams, data: html })`
`270`	`270`	`})`
`271`	`271`	`.catch((error) => {`
`272`		`- // errors are handled in from() and to()`
	`272`	`+ // Handle errors and return the rejected promise`
	`273`	`+ return Promise.reject(error)`
`273`	`274`	`})`
`274`	`275`	`}`
`275`	`276`