Fix tests

lukevella · Jun 16, 2024 · 7a5db60 · 7a5db60
1 parent 4fc814f
commit 7a5db60
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 23 deletions.
diff --git a/apps/web/public/locales/en/app.json b/apps/web/public/locales/en/app.json
@@ -262,5 +262,6 @@
  "upcomingEventsEmptyStateDescription": "When you schedule events, they will appear here.",
  "pastEventsEmptyStateTitle": "No Past Events",
  "pastEventsEmptyStateDescription": "When you schedule events, they will appear here.",
- "activePollCount": "{{activePollCount}} Live"
+ "activePollCount": "{{activePollCount}} Live",
+ "createPoll": "Create poll"
 }
diff --git a/apps/web/src/app/[locale]/(admin)/layout.tsx b/apps/web/src/app/[locale]/(admin)/layout.tsx
@@ -4,7 +4,6 @@ import React from "react";
 import { MobileNavigation } from "@/app/[locale]/(admin)/mobile-navigation";
 import { Sidebar } from "@/app/[locale]/(admin)/sidebar";
 import { LogoLink } from "@/app/components/logo-link";
-import { SquircleClipPath } from "@/app/components/squircle";
 
 export default async function Layout({
  children,
@@ -13,7 +12,6 @@ export default async function Layout({
 }) {
  return (
  <div className="flex flex-col pb-16 md:pb-0">
- <SquircleClipPath />
  <div
  className={cn(
  "fixed inset-y-0 z-50 hidden w-72 shrink-0 flex-col gap-y-4 overflow-y-auto p-6 py-5 md:flex",

diff --git a/apps/web/src/components/create-poll.tsx b/apps/web/src/components/create-poll.tsx
@@ -136,7 +136,7 @@ export const CreatePoll: React.FunctionComponent = () => {
  className="w-full"
  variant="primary"
  >
- <Trans i18nKey="create" />
+ <Trans i18nKey="createPoll" defaults="Create poll" />
  </Button>
  </div>
  </form>

diff --git a/apps/web/tests/authentication.spec.ts b/apps/web/tests/authentication.spec.ts
@@ -74,7 +74,7 @@ test.describe.serial(() => {
 
  await page.getByRole("button", { name: "Continue", exact: true }).click();
 
- await page.waitForURL("/polls");
+ await page.waitForURL("/");
  });
  });
 
@@ -121,7 +121,7 @@ test.describe.serial(() => {
 
  await page.getByRole("button", { name: "Continue", exact: true }).click();
 
- await page.waitForURL("/polls");
+ await page.waitForURL("/");
 
  await expect(page.getByText("Test User")).toBeVisible();
  });
@@ -141,7 +141,7 @@ test.describe.serial(() => {
 
  await page.getByRole("button", { name: "Continue", exact: true }).click();
 
- await page.waitForURL("/polls");
+ await page.waitForURL("/");
 
  await expect(page.getByText("Test User")).toBeVisible();
  });
@@ -161,7 +161,7 @@ test.describe.serial(() => {
 
  await page.getByRole("button", { name: "Continue", exact: true }).click();
 
- await page.waitForURL("/polls");
+ await page.waitForURL("/");
 
  await expect(page.getByText("Test User")).toBeVisible();
  });

diff --git a/apps/web/tests/create-delete-poll.spec.ts b/apps/web/tests/create-delete-poll.spec.ts
@@ -23,11 +23,11 @@ test.describe.serial(() => {
 
  await expect(page.getByTestId("poll-title")).toHaveText("Monthly Meetup");
 
- // const { email } = await mailServer.captureOne("[email protected]", {
- //  wait: 5000,
- // });
+ const { email } = await mailServer.captureOne("[email protected]", {
+ wait: 5000,
+ });
 
- // expect(email.headers.subject).toBe("Let's find a date for Monthly Meetup");
+ expect(email.headers.subject).toBe("Let's find a date for Monthly Meetup");
  });
 
  // delete the poll we just created
@@ -41,6 +41,6 @@ test.describe.serial(() => {
 
  deletePollDialog.getByRole("button", { name: "delete" }).click();
 
- await expect(page).toHaveURL("/polls");
+ await expect(page).toHaveURL("/");
  });
 });
diff --git a/packages/backend/trpc/routers/dashboard.ts b/packages/backend/trpc/routers/dashboard.ts
@@ -8,6 +8,7 @@ export const dashboard = router({
  where: {
  userId: ctx.user.id,
  status: "live",
+ deleted: false, // TODO (Luke Vella) [2024-06-16]: We should add deleted/cancelled to the status enum
  },
  });
 

diff --git a/packages/backend/trpc/routers/polls.ts b/packages/backend/trpc/routers/polls.ts
@@ -46,7 +46,6 @@ export const polls = router({
  return await prisma.poll.findMany({
  where: {
  userId: ctx.user.id,
- deleted: false,
  status: input.status === "all" ? undefined : input.status,
  },
  orderBy: [

diff --git a/packages/database/index.ts b/packages/database/index.ts
@@ -1,13 +1,27 @@
-import { PrismaClient } from "@rallly/database";
+import { PrismaClient } from "@prisma/client";
 
-export * from "@prisma/client";
+const prismaClientSingleton = () => {
+ return new PrismaClient().$extends({
+ query: {
+ poll: {
+ findMany: ({ args, query }) => {
+ if (args.where?.deleted === undefined) {
+ args.where = { ...args.where, deleted: false };
+ }
 
-declare global {
- // allow global `var` declarations
- // eslint-disable-next-line no-var
- var prisma: PrismaClient | undefined;
-}
+ return query(args);
+ },
+ },
+ },
+ });
+};
 
-export const prisma = global.prisma || new PrismaClient();
+declare const globalThis: {
+ prismaGlobal: ReturnType<typeof prismaClientSingleton>;
+} & typeof global;
 
-if (process.env.NODE_ENV !== "production") global.prisma = prisma;
+const prisma = globalThis.prismaGlobal ?? prismaClientSingleton();
+
+export { prisma };
+
+if (process.env.NODE_ENV !== "production") globalThis.prismaGlobal = prisma;