Trying to fix api tests 1

diff --git a/api_tests/src/comment.spec.ts b/api_tests/src/comment.spec.ts
index 55d0c5d46421681f5423384fd365931b83ec673e..314f18ecc5b06885587c2285e979674819ca6348 100644 (file)
--- a/api_tests/src/comment.spec.ts
+++ b/api_tests/src/comment.spec.ts
@@ -23,6 +23,7 @@ import {
   listCommentReports,
   randomString,
   API,
+  unfollows,
 } from './shared';
 import { CommentView } from 'lemmy-js-client';
 
@@ -32,6 +33,7 @@ let postRes: PostResponse;
 
 beforeAll(async () => {
   await setupLogins();
+  await unfollows();
   await followBeta(alpha);
   await followBeta(gamma);
   let betaCommunity = (await resolveBetaCommunity(alpha)).community;
@@ -42,8 +44,7 @@ beforeAll(async () => {
 });
 
 afterAll(async () => {
-  await unfollowRemotes(alpha);
-  await unfollowRemotes(gamma);
+  await unfollows();
 });
 
 function assertCommentFederation(

diff --git a/api_tests/src/post.spec.ts b/api_tests/src/post.spec.ts
index 3e834dbe4074eb82d1ffbeda4a42f14bb63bdfe7..0e9276f93e62bfa18ebbdc3552e07628e09830cb 100644 (file)
--- a/api_tests/src/post.spec.ts
+++ b/api_tests/src/post.spec.ts
@@ -29,7 +29,8 @@ import {
   randomString,
   registerUser,
   API,
-  getSite
+  getSite,
+  unfollows
 } from './shared';
 import { PostView, CommunityView } from 'lemmy-js-client';
 
@@ -46,13 +47,6 @@ afterAll(async () => {
   await unfollows();
 });
 
-async function unfollows() {
-  await unfollowRemotes(alpha);
-  await unfollowRemotes(gamma);
-  await unfollowRemotes(delta);
-  await unfollowRemotes(epsilon);
-}
-
 function assertPostFederation(postOne: PostView, postTwo: PostView) {
   expect(postOne.post.ap_id).toBe(postTwo.post.ap_id);
   expect(postOne.post.name).toBe(postTwo.post.name);
@@ -400,4 +394,4 @@ test('Report a post', async () => {
   expect(betaReport.original_post_url).toBe(alphaReport.original_post_url);
   expect(betaReport.original_post_body).toBe(alphaReport.original_post_body);
   expect(betaReport.reason).toBe(alphaReport.reason);
-});
\ No newline at end of file
+});

diff --git a/api_tests/src/shared.ts b/api_tests/src/shared.ts
index da606b1fab935c53a8121655e5771c0438bd4f78..4f305237ec908339866f7aed0ea9a147f211f013 100644 (file)
--- a/api_tests/src/shared.ts
+++ b/api_tests/src/shared.ts
@@ -653,3 +653,10 @@ export function randomString(length: number): string {
   }
   return result;
 }
+
+export async function unfollows() {
+  await unfollowRemotes(alpha);
+  await unfollowRemotes(gamma);
+  await unfollowRemotes(delta);
+  await unfollowRemotes(epsilon);
+}