Refactor test cases for note images and notes to streamline data creation and improve assertions

Author: hakimLyon

tests/e2e/note-images.test.ts

@@ -64,10 +64,7 @@ test('Users can edit note image', async ({ page, login }) => {
 
 	const note = await prisma.note.create({
 		select: { id: true },
-		data: {
-			...createNoteWithImage(),
-			ownerId: user.id,
-		},
+		data: { ...createNoteWithImage(), ownerId: user.id },
 	})
 	await page.goto(`/users/${user.username}/notes/${note.id}`)
 
@@ -90,10 +87,7 @@ test('Users can delete note image', async ({ page, login }) => {
 
 	const note = await prisma.note.create({
 		select: { id: true, title: true },
-		data: {
-			...createNoteWithImage(),
-			ownerId: user.id,
-		},
+		data: { ...createNoteWithImage(), ownerId: user.id },
 	})
 	await page.goto(`/users/${user.username}/notes/${note.id}`)
 
@@ -109,8 +103,8 @@ test('Users can delete note image', async ({ page, login }) => {
 	await page.getByRole('button', { name: 'remove image' }).click()
 	await page.getByRole('button', { name: 'submit' }).click()
 	await expect(page).toHaveURL(`/users/${user.username}/notes/${note.id}`)
-	const countAfter = await images.count()
-	expect(countAfter).toEqual(countBefore - 1)
+	const countAfter = images
+	await expect(countAfter).toHaveCount(countBefore - 1)
 })
 
 function createNote() {

tests/e2e/notes.test.ts

@@ -62,13 +62,10 @@ test('Users can delete notes', async ({ page, login }) => {
 		page.getByText('Your note has been deleted.', { exact: true }),
 	).toBeVisible()
 	await expect(page).toHaveURL(`/users/${user.username}/notes`)
-	const countAfter = await noteLinks.count()
-	expect(countAfter).toEqual(countBefore - 1)
+	const countAfter = noteLinks
+	await expect(countAfter).toHaveCount(countBefore - 1)
 })
 
 function createNote() {
-	return {
-		title: faker.lorem.words(3),
-		content: faker.lorem.paragraphs(3),
-	}
+	return { title: faker.lorem.words(3), content: faker.lorem.paragraphs(3) }
 }

tests/e2e/settings-profile.test.ts

@@ -45,7 +45,7 @@ test('Users can update their password', async ({ page, login }) => {
 	expect(
 		await verifyUserPassword({ username }, oldPassword),
 		'Old password still works',
-	).toEqual(null)
+	).toBeNull()
 	expect(
 		await verifyUserPassword({ username }, newPassword),
 		'New password does not work',
@@ -56,9 +56,7 @@ test('Users can update their profile photo', async ({ page, login }) => {
 	const user = await login()
 	await page.goto('/settings/profile')
 
-	const beforeSrc = await page
-		.getByRole('img', { name: user.name ?? user.username })
-		.getAttribute('src')
+	const beforeSrc = page.getByRole('img', { name: user.name ?? user.username })
 
 	await page.getByRole('link', { name: /change profile photo/i }).click()
 
@@ -79,7 +77,7 @@ test('Users can update their profile photo', async ({ page, login }) => {
 		.getByRole('img', { name: user.name ?? user.username })
 		.getAttribute('src')
 
-	expect(beforeSrc).not.toEqual(afterSrc)
+	expect(beforeSrc).not.toBe(afterSrc)
 })
 
 test('Users can change their email address', async ({ page, login }) => {