Moving settings to Database. (#2492)

[lemmy.git] / api_tests / src / private_message.spec.ts

diff --git a/api_tests/src/private_message.spec.ts b/api_tests/src/private_message.spec.ts
index 8bb00e127dc422dff5119ea4e374b909f9194ffe..751f722303445c4fbd62235f7619b5e614a1b75e 100644 (file)
--- a/api_tests/src/private_message.spec.ts
+++ b/api_tests/src/private_message.spec.ts
@@ -9,30 +9,26 @@ import {
   listPrivateMessages,
   deletePrivateMessage,
   unfollowRemotes,
-  delay,
-  longDelay,
-} from './shared';
+} from "./shared";
 
 let recipient_id: number;
 
 beforeAll(async () => {
   await setupLogins();
-  let follow = await followBeta(alpha);
-  await longDelay();
-  recipient_id = follow.community_view.creator.id;
+  await followBeta(alpha);
+  recipient_id = 3;
 });
 
 afterAll(async () => {
   await unfollowRemotes(alpha);
 });
 
-test('Create a private message', async () => {
+test("Create a private message", async () => {
   let pmRes = await createPrivateMessage(alpha, recipient_id);
   expect(pmRes.private_message_view.private_message.content).toBeDefined();
   expect(pmRes.private_message_view.private_message.local).toBe(true);
   expect(pmRes.private_message_view.creator.local).toBe(true);
   expect(pmRes.private_message_view.recipient.local).toBe(false);
-  await delay();
 
   let betaPms = await listPrivateMessages(beta);
   expect(betaPms.private_messages[0].private_message.content).toBeDefined();
@@ -41,8 +37,8 @@ test('Create a private message', async () => {
   expect(betaPms.private_messages[0].recipient.local).toBe(true);
 });
 
-test('Update a private message', async () => {
-  let updatedContent = 'A jest test federated private message edited';
+test("Update a private message", async () => {
+  let updatedContent = "A jest test federated private message edited";
 
   let pmRes = await createPrivateMessage(alpha, recipient_id);
   let pmUpdated = await editPrivateMessage(
@@ -52,7 +48,6 @@ test('Update a private message', async () => {
   expect(pmUpdated.private_message_view.private_message.content).toBe(
     updatedContent
   );
-  await longDelay();
 
   let betaPms = await listPrivateMessages(beta);
   expect(betaPms.private_messages[0].private_message.content).toBe(
@@ -60,9 +55,8 @@ test('Update a private message', async () => {
   );
 });
 
-test('Delete a private message', async () => {
+test("Delete a private message", async () => {
   let pmRes = await createPrivateMessage(alpha, recipient_id);
-  await delay();
   let betaPms1 = await listPrivateMessages(beta);
   let deletedPmRes = await deletePrivateMessage(
     alpha,
@@ -70,7 +64,7 @@ test('Delete a private message', async () => {
     pmRes.private_message_view.private_message.id
   );
   expect(deletedPmRes.private_message_view.private_message.deleted).toBe(true);
-  await delay();
+  expect(deletedPmRes.private_message_view.private_message.content).toBe("");
 
   // The GetPrivateMessages filters out deleted,
   // even though they are in the actual database.
@@ -79,7 +73,6 @@ test('Delete a private message', async () => {
   expect(betaPms2.private_messages.length).toBe(
     betaPms1.private_messages.length - 1
   );
-  await delay();
 
   // Undelete
   let undeletedPmRes = await deletePrivateMessage(
@@ -90,7 +83,6 @@ test('Delete a private message', async () => {
   expect(undeletedPmRes.private_message_view.private_message.deleted).toBe(
     false
   );
-  await longDelay();
 
   let betaPms3 = await listPrivateMessages(beta);
   expect(betaPms3.private_messages.length).toBe(