02/05: add solution, fix expect.element

kettanaito · kettanaito · commit 01157d716c1c · 2025-01-14T15:15:48.000+01:00
diff --git a/exercises/01.sunsetting-jsdom/01.problem.break-jsdom/postcss.config.js b/exercises/01.sunsetting-jsdom/01.problem.break-jsdom/postcss.config.js
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
 	plugins: {
 		tailwindcss: {},
 		autoprefixer: {},
diff --git a/exercises/01.sunsetting-jsdom/01.solution.break-jsdom/postcss.config.js b/exercises/01.sunsetting-jsdom/01.solution.break-jsdom/postcss.config.js
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
 	plugins: {
 		tailwindcss: {},
 		autoprefixer: {},
diff --git a/exercises/02.vitest-browser-mode/01.solution.installation-and-setup/postcss.config.js b/exercises/02.vitest-browser-mode/01.solution.installation-and-setup/postcss.config.js
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
 	plugins: {
 		tailwindcss: {},
 		autoprefixer: {},
diff --git a/exercises/02.vitest-browser-mode/02.solution.migrate-the-test/README.mdx b/exercises/02.vitest-browser-mode/02.solution.migrate-the-test/README.mdx
@@ -4,3 +4,4 @@
 1. Install `vitest-browser-react` to render React components in the browser.
 1. Use `render` from `vitest-browser-react` to render the component now.
 1. Use `page` from `@vitest/browser/context` to select elements on the page for interactions and assertions.
+1. Since `page.getBy*` now returns ` Locator` object, adjust `expect` to be `expect.element(locator)` and await its assertions as they are async now.
diff --git a/exercises/02.vitest-browser-mode/02.solution.migrate-the-test/postcss.config.js b/exercises/02.vitest-browser-mode/02.solution.migrate-the-test/postcss.config.js
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
 	plugins: {
 		tailwindcss: {},
 		autoprefixer: {},
diff --git a/exercises/02.vitest-browser-mode/02.solution.migrate-the-test/src/file-preview.test.tsx b/exercises/02.vitest-browser-mode/02.solution.migrate-the-test/src/file-preview.test.tsx
@@ -6,6 +6,6 @@ import { FilePreview } from './file-preview.tsx'
 it('displays the preview card', async () => {
 	render(<FilePreview file={new File(['hello world'], 'file.txt')} />)
 
-	expect(page.getByText('file.txt')).toBeTruthy()
-	expect(page.getByText('hello world')).toBeTruthy()
+	await expect.element(page.getByText('file.txt')).toBeTruthy()
+	await expect.element(page.getByText('hello world')).toBeTruthy()
 })
diff --git a/exercises/02.vitest-browser-mode/03.solution.use-playwright/postcss.config.js b/exercises/02.vitest-browser-mode/03.solution.use-playwright/postcss.config.js
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
 	plugins: {
 		tailwindcss: {},
 		autoprefixer: {},
diff --git a/exercises/02.vitest-browser-mode/03.solution.use-playwright/src/file-preview.test.tsx b/exercises/02.vitest-browser-mode/03.solution.use-playwright/src/file-preview.test.tsx
@@ -6,6 +6,6 @@ import { FilePreview } from './file-preview.tsx'
 it('displays the preview card', async () => {
 	render(<FilePreview file={new File(['hello world'], 'file.txt')} />)
 
-	expect(page.getByText('file.txt')).toBeTruthy()
-	expect(page.getByText('hello world')).toBeTruthy()
+	await expect.element(page.getByText('file.txt')).toBeTruthy()
+	await expect.element(page.getByText('hello world')).toBeTruthy()
 })
diff --git a/exercises/02.vitest-browser-mode/04.solution.use-dom-assertions/postcss.config.js b/exercises/02.vitest-browser-mode/04.solution.use-dom-assertions/postcss.config.js
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
 	plugins: {
 		tailwindcss: {},
 		autoprefixer: {},
diff --git a/exercises/02.vitest-browser-mode/04.solution.use-dom-assertions/src/file-preview.test.tsx b/exercises/02.vitest-browser-mode/04.solution.use-dom-assertions/src/file-preview.test.tsx
@@ -6,6 +6,6 @@ import { FilePreview } from './file-preview.tsx'
 it('displays the preview card', async () => {
 	render(<FilePreview file={new File(['hello world'], 'file.txt')} />)
 
-	expect(page.getByText('file.txt')).toBeVisible()
-	expect(page.getByText('hello world')).toBeVisible()
+	await expect.element(page.getByText('file.txt')).toBeVisible()
+	await expect.element(page.getByText('hello world')).toBeVisible()
 })
diff --git a/exercises/02.vitest-browser-mode/05.solution.include-assets/README.mdx b/exercises/02.vitest-browser-mode/05.solution.include-assets/README.mdx
@@ -0,0 +1,7 @@
+# Include assets
+
+Problem: the component we render kind of looks broken. It has no styles. It doesn't look like what we render in the app.
+
+1. Create a custom `vitest.browser.context.ts` file.
+1. Import the assets you want to be included with each test here. E.g. `import './src/index.css'`.
+1. Include `vitest.browser.context.ts` in `vite.config.ts` (`test.browser.instances[i].setupFiles`).
diff --git a/exercises/02.vitest-browser-mode/05.solution.include-assets/index.html b/exercises/02.vitest-browser-mode/05.solution.include-assets/index.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<link rel="icon" type="image/svg+xml" href="/vite.svg" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<title>Vite App</title>
+		<link rel="preconnect" href="https://fonts.googleapis.com" />
+		<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+	</head>
+	<body>
+		<div id="root"></div>
+		<script type="module" src="/src/main.tsx"></script>
+	</body>
+</html>
diff --git a/exercises/02.vitest-browser-mode/05.solution.include-assets/package.json b/exercises/02.vitest-browser-mode/05.solution.include-assets/package.json
@@ -0,0 +1,26 @@
+{
+  "type": "module",
+  "name": "exercises_02.vitest-browser-mode_05.solution.include-assets",
+  "scripts": {
+    "dev": "vite",
+    "test": "vitest"
+  },
+  "dependencies": {
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
+  },
+  "devDependencies": {
+    "@testing-library/dom": "^10.4.0",
+    "@testing-library/react": "^16.1.0",
+    "@types/react": "^19.0.6",
+    "@types/react-dom": "^19.0.3",
+    "@vitejs/plugin-react": "^4.3.4",
+    "@vitest/browser": "^3.0.0-beta.4",
+    "autoprefixer": "^10.4.20",
+    "playwright": "^1.49.1",
+    "postcss": "^8.4.49",
+    "tailwindcss": "^3.4.17",
+    "vite": "^6.0.7",
+    "vitest": "^3.0.0-beta.4"
+  }
+}
diff --git a/exercises/02.vitest-browser-mode/05.solution.include-assets/postcss.config.js b/exercises/02.vitest-browser-mode/05.solution.include-assets/postcss.config.js
@@ -0,0 +1,6 @@
+export default {
+	plugins: {
+		tailwindcss: {},
+		autoprefixer: {},
+	},
+}
diff --git a/exercises/02.vitest-browser-mode/05.solution.include-assets/public/vite.svg b/exercises/02.vitest-browser-mode/05.solution.include-assets/public/vite.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
diff --git a/exercises/02.vitest-browser-mode/05.solution.include-assets/src/app.tsx b/exercises/02.vitest-browser-mode/05.solution.include-assets/src/app.tsx
@@ -0,0 +1,38 @@
+import { useState } from 'react'
+import { FilePreview } from './file-preview.jsx'
+
+export function App() {
+	const [file, setFile] = useState<File>()
+
+	return (
+		<div>
+			{file ? (
+				<div className="flex flex-col items-center">
+					<FilePreview file={file} />
+					<button
+						className="mt-10 rounded-full bg-slate-800 px-6 py-2 text-sm font-bold text-white hover:bg-slate-600"
+						onClick={() => setFile(undefined)}
+					>
+						Preview another file
+					</button>
+				</div>
+			) : (
+				<div className="rounded-md border border-slate-200 bg-white p-4 shadow-lg shadow-slate-200">
+					<input
+						type="file"
+						name="file"
+						required
+						className="text-sm font-medium"
+						onChange={(event) => {
+							const [selectedFile] = event.currentTarget.files || []
+
+							if (selectedFile) {
+								setFile(selectedFile)
+							}
+						}}
+					/>
+				</div>
+			)}
+		</div>
+	)
+}
diff --git a/exercises/02.vitest-browser-mode/05.solution.include-assets/src/file-preview.test.tsx b/exercises/02.vitest-browser-mode/05.solution.include-assets/src/file-preview.test.tsx
@@ -0,0 +1,11 @@
+import { it, expect } from 'vitest'
+import { page } from '@vitest/browser/context'
+import { render } from 'vitest-browser-react'
+import { FilePreview } from './file-preview.tsx'
+
+it('displays the preview card', async () => {
+	render(<FilePreview file={new File(['hello world'], 'file.txt')} />)
+
+	await expect.element(page.getByText('file.txt')).toBeVisible()
+	await expect.element(page.getByText('hello world')).toBeVisible()
+})
diff --git a/exercises/02.vitest-browser-mode/05.solution.include-assets/src/file-preview.tsx b/exercises/02.vitest-browser-mode/05.solution.include-assets/src/file-preview.tsx
@@ -0,0 +1,20 @@
+import { useEffect, useState } from 'react'
+
+export function FilePreview({ file }: { file: File }) {
+	const [previewText, setPreviewText] = useState<string>()
+
+	useEffect(() => {
+		file.text().then(setPreviewText)
+	}, [file])
+
+	return (
+		<div>
+			<div className="w-full max-w-2xl overflow-hidden rounded-md border border-slate-200 bg-white shadow-lg shadow-slate-200">
+				<p className="border-b border-slate-200 bg-slate-50 px-4 py-2 font-bold text-slate-600">
+					{file.name}
+				</p>
+				<pre className="max-h-[28ch] overflow-scroll p-4">{previewText}</pre>
+			</div>
+		</div>
+	)
+}
diff --git a/exercises/02.vitest-browser-mode/05.solution.include-assets/src/index.css b/exercises/02.vitest-browser-mode/05.solution.include-assets/src/index.css
@@ -0,0 +1,25 @@
+@import url('https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..1000;1,9..40,100..1000&display=swap');
+
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+html {
+	@apply flex size-full items-center justify-center bg-slate-100 p-10;
+
+	font-family:
+		'DM Sans',
+		system-ui,
+		-apple-system,
+		BlinkMacSystemFont,
+		'Segoe UI',
+		Roboto,
+		Oxygen,
+		Ubuntu,
+		Cantarell,
+		'Open Sans',
+		'Helvetica Neue',
+		sans-serif;
+	font-style: normal;
+	font-optical-sizing: auto;
+}
diff --git a/exercises/02.vitest-browser-mode/05.solution.include-assets/src/main.tsx b/exercises/02.vitest-browser-mode/05.solution.include-assets/src/main.tsx
@@ -0,0 +1,10 @@
+import { StrictMode } from 'react'
+import { createRoot } from 'react-dom/client'
+import './index.css'
+import { App } from './app.jsx'
+
+createRoot(document.getElementById('root')!).render(
+	<StrictMode>
+		<App />
+	</StrictMode>,
+)
diff --git a/exercises/02.vitest-browser-mode/05.solution.include-assets/src/vite-env.d.ts b/exercises/02.vitest-browser-mode/05.solution.include-assets/src/vite-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
diff --git a/exercises/02.vitest-browser-mode/05.solution.include-assets/tailwind.config.ts b/exercises/02.vitest-browser-mode/05.solution.include-assets/tailwind.config.ts
@@ -0,0 +1,9 @@
+import type { Config } from 'tailwindcss'
+
+export default {
+	content: ['./index.html', './src/**/*.{ts,tsx}'],
+	theme: {
+		extend: {},
+	},
+	plugins: [],
+} satisfies Config
diff --git a/exercises/02.vitest-browser-mode/05.solution.include-assets/tsconfig.app.json b/exercises/02.vitest-browser-mode/05.solution.include-assets/tsconfig.app.json
@@ -0,0 +1,9 @@
+{
+	"extends": "./tsconfig.base.json",
+	"compilerOptions": {
+		"target": "ES2020",
+		"module": "ESNext"
+	},
+	"include": ["src"],
+	"exclude": ["**/*.test.ts*"]
+}
diff --git a/exercises/02.vitest-browser-mode/05.solution.include-assets/tsconfig.base.json b/exercises/02.vitest-browser-mode/05.solution.include-assets/tsconfig.base.json
@@ -0,0 +1,23 @@
+{
+	"compilerOptions": {
+		"useDefineForClassFields": true,
+		"skipLibCheck": true,
+		"lib": ["ES2020", "DOM", "DOM.Iterable"],
+
+		/* Bundler mode */
+		"moduleResolution": "bundler",
+		"allowImportingTsExtensions": true,
+		"isolatedModules": true,
+		"moduleDetection": "force",
+		"noEmit": true,
+		"jsx": "react-jsx",
+		"verbatimModuleSyntax": true,
+
+		/* Linting */
+		"strict": true,
+		"noUnusedLocals": true,
+		"noUnusedParameters": true,
+		"noFallthroughCasesInSwitch": true,
+		"noUncheckedSideEffectImports": true
+	}
+}
diff --git a/exercises/02.vitest-browser-mode/05.solution.include-assets/tsconfig.json b/exercises/02.vitest-browser-mode/05.solution.include-assets/tsconfig.json
@@ -0,0 +1,8 @@
+{
+	"files": [],
+	"references": [
+		{ "path": "./tsconfig.app.json" },
+		{ "path": "./tsconfig.node.json" },
+		{ "path": "./tsconfig.test.json" }
+	]
+}
diff --git a/exercises/02.vitest-browser-mode/05.solution.include-assets/tsconfig.node.json b/exercises/02.vitest-browser-mode/05.solution.include-assets/tsconfig.node.json
@@ -0,0 +1,23 @@
+{
+	"compilerOptions": {
+		"target": "ES2022",
+		"lib": ["ES2023"],
+		"module": "ESNext",
+		"skipLibCheck": true,
+
+		/* Bundler mode */
+		"moduleResolution": "bundler",
+		"allowImportingTsExtensions": true,
+		"isolatedModules": true,
+		"moduleDetection": "force",
+		"noEmit": true,
+
+		/* Linting */
+		"strict": true,
+		"noUnusedLocals": true,
+		"noUnusedParameters": true,
+		"noFallthroughCasesInSwitch": true,
+		"noUncheckedSideEffectImports": true
+	},
+	"include": ["vite.config.ts", "vitest.browser.setup.ts"]
+}
diff --git a/exercises/02.vitest-browser-mode/05.solution.include-assets/tsconfig.test.json b/exercises/02.vitest-browser-mode/05.solution.include-assets/tsconfig.test.json
@@ -0,0 +1,9 @@
+{
+	"extends": "./tsconfig.base.json",
+	"include": ["vite.config.ts", "**/*.test.ts*"],
+	"compilerOptions": {
+		"target": "esnext",
+		"module": "preserve",
+		"types": ["@vitest/browser/providers/playwright"]
+	}
+}
diff --git a/exercises/02.vitest-browser-mode/05.solution.include-assets/vite.config.ts b/exercises/02.vitest-browser-mode/05.solution.include-assets/vite.config.ts
@@ -0,0 +1,19 @@
+/// <reference types="vitest" />
+import { defineConfig } from 'vite'
+import react from '@vitejs/plugin-react'
+
+export default defineConfig({
+	plugins: [react()],
+	test: {
+		browser: {
+			enabled: true,
+			provider: 'playwright',
+			instances: [
+				{
+					browser: 'chromium',
+					setupFiles: ['./vitest.browser.setup.ts'],
+				},
+			],
+		},
+	},
+})
diff --git a/exercises/02.vitest-browser-mode/05.solution.include-assets/vitest.browser.setup.ts b/exercises/02.vitest-browser-mode/05.solution.include-assets/vitest.browser.setup.ts
@@ -0,0 +1,2 @@
+/// <reference path="./src/vite-env.d.ts" />
+import './src/index.css'
diff --git a/tsconfig.json b/tsconfig.json
@@ -27,6 +27,9 @@
     },
     {
       "path": "exercises/02.vitest-browser-mode/04.solution.use-dom-assertions"
+    },
+    {
+      "path": "exercises/02.vitest-browser-mode/05.solution.include-assets"
     }
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module.exports = {`
	`1`	`+export default {`
`2`	`2`	`plugins: {`
`3`	`3`	`tailwindcss: {},`
`4`	`4`	`autoprefixer: {},`