cleanup

* update to latest @snowtop/ent * update to latest jest * remove uses of fail in test as it doesn't seem it's being fixed anytime soon per DefinitelyTyped/DefinitelyTyped#55803 and jestjs/jest#11698
lolopinto · Dec 7, 2021 · f1c2687 · f1c2687
1 parent b969f2c
commit f1c2687
Show file tree

Hide file tree

Showing 36 changed files with 5,023 additions and 7,219 deletions.
diff --git a/examples/ent-rsvp/backend/package-lock.json b/examples/ent-rsvp/backend/package-lock.json
diff --git a/examples/ent-rsvp/backend/package.json b/examples/ent-rsvp/backend/package.json
@@ -28,7 +28,7 @@
   "dependencies": {
     "@sentry/node": "^6.3.0",
     "@sentry/tracing": "^6.3.0",
-    "@snowtop/ent": "^0.0.28-alpha.2",
+    "@snowtop/ent": "^0.0.28",
     "@snowtop/ent-email": "0.0.1",
     "@snowtop/ent-passport": "0.0.1",
     "@snowtop/ent-password": "0.0.1",
@@ -54,9 +54,9 @@
     "@types/luxon": "^2.0.4",
     "@types/passport": "^1.0.7",
     "@types/supertest": "^2.0.11",
-    "jest": "^27.1.1",
+    "jest": "^27.4.3",
     "jest-expect-message": "^1.0.2",
-    "ts-jest": "^27.0.5",
+    "ts-jest": "^27.1.0",
     "tsconfig-paths": "^3.11.0"
   }
 }
diff --git a/examples/ent-rsvp/backend/src/ent/tests/event.test.ts b/examples/ent-rsvp/backend/src/ent/tests/event.test.ts
@@ -23,7 +23,7 @@ describe("create event", () => {
       await CreateEventAction.create(new LoggedOutViewer(), {
         name: `${user.firstName}'s wedding`,
       }).saveX();
-      fail("should have thrown");
+      throw new Error("should have thrown");
     } catch (e) {
       expect((e as Error).message).toMatch(
         /Logged out Viewer does not have permission to create Event/,
@@ -69,7 +69,7 @@ describe("create event", () => {
     const activity = activities.find((a) => a.name == "closing brunch");
     expect(activity).toBeDefined();
     if (!activity) {
-      fail("impossicant");
+      throw new Error("impossicant");
     }
     const address = await Address.loadFromOwnerID(activity.viewer, activity.id);
     expect(address).not.toBe(null);

diff --git a/examples/ent-rsvp/backend/src/ent/tests/event_activity.test.ts b/examples/ent-rsvp/backend/src/ent/tests/event_activity.test.ts
@@ -42,7 +42,7 @@ describe("create event activity", () => {
         name: "welcome dinner",
         eventID: event.id,
       }).saveX();
-      fail("should have thrown");
+      throw new Error("should have thrown");
     } catch (e) {
       expect((e as Error).message).toMatch(
         /Viewer with ID (.+) does not have permission to create EventActivity/,
@@ -93,7 +93,7 @@ describe("load activity", () => {
     ]);
     try {
       await EventActivity.loadX(new IDViewer(user.id), activity.id);
-      fail("should have thrown");
+      throw new Error("should have thrown");
     } catch (e) {
       expect((e as Error).message).toMatch(
         /^ent (.+) is not visible for privacy reasons$/,
@@ -123,7 +123,7 @@ describe("invites", () => {
         activity.id,
         group.id,
       );
-      fail("should have thrown");
+      throw new Error("should have thrown");
     } catch (e) {
       expect((e as Error).message).toMatch(
         /^ent (.+) is not visible for privacy reasons$/,
@@ -148,7 +148,7 @@ describe("invites", () => {
         activity2.id,
         group.id,
       );
-      fail("should have thrown");
+      throw new Error("should have thrown");
     } catch (e) {
       expect((e as Error).message).toMatch(
         /Viewer with ID (.+) does not have permission to edit EventActivity/,
@@ -187,7 +187,7 @@ describe("invites", () => {
         activity.id,
         group.id,
       );
-      fail("should have thrown");
+      throw new Error("should have thrown");
     } catch (e) {
       expect((e as Error).message).toMatch(
         /^ent (.+) is not visible for privacy reasons$/,
@@ -209,7 +209,7 @@ describe("invites", () => {
         activity.id,
         group2.id,
       );
-      fail("should have thrown");
+      throw new Error("should have thrown");
     } catch (e) {
       expect((e as Error).message).toMatch(
         /Viewer with ID (.+) does not have permission to edit EventActivity/,
@@ -510,7 +510,7 @@ describe("rsvps", () => {
           rsvpStatus: EventActivityRsvpStatusInput.Attending,
         },
       );
-      fail("should have thrown");
+      throw new Error("should have thrown");
     } catch (e) {
       expect((e as Error).message).toMatch(
         /^ent (.+) is not visible for privacy reasons$/,
@@ -540,7 +540,7 @@ describe("rsvps", () => {
           rsvpStatus: EventActivityRsvpStatusInput.Attending,
         },
       );
-      fail("should have thrown");
+      throw new Error("should have thrown");
     } catch (e) {
       expect((e as Error).message).toMatch(
         /^ent (.+) is not visible for privacy reasons$/,

diff --git a/examples/ent-rsvp/backend/src/ent/tests/guest.test.ts b/examples/ent-rsvp/backend/src/ent/tests/guest.test.ts
@@ -91,14 +91,14 @@ test("create guests", async () => {
   expect(guest).toBeInstanceOf(Guest);
 
   if (!guest) {
-    fail("impossicant");
+    throw new Error("impossicant");
   }
 
   const code = await AuthCode.loadFromGuestID(guest.viewer, guest.id);
   expect(code).toBeInstanceOf(AuthCode);
 
   if (!code) {
-    fail("impossicant");
+    throw new Error("impossicant");
   }
   expect(code.emailAddress).toBe(guest.emailAddress);
   expect(code.guestID).toBe(guest.id);

diff --git a/examples/ent-rsvp/backend/src/ent/tests/guest_group.test.ts b/examples/ent-rsvp/backend/src/ent/tests/guest_group.test.ts
@@ -37,7 +37,7 @@ describe("create guest group", () => {
         invitationName: "people",
         eventID: event.id,
       }).saveX();
-      fail("should have thrown");
+      throw new Error("should have thrown");
     } catch (e) {
       expect((e as Error).message).toMatch(
         /Viewer with ID (.+) does not have permission to create GuestGroup/,
@@ -112,7 +112,7 @@ test("load guest group", async () => {
 
   try {
     await GuestGroup.loadX(new IDViewer(user.id), guestGroup.id);
-    fail("should have thrown");
+    throw new Error("should have thrown");
   } catch (e) {
     expect((e as Error).message).toMatch(
       /^ent (.+) is not visible for privacy reasons$/,
@@ -135,7 +135,7 @@ describe("edit guest group", () => {
       await EditGuestGroupAction.create(new IDViewer(user.id), group, {
         invitationName: "foo",
       }).saveX();
-      fail("should have thrown");
+      throw new Error("should have thrown");
     } catch (e) {
       expect((e as Error).message).toMatch(
         /Viewer with ID (.+) does not have permission to edit GuestGroup/,
@@ -156,7 +156,7 @@ describe("delete guest group", () => {
     const [group, user] = await Promise.all([createGuestGroup(), createUser()]);
     try {
       await DeleteGuestGroupAction.create(new IDViewer(user.id), group).saveX();
-      fail("should have thrown");
+      throw new Error("should have thrown");
     } catch (e) {
       expect((e as Error).message).toMatch(
         /Viewer with ID (.+) does not have permission to delete GuestGroup/,