diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bfdc4007..f684327f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -56,4 +56,4 @@ jobs: run: npx prisma migrate deploy - name: Run tests - run: npm test + run: npm test \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index ac3d2525..23d2ab53 100644 --- a/package-lock.json +++ b/package-lock.json @@ -789,13 +789,10 @@ "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==" }, "node_modules/@prisma/client": { - "version": "5.4.2", - "resolved": "https://registry.npmjs.org/@prisma/client/-/client-5.4.2.tgz", - "integrity": "sha512-2xsPaz4EaMKj1WS9iW6MlPhmbqtBsXAOeVttSePp8vTFTtvzh2hZbDgswwBdSCgPzmmwF+tLB259QzggvCmJqA==", + "version": "5.9.1", + "resolved": "https://registry.npmjs.org/@prisma/client/-/client-5.9.1.tgz", + "integrity": "sha512-caSOnG4kxcSkhqC/2ShV7rEoWwd3XrftokxJqOCMVvia4NYV/TPtJlS9C2os3Igxw/Qyxumj9GBQzcStzECvtQ==", "hasInstallScript": true, - "dependencies": { - "@prisma/engines-version": "5.4.1-2.ac9d7041ed77bcc8a8dbd2ab6616b39013829574" - }, "engines": { "node": ">=16.13" }, @@ -814,11 +811,6 @@ "integrity": "sha512-fqeucJ3LH0e1eyFdT0zRx+oETLancu5+n4lhiYECyEz6H2RDskPJHJYHkVc0LhkU4Uv7fuEnppKU3nVKNzMh8g==", "hasInstallScript": true }, - "node_modules/@prisma/engines-version": { - "version": "5.4.1-2.ac9d7041ed77bcc8a8dbd2ab6616b39013829574", - "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.4.1-2.ac9d7041ed77bcc8a8dbd2ab6616b39013829574.tgz", - "integrity": "sha512-wvupDL4AA1vf4TQNANg7kR7y98ITqPsk6aacfBxZKtrJKRIsWjURHkZCGcQliHdqCiW/hGreO6d6ZuSv9MhdAA==" - }, "node_modules/@rgossiaux/svelte-headlessui": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@rgossiaux/svelte-headlessui/-/svelte-headlessui-2.0.0.tgz", diff --git a/playwright.config.ts b/playwright.config.ts index 30234977..28130b34 100644 --- a/playwright.config.ts +++ b/playwright.config.ts @@ -2,8 +2,11 @@ import type { PlaywrightTestConfig } from '@playwright/test' const config: PlaywrightTestConfig = { webServer: { - command: 'npm run build && npm run preview', - port: 3000, + command: 'npm run build && node server.js', + url: 'http://localhost:3000', + }, + use: { + baseURL: 'http://localhost:3000', }, testDir: 'tests', testMatch: /(.+\.)?(test|spec)\.[jt]s/, diff --git a/prisma/seed.ts b/prisma/seed.ts index 479e687f..6e7e200b 100644 --- a/prisma/seed.ts +++ b/prisma/seed.ts @@ -1,11 +1,12 @@ import { faker } from '@faker-js/faker' import { PrismaClient, Role } from '@prisma/client' -import bcrypt from 'bcryptjs' +import pkg from 'bcryptjs' import { encrypt } from '../src/lib/server/utils/crypto' import { Models } from '../src/lib/types/models' import { cleanDatabase } from './helpers' const prisma = new PrismaClient() +const { hashSync } = pkg async function seed() { if (process.env.DEPLOYMENT_ENV !== 'staging' && process.env.DEPLOYMENT_ENV !== 'development') { diff --git a/src/lib/components/ChatInput.svelte b/src/lib/components/ChatInput.svelte index b3eaacbd..fc629429 100644 --- a/src/lib/components/ChatInput.svelte +++ b/src/lib/components/ChatInput.svelte @@ -89,6 +89,7 @@ {#if !loading}