From 58852a361506250da2ac35e798f4f884fbe7d5bc Mon Sep 17 00:00:00 2001 From: Piyush <91911367+piyushmishra1416@users.noreply.github.com.> Date: Fri, 24 May 2024 14:34:53 +0530 Subject: [PATCH 1/9] basic test setup --- package.json | 8 +++++++- src/app/page.test.tsx | 7 +++++++ vitest.config.ts | 9 +++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 src/app/page.test.tsx create mode 100644 vitest.config.ts diff --git a/package.json b/package.json index 8f02b6eab..4cf94111f 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "dev": "next dev", "build": "next build", "start": "next start", + "test": "vitest", "lint:check": "eslint --max-warnings 0 --config .eslintrc .", "lint:fix": "eslint --max-warnings 0 --config .eslintrc . --fix", "format:fix": "prettier --write \"**/*.{ts,tsx,json}\"", @@ -95,19 +96,24 @@ "@storybook/nextjs": "^8.0.8", "@storybook/react": "^8.0.8", "@storybook/test": "^8.0.8", + "@testing-library/jest-dom": "^6.4.5", + "@testing-library/react": "^15.0.7", "@types/node": "^20", "@types/react": "^18", "@types/react-dom": "^18", "@typescript-eslint/eslint-plugin": "^6.20.0", "@typescript-eslint/parser": "^6.20.0", + "@vitejs/plugin-react": "^4.3.0", "autoprefixer": "^10.0.1", "eslint": "^8.56.0", "eslint-plugin-storybook": "^0.8.0", "husky": "^9.0.7", + "jsdom": "^24.0.0", "postcss": "^8", "prettier": "^3.2.4", "prisma": "^5.6.0", "tailwindcss": "^3.3.0", - "ts-node": "^10.9.2" + "ts-node": "^10.9.2", + "vitest": "^1.6.0" } } diff --git a/src/app/page.test.tsx b/src/app/page.test.tsx new file mode 100644 index 000000000..9901e7cf5 --- /dev/null +++ b/src/app/page.test.tsx @@ -0,0 +1,7 @@ +import { describe, it, expect } from 'vitest'; + +describe('Example Test', () => { + it('should work correctly', () => { + expect(true).toBe(true); + }); +}); diff --git a/vitest.config.ts b/vitest.config.ts new file mode 100644 index 000000000..dc041f02c --- /dev/null +++ b/vitest.config.ts @@ -0,0 +1,9 @@ +import { defineConfig } from 'vitest/config'; +import react from '@vitejs/plugin-react'; + +export default defineConfig({ + plugins: [react()], + test: { + environment: 'jsdom', + }, +}); From ddb3522524298678538d68f4fd958c267640aef5 Mon Sep 17 00:00:00 2001 From: Piyush <91911367+piyushmishra1416@users.noreply.github.com.> Date: Fri, 24 May 2024 14:39:17 +0530 Subject: [PATCH 2/9] actual test written and test setup updated --- src/app/page.test.tsx | 14 +++++++++----- vitest.config.ts | 17 +++++++++++++---- vitest.setup.ts | 19 +++++++++++++++++++ 3 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 vitest.setup.ts diff --git a/src/app/page.test.tsx b/src/app/page.test.tsx index 9901e7cf5..7cb91d0e8 100644 --- a/src/app/page.test.tsx +++ b/src/app/page.test.tsx @@ -1,7 +1,11 @@ -import { describe, it, expect } from 'vitest'; +import { expect, test } from 'vitest'; +import { render, screen } from '@testing-library/react'; +import Page from '../app/page'; -describe('Example Test', () => { - it('should work correctly', () => { - expect(true).toBe(true); - }); +test('Page', async () => { + const ui = await Page(); + render(ui); + expect( + screen.getByRole('heading', { level: 1, name: '100xdevs' }), + ).toBeDefined(); }); diff --git a/vitest.config.ts b/vitest.config.ts index dc041f02c..c56778915 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -1,9 +1,18 @@ -import { defineConfig } from 'vitest/config'; -import react from '@vitejs/plugin-react'; - +import { defineConfig } from 'vitest/config' +import react from '@vitejs/plugin-react' + export default defineConfig({ plugins: [react()], test: { + globals: true, environment: 'jsdom', + setupFiles: ['./vitest.setup.ts'] }, -}); + resolve: { + alias: { + '@': '/src', + '@public': '/public' + + } + }, +}) \ No newline at end of file diff --git a/vitest.setup.ts b/vitest.setup.ts new file mode 100644 index 000000000..1b67e0876 --- /dev/null +++ b/vitest.setup.ts @@ -0,0 +1,19 @@ +import { vi } from "vitest"; +import '@testing-library/jest-dom' + +vi.mock("next/font/local", () => ({ + default: () => ({ + className: 'mocked-font-class', + }), +})); + +vi.mock('next/font/google', () => ({ + Poppins: () => ({ + className: 'mocked-google-font-class', + }), + })); + + vi.mock('next-auth', () => ({ + getServerSession: vi.fn(), + })); + \ No newline at end of file From b97045382340fc503959a8fc6dc9b5f7dfed293c Mon Sep 17 00:00:00 2001 From: Piyush <91911367+piyushmishra1416@users.noreply.github.com.> Date: Fri, 24 May 2024 14:40:34 +0530 Subject: [PATCH 3/9] lint fix --- vitest.config.ts | 21 ++++++++++----------- vitest.setup.ts | 21 ++++++++++----------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/vitest.config.ts b/vitest.config.ts index c56778915..4d413e425 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -1,18 +1,17 @@ -import { defineConfig } from 'vitest/config' -import react from '@vitejs/plugin-react' - +import { defineConfig } from 'vitest/config'; +import react from '@vitejs/plugin-react'; + export default defineConfig({ plugins: [react()], test: { globals: true, environment: 'jsdom', - setupFiles: ['./vitest.setup.ts'] + setupFiles: ['./vitest.setup.ts'], }, resolve: { - alias: { - '@': '/src', - '@public': '/public' - - } - }, -}) \ No newline at end of file + alias: { + '@': '/src', + '@public': '/public', + }, + }, +}); diff --git a/vitest.setup.ts b/vitest.setup.ts index 1b67e0876..1ec0ac592 100644 --- a/vitest.setup.ts +++ b/vitest.setup.ts @@ -1,19 +1,18 @@ -import { vi } from "vitest"; -import '@testing-library/jest-dom' +import { vi } from 'vitest'; +import '@testing-library/jest-dom'; -vi.mock("next/font/local", () => ({ +vi.mock('next/font/local', () => ({ default: () => ({ className: 'mocked-font-class', }), })); vi.mock('next/font/google', () => ({ - Poppins: () => ({ - className: 'mocked-google-font-class', - }), - })); + Poppins: () => ({ + className: 'mocked-google-font-class', + }), +})); - vi.mock('next-auth', () => ({ - getServerSession: vi.fn(), - })); - \ No newline at end of file +vi.mock('next-auth', () => ({ + getServerSession: vi.fn(), +})); From b62554db3ed858a046c83003e9215302483b959a Mon Sep 17 00:00:00 2001 From: Piyush <91911367+piyushmishra1416@users.noreply.github.com.> Date: Sat, 25 May 2024 12:46:24 +0530 Subject: [PATCH 4/9] mocked prisma and added an example test --- package.json | 3 +- src/app/certificate/verify/[id]/id.test.tsx | 45 +++++++++++++++++++++ src/db/__mocks__/index.ts | 10 +++++ 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 src/app/certificate/verify/[id]/id.test.tsx create mode 100644 src/db/__mocks__/index.ts diff --git a/package.json b/package.json index 4cf94111f..64f2b7fe1 100644 --- a/package.json +++ b/package.json @@ -114,6 +114,7 @@ "prisma": "^5.6.0", "tailwindcss": "^3.3.0", "ts-node": "^10.9.2", - "vitest": "^1.6.0" + "vitest": "^1.6.0", + "vitest-mock-extended": "^1.3.1" } } diff --git a/src/app/certificate/verify/[id]/id.test.tsx b/src/app/certificate/verify/[id]/id.test.tsx new file mode 100644 index 000000000..c3afaf839 --- /dev/null +++ b/src/app/certificate/verify/[id]/id.test.tsx @@ -0,0 +1,45 @@ +import { render, screen } from '@testing-library/react'; +import VerifyPage from './page'; +import { describe, expect, it, vi } from 'vitest'; +import db from '@/db/__mocks__'; + +vi.mock('@/db'); + +describe('VerifyPage', () => { + const mockCertificate = { + id: '1', + slug: 'valid-certificate', + userId: 'user1', + courseId: 1, + user: { + id: 'user1', + name: 'John Doe', + }, + course: { + id: 1, + title: 'React Course', + }, + }; + + it('renders the CertificateVerify component when the certificate is found', async () => { + db.certificate.findFirst.mockResolvedValueOnce(mockCertificate); + + const { params } = { params: { id: 'valid-certificate' } }; + render(await VerifyPage({ params })); + + expect( + screen.getByText( + 'This Certificate was issued to John Doe for completing React Course', + ), + ).toBeInTheDocument(); + }); + + it('renders "Not Found" when the certificate is not found', async () => { + db.certificate.findFirst.mockResolvedValueOnce(null); + + const { params } = { params: { id: 'invalid-certificate' } }; + render(await VerifyPage({ params })); + + expect(screen.getByText('Not Found')).toBeInTheDocument(); + }); +}); diff --git a/src/db/__mocks__/index.ts b/src/db/__mocks__/index.ts new file mode 100644 index 000000000..35044fcb4 --- /dev/null +++ b/src/db/__mocks__/index.ts @@ -0,0 +1,10 @@ +import { PrismaClient } from '@prisma/client'; +import { beforeEach } from 'vitest'; +import { mockDeep, mockReset } from 'vitest-mock-extended'; + +beforeEach(() => { + mockReset(prisma); +}); + +const prisma = mockDeep(); +export default prisma; From cd04c7235eff8cde3198a56d9896b9183845180a Mon Sep 17 00:00:00 2001 From: Piyush <91911367+piyushmishra1416@users.noreply.github.com.> Date: Sat, 25 May 2024 12:50:14 +0530 Subject: [PATCH 5/9] basic setup for collecting coverage --- package.json | 2 ++ vitest.config.ts | 3 +++ 2 files changed, 5 insertions(+) diff --git a/package.json b/package.json index 64f2b7fe1..62c0c08f7 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "build": "next build", "start": "next start", "test": "vitest", + "coverage": "vitest run --coverage", "lint:check": "eslint --max-warnings 0 --config .eslintrc .", "lint:fix": "eslint --max-warnings 0 --config .eslintrc . --fix", "format:fix": "prettier --write \"**/*.{ts,tsx,json}\"", @@ -104,6 +105,7 @@ "@typescript-eslint/eslint-plugin": "^6.20.0", "@typescript-eslint/parser": "^6.20.0", "@vitejs/plugin-react": "^4.3.0", + "@vitest/coverage-v8": "^1.6.0", "autoprefixer": "^10.0.1", "eslint": "^8.56.0", "eslint-plugin-storybook": "^0.8.0", diff --git a/vitest.config.ts b/vitest.config.ts index 4d413e425..35c6cdab3 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -7,6 +7,9 @@ export default defineConfig({ globals: true, environment: 'jsdom', setupFiles: ['./vitest.setup.ts'], + coverage: { + provider: 'v8', + }, }, resolve: { alias: { From 8a090ba95f4ce34abb89175d99029bbb42035374 Mon Sep 17 00:00:00 2001 From: Piyush <91911367+piyushmishra1416@users.noreply.github.com.> Date: Sun, 26 May 2024 19:55:58 +0530 Subject: [PATCH 6/9] integration test setup added --- package.json | 3 +- scripts/run-integration.sh | 12 ++ scripts/wait-for-it.sh | 182 +++++++++++++++++++++ src/tests/helpers/reset-db.ts | 25 +++ src/tests/helpers/setup.ts | 25 +++ src/tests/integration.test.tsx | 40 +++++ vitest.config.integration.ts | 24 +++ vitest.config.ts => vitest.config.unit..ts | 0 8 files changed, 310 insertions(+), 1 deletion(-) create mode 100755 scripts/run-integration.sh create mode 100755 scripts/wait-for-it.sh create mode 100644 src/tests/helpers/reset-db.ts create mode 100644 src/tests/helpers/setup.ts create mode 100644 src/tests/integration.test.tsx create mode 100644 vitest.config.integration.ts rename vitest.config.ts => vitest.config.unit..ts (100%) diff --git a/package.json b/package.json index 62c0c08f7..40c852075 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,8 @@ "dev": "next dev", "build": "next build", "start": "next start", - "test": "vitest", + "test": "vitest -c ./vitest.config.unit.ts", + "test:integration": "./scripts/run-integration.sh", "coverage": "vitest run --coverage", "lint:check": "eslint --max-warnings 0 --config .eslintrc .", "lint:fix": "eslint --max-warnings 0 --config .eslintrc . --fix", diff --git a/scripts/run-integration.sh b/scripts/run-integration.sh new file mode 100755 index 000000000..558e1a9ab --- /dev/null +++ b/scripts/run-integration.sh @@ -0,0 +1,12 @@ + docker run -d \ + --name db \ + -e POSTGRES_USER=postgres \ + -e POSTGRES_PASSWORD=postgres \ + -e POSTGRES_DB=mydatabase \ + -p 5432:5432 \ + postgres +echo '🟡 - Waiting for database to be ready...' +/Users/piyush/cms/scripts/wait-for-it.sh "postgresql://postgres" -- echo '🟢 - Database is ready!' +npx prisma migrate dev --name init --schema=./prisma/schema.prisma +vitest -c ./vitest.config.integration.ts +docker stop db && docker rm db diff --git a/scripts/wait-for-it.sh b/scripts/wait-for-it.sh new file mode 100755 index 000000000..d990e0d36 --- /dev/null +++ b/scripts/wait-for-it.sh @@ -0,0 +1,182 @@ +#!/usr/bin/env bash +# Use this script to test if a given TCP host/port are available + +WAITFORIT_cmdname=${0##*/} + +echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi } + +usage() +{ + cat << USAGE >&2 +Usage: + $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args] + -h HOST | --host=HOST Host or IP under test + -p PORT | --port=PORT TCP port under test + Alternatively, you specify the host and port as host:port + -s | --strict Only execute subcommand if the test succeeds + -q | --quiet Don't output any status messages + -t TIMEOUT | --timeout=TIMEOUT + Timeout in seconds, zero for no timeout + -- COMMAND ARGS Execute command with args after the test finishes +USAGE + exit 1 +} + +wait_for() +{ + if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then + echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT" + else + echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout" + fi + WAITFORIT_start_ts=$(date +%s) + while : + do + if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then + nc -z $WAITFORIT_HOST $WAITFORIT_PORT + WAITFORIT_result=$? + else + (echo -n > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1 + WAITFORIT_result=$? + fi + if [[ $WAITFORIT_result -eq 0 ]]; then + WAITFORIT_end_ts=$(date +%s) + echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds" + break + fi + sleep 1 + done + return $WAITFORIT_result +} + +wait_for_wrapper() +{ + # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692 + if [[ $WAITFORIT_QUIET -eq 1 ]]; then + timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT & + else + timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT & + fi + WAITFORIT_PID=$! + trap "kill -INT -$WAITFORIT_PID" INT + wait $WAITFORIT_PID + WAITFORIT_RESULT=$? + if [[ $WAITFORIT_RESULT -ne 0 ]]; then + echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT" + fi + return $WAITFORIT_RESULT +} + +# process arguments +while [[ $# -gt 0 ]] +do + case "$1" in + *:* ) + WAITFORIT_hostport=(${1//:/ }) + WAITFORIT_HOST=${WAITFORIT_hostport[0]} + WAITFORIT_PORT=${WAITFORIT_hostport[1]} + shift 1 + ;; + --child) + WAITFORIT_CHILD=1 + shift 1 + ;; + -q | --quiet) + WAITFORIT_QUIET=1 + shift 1 + ;; + -s | --strict) + WAITFORIT_STRICT=1 + shift 1 + ;; + -h) + WAITFORIT_HOST="$2" + if [[ $WAITFORIT_HOST == "" ]]; then break; fi + shift 2 + ;; + --host=*) + WAITFORIT_HOST="${1#*=}" + shift 1 + ;; + -p) + WAITFORIT_PORT="$2" + if [[ $WAITFORIT_PORT == "" ]]; then break; fi + shift 2 + ;; + --port=*) + WAITFORIT_PORT="${1#*=}" + shift 1 + ;; + -t) + WAITFORIT_TIMEOUT="$2" + if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi + shift 2 + ;; + --timeout=*) + WAITFORIT_TIMEOUT="${1#*=}" + shift 1 + ;; + --) + shift + WAITFORIT_CLI=("$@") + break + ;; + --help) + usage + ;; + *) + echoerr "Unknown argument: $1" + usage + ;; + esac +done + +if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then + echoerr "Error: you need to provide a host and port to test." + usage +fi + +WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15} +WAITFORIT_STRICT=${WAITFORIT_STRICT:-0} +WAITFORIT_CHILD=${WAITFORIT_CHILD:-0} +WAITFORIT_QUIET=${WAITFORIT_QUIET:-0} + +# Check to see if timeout is from busybox? +WAITFORIT_TIMEOUT_PATH=$(type -p timeout) +WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH) + +WAITFORIT_BUSYTIMEFLAG="" +if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then + WAITFORIT_ISBUSY=1 + # Check if busybox timeout uses -t flag + # (recent Alpine versions don't support -t anymore) + if timeout &>/dev/stdout | grep -q -e '-t '; then + WAITFORIT_BUSYTIMEFLAG="-t" + fi +else + WAITFORIT_ISBUSY=0 +fi + +if [[ $WAITFORIT_CHILD -gt 0 ]]; then + wait_for + WAITFORIT_RESULT=$? + exit $WAITFORIT_RESULT +else + if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then + wait_for_wrapper + WAITFORIT_RESULT=$? + else + wait_for + WAITFORIT_RESULT=$? + fi +fi + +if [[ $WAITFORIT_CLI != "" ]]; then + if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then + echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess" + exit $WAITFORIT_RESULT + fi + exec "${WAITFORIT_CLI[@]}" +else + exit $WAITFORIT_RESULT +fi diff --git a/src/tests/helpers/reset-db.ts b/src/tests/helpers/reset-db.ts new file mode 100644 index 000000000..ef956d53c --- /dev/null +++ b/src/tests/helpers/reset-db.ts @@ -0,0 +1,25 @@ +import { PrismaClient } from '@prisma/client'; + +const prisma = new PrismaClient(); + +export default async function resetDb() { + await prisma.$transaction([ + prisma.videoMetadata.deleteMany(), + prisma.notionMetadata.deleteMany(), + prisma.bookmark.deleteMany(), + prisma.comment.deleteMany(), + prisma.videoProgress.deleteMany(), + prisma.courseContent.deleteMany(), + prisma.content.deleteMany(), + prisma.certificate.deleteMany(), + prisma.userPurchases.deleteMany(), + prisma.course.deleteMany(), + prisma.session.deleteMany(), + prisma.discordConnect.deleteMany(), + prisma.discordConnectBulk.deleteMany(), + prisma.vote.deleteMany(), + prisma.answer.deleteMany(), + prisma.question.deleteMany(), + prisma.user.deleteMany(), + ]); +} diff --git a/src/tests/helpers/setup.ts b/src/tests/helpers/setup.ts new file mode 100644 index 000000000..6e2cab60c --- /dev/null +++ b/src/tests/helpers/setup.ts @@ -0,0 +1,25 @@ +import { PrismaClient } from '@prisma/client'; +import '@testing-library/jest-dom'; +import { beforeAll, beforeEach, afterAll, afterEach } from 'vitest'; +process.env.DATABASE_URL = + 'postgresql://postgres:postgres@localhost:5432/cms?schema=public'; + +const prisma = new PrismaClient(); + +beforeAll(async () => { + await prisma.$connect(); +}); + +afterAll(async () => { + await prisma.$disconnect(); +}); + +beforeEach(async () => { + // Optional: Reset the database state before each test +}); + +afterEach(async () => { + // Optional: Clean up after each test +}); + +export { prisma }; diff --git a/src/tests/integration.test.tsx b/src/tests/integration.test.tsx new file mode 100644 index 000000000..9b21ece33 --- /dev/null +++ b/src/tests/integration.test.tsx @@ -0,0 +1,40 @@ +import { render, screen } from '@testing-library/react'; +import SigninPage from '@/app/signin/page'; +import { getServerSession } from 'next-auth'; +import { redirect } from 'next/navigation'; +import { vi } from 'vitest'; + +// Mock getServerSession +vi.mock('next-auth', () => ({ + getServerSession: vi.fn(), +})); + +// Mock redirect +vi.mock('next/navigation', () => ({ + redirect: vi.fn(), + useRouter: vi.fn(), +})); + +describe('SigninPage', () => { + it('redirects to the homepage if the user is authenticated', async () => { + (getServerSession as jest.Mock).mockResolvedValueOnce({ + user: { name: 'Test User' }, + }); + + // Render the component + render(await SigninPage()); + + // Check if redirect was called + expect(redirect).toHaveBeenCalledWith('/'); + }); + + it('renders the Signin component if the user is not authenticated', async () => { + (getServerSession as jest.Mock).mockResolvedValueOnce(null); + + // Render the component + render(await SigninPage()); + + // Check if Signin component is rendered + expect(screen.getByText('Signin to your Account')).toBeInTheDocument(); + }); +}); diff --git a/vitest.config.integration.ts b/vitest.config.integration.ts new file mode 100644 index 000000000..408309f8e --- /dev/null +++ b/vitest.config.integration.ts @@ -0,0 +1,24 @@ +// vitest.config.integration.ts +import { defineConfig } from 'vitest/config'; + +import dotenv from 'dotenv'; + +dotenv.config({ path: './.env.test' }); + +process.env.DATABASE_URL = + 'postgresql://postgres:postgres@localhost:5432/cms?schema=public'; + +export default defineConfig({ + test: { + globals: true, + environment: 'jsdom', + include: ['src/tests/**/*.test.tsx'], + setupFiles: ['src/tests/helpers/setup.ts'], + }, + resolve: { + alias: { + '@': '/src', + '@public': '/public', + }, + }, +}); diff --git a/vitest.config.ts b/vitest.config.unit..ts similarity index 100% rename from vitest.config.ts rename to vitest.config.unit..ts From 9785b093c7d4b9b13ca2b72ad036ebbac9955b5c Mon Sep 17 00:00:00 2001 From: Piyush <91911367+piyushmishra1416@users.noreply.github.com.> Date: Mon, 27 May 2024 12:22:54 +0530 Subject: [PATCH 7/9] fixed env variable loading issue --- .env.test | 5 +++++ scripts/run-integration.sh | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 .env.test diff --git a/.env.test b/.env.test new file mode 100644 index 000000000..1ae9e40da --- /dev/null +++ b/.env.test @@ -0,0 +1,5 @@ + +# DONT CHANGE FOR RUNNING WITH DOCKER +# DATABASE_URL="postgresql://postgres:postgres@db:5432/cms?schema=public" +DATABASE_URL="postgresql://postgres:postgres@localhost:5432/cms?schema=public" + diff --git a/scripts/run-integration.sh b/scripts/run-integration.sh index 558e1a9ab..d123d26c7 100755 --- a/scripts/run-integration.sh +++ b/scripts/run-integration.sh @@ -1,12 +1,17 @@ +# docker compose up -d +DIR="$(cd "$(dirname "$0")" && pwd)" +export $(grep -v '^#' .env.test | xargs) docker run -d \ --name db \ -e POSTGRES_USER=postgres \ -e POSTGRES_PASSWORD=postgres \ - -e POSTGRES_DB=mydatabase \ + -e POSTGRES_DB=cms \ -p 5432:5432 \ postgres echo '🟡 - Waiting for database to be ready...' -/Users/piyush/cms/scripts/wait-for-it.sh "postgresql://postgres" -- echo '🟢 - Database is ready!' -npx prisma migrate dev --name init --schema=./prisma/schema.prisma +$DIR/wait-for-it.sh "${DATABASE_URL}" -- echo '🟢 - Database is ready!' +echo $DATABASE_URL +npx prisma migrate dev --name init vitest -c ./vitest.config.integration.ts docker stop db && docker rm db +# docker compose down From 20af16f4d146c477730dcf731da1c96aa43b5c4c Mon Sep 17 00:00:00 2001 From: Piyush <91911367+piyushmishra1416@users.noreply.github.com.> Date: Mon, 27 May 2024 13:17:53 +0530 Subject: [PATCH 8/9] removed unnecessary codes --- .env.test | 3 --- scripts/run-integration.sh | 3 +-- src/tests/helpers/setup.ts | 2 -- vitest.config.integration.ts | 8 -------- 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/.env.test b/.env.test index 1ae9e40da..6978ee21b 100644 --- a/.env.test +++ b/.env.test @@ -1,5 +1,2 @@ - -# DONT CHANGE FOR RUNNING WITH DOCKER -# DATABASE_URL="postgresql://postgres:postgres@db:5432/cms?schema=public" DATABASE_URL="postgresql://postgres:postgres@localhost:5432/cms?schema=public" diff --git a/scripts/run-integration.sh b/scripts/run-integration.sh index d123d26c7..6ef9b6f6c 100755 --- a/scripts/run-integration.sh +++ b/scripts/run-integration.sh @@ -1,4 +1,3 @@ -# docker compose up -d DIR="$(cd "$(dirname "$0")" && pwd)" export $(grep -v '^#' .env.test | xargs) docker run -d \ @@ -14,4 +13,4 @@ echo $DATABASE_URL npx prisma migrate dev --name init vitest -c ./vitest.config.integration.ts docker stop db && docker rm db -# docker compose down + diff --git a/src/tests/helpers/setup.ts b/src/tests/helpers/setup.ts index 6e2cab60c..27d27a283 100644 --- a/src/tests/helpers/setup.ts +++ b/src/tests/helpers/setup.ts @@ -1,8 +1,6 @@ import { PrismaClient } from '@prisma/client'; import '@testing-library/jest-dom'; import { beforeAll, beforeEach, afterAll, afterEach } from 'vitest'; -process.env.DATABASE_URL = - 'postgresql://postgres:postgres@localhost:5432/cms?schema=public'; const prisma = new PrismaClient(); diff --git a/vitest.config.integration.ts b/vitest.config.integration.ts index 408309f8e..1f846c8e7 100644 --- a/vitest.config.integration.ts +++ b/vitest.config.integration.ts @@ -1,13 +1,5 @@ -// vitest.config.integration.ts import { defineConfig } from 'vitest/config'; -import dotenv from 'dotenv'; - -dotenv.config({ path: './.env.test' }); - -process.env.DATABASE_URL = - 'postgresql://postgres:postgres@localhost:5432/cms?schema=public'; - export default defineConfig({ test: { globals: true, From dbd02197dd354fed3f229462691b8ef5337d1f92 Mon Sep 17 00:00:00 2001 From: Piyush <91911367+piyushmishra1416@users.noreply.github.com.> Date: Thu, 30 May 2024 12:06:44 +0530 Subject: [PATCH 9/9] fixed unit test coverage --- package.json | 2 +- vitest.config.unit..ts => vitest.config.unit.ts | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) rename vitest.config.unit..ts => vitest.config.unit.ts (82%) diff --git a/package.json b/package.json index 40c852075..6b014ebb2 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "start": "next start", "test": "vitest -c ./vitest.config.unit.ts", "test:integration": "./scripts/run-integration.sh", - "coverage": "vitest run --coverage", + "coverage": "vitest run -c ./vitest.config.unit.ts --coverage", "lint:check": "eslint --max-warnings 0 --config .eslintrc .", "lint:fix": "eslint --max-warnings 0 --config .eslintrc . --fix", "format:fix": "prettier --write \"**/*.{ts,tsx,json}\"", diff --git a/vitest.config.unit..ts b/vitest.config.unit.ts similarity index 82% rename from vitest.config.unit..ts rename to vitest.config.unit.ts index 35c6cdab3..8f0b71bca 100644 --- a/vitest.config.unit..ts +++ b/vitest.config.unit.ts @@ -6,6 +6,8 @@ export default defineConfig({ test: { globals: true, environment: 'jsdom', + include: ['src/**/*.test.tsx'], + exclude: ['src/tests/**/*.test.tsx'], setupFiles: ['./vitest.setup.ts'], coverage: { provider: 'v8',