Revert "Add pending, and change use specific API response for FollowCommunity…" ...

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

diff --git a/api_tests/src/follow.spec.ts b/api_tests/src/follow.spec.ts
index e0389f8715b076d1a8fd13e796cc54f1dde65f3b..078c382c25b07ed1955fccaa1fd17118de86a0c9 100644 (file)
--- a/api_tests/src/follow.spec.ts
+++ b/api_tests/src/follow.spec.ts
@@ -2,12 +2,10 @@ jest.setTimeout(120000);
 import {
   alpha,
   setupLogins,
-  searchForBetaCommunity,
+  resolveBetaCommunity,
   followCommunity,
-  checkFollowedCommunities,
   unfollowRemotes,
-  delay,
-  longDelay,
+  getSite,
 } from './shared';
 
 beforeAll(async () => {
@@ -19,28 +17,29 @@ afterAll(async () => {
 });
 
 test('Follow federated community', async () => {
-  let search = await searchForBetaCommunity(alpha); // TODO sometimes this is returning null?
-  let follow = await followCommunity(alpha, true, search.communities[0].id);
+  let betaCommunity = (await resolveBetaCommunity(alpha)).community;
+  let follow = await followCommunity(
+    alpha,
+    true,
+    betaCommunity.community.id
+  );
 
   // Make sure the follow response went through
-  expect(follow.community.local).toBe(false);
-  expect(follow.community.name).toBe('main');
-  await longDelay();
+  expect(follow.community_view.community.local).toBe(false);
+  expect(follow.community_view.community.name).toBe('main');
 
   // Check it from local
-  let followCheck = await checkFollowedCommunities(alpha);
-  await delay();
-  let remoteCommunityId = followCheck.communities.filter(
-    c => c.community_local == false
-  )[0].community_id;
+  let site = await getSite(alpha);
+  let remoteCommunityId = site.my_user.follows.find(
+    c => c.community.local == false
+  ).community.id;
   expect(remoteCommunityId).toBeDefined();
 
   // Test an unfollow
   let unfollow = await followCommunity(alpha, false, remoteCommunityId);
-  expect(unfollow.community.local).toBe(false);
-  await delay();
+  expect(unfollow.community_view.community.local).toBe(false);
 
   // Make sure you are unsubbed locally
-  let unfollowCheck = await checkFollowedCommunities(alpha);
-  expect(unfollowCheck.communities.length).toBeGreaterThanOrEqual(1);
+  let siteUnfollowCheck = await getSite(alpha);
+  expect(siteUnfollowCheck.my_user.follows.length).toBeGreaterThanOrEqual(1);
 });