From ed9b66541e9a7208deb556434e441049f5cf6c34 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sat, 7 May 2022 19:04:47 -0400 Subject: [PATCH] Fixing API tests. --- api_tests/package.json | 2 +- api_tests/src/comment.spec.ts | 12 ++++++------ api_tests/src/community.spec.ts | 4 ++-- api_tests/src/follow.spec.ts | 7 ++++--- api_tests/src/post.spec.ts | 2 +- api_tests/src/shared.ts | 13 +++++++------ api_tests/src/user.spec.ts | 2 +- api_tests/yarn.lock | 8 ++++---- 8 files changed, 26 insertions(+), 24 deletions(-) diff --git a/api_tests/package.json b/api_tests/package.json index 3aa57d49c..7f3a80c92 100644 --- a/api_tests/package.json +++ b/api_tests/package.json @@ -16,7 +16,7 @@ "eslint": "^7.30.0", "eslint-plugin-jane": "^9.0.3", "jest": "^27.0.6", - "lemmy-js-client": "0.16.0-rc.1", + "lemmy-js-client": "0.17.0-rc.1", "node-fetch": "^2.6.1", "prettier": "^2.3.2", "ts-jest": "^27.0.3", diff --git a/api_tests/src/comment.spec.ts b/api_tests/src/comment.spec.ts index 314f18ecc..cfb09a517 100644 --- a/api_tests/src/comment.spec.ts +++ b/api_tests/src/comment.spec.ts @@ -329,12 +329,12 @@ test('A and G subscribe to B (center) A posts, G mentions B, it gets announced t test('Check that activity from another instance is sent to third instance', async () => { // Alpha and gamma users follow beta community let alphaFollow = await followBeta(alpha); - expect(alphaFollow.community_view.community.local).toBe(false); - expect(alphaFollow.community_view.community.name).toBe('main'); + expect(alphaFollow.community_follower_view.community.local).toBe(false); + expect(alphaFollow.community_follower_view.community.name).toBe('main'); let gammaFollow = await followBeta(gamma); - expect(gammaFollow.community_view.community.local).toBe(false); - expect(gammaFollow.community_view.community.name).toBe('main'); + expect(gammaFollow.community_follower_view.community.local).toBe(false); + expect(gammaFollow.community_follower_view.community.name).toBe('main'); // Create a post on beta let betaPost = await createPost(beta, 2); @@ -407,8 +407,8 @@ test('Fetch in_reply_tos: A is unsubbed from B, B makes a post, and some embedde // Follow beta again let follow = await followBeta(alpha); - expect(follow.community_view.community.local).toBe(false); - expect(follow.community_view.community.name).toBe('main'); + expect(follow.community_follower_view.community.local).toBe(false); + expect(follow.community_follower_view.community.name).toBe('main'); // An update to the child comment on beta, should push the post, parent, and child to alpha now let updatedCommentContent = 'An update child comment from beta'; diff --git a/api_tests/src/community.spec.ts b/api_tests/src/community.spec.ts index e1f6825ae..ba12de5c4 100644 --- a/api_tests/src/community.spec.ts +++ b/api_tests/src/community.spec.ts @@ -67,7 +67,7 @@ test('Delete community', async () => { ); // Make sure the follow response went through - expect(follow.community_view.community.local).toBe(false); + expect(follow.community_follower_view.community.local).toBe(false); let deleteCommunityRes = await deleteCommunity( beta, @@ -118,7 +118,7 @@ test('Remove community', async () => { ); // Make sure the follow response went through - expect(follow.community_view.community.local).toBe(false); + expect(follow.community_follower_view.community.local).toBe(false); let removeCommunityRes = await removeCommunity( beta, diff --git a/api_tests/src/follow.spec.ts b/api_tests/src/follow.spec.ts index 078c382c2..a78a7e73f 100644 --- a/api_tests/src/follow.spec.ts +++ b/api_tests/src/follow.spec.ts @@ -25,8 +25,9 @@ test('Follow federated community', async () => { ); // Make sure the follow response went through - expect(follow.community_view.community.local).toBe(false); - expect(follow.community_view.community.name).toBe('main'); + expect(follow.community_follower_view.community.local).toBe(false); + expect(follow.community_follower_view.community.name).toBe('main'); + expect(follow.community_follower_view.pending).toBe(true); // Check it from local let site = await getSite(alpha); @@ -37,7 +38,7 @@ test('Follow federated community', async () => { // Test an unfollow let unfollow = await followCommunity(alpha, false, remoteCommunityId); - expect(unfollow.community_view.community.local).toBe(false); + expect(unfollow.community_follower_view.community.local).toBe(false); // Make sure you are unsubbed locally let siteUnfollowCheck = await getSite(alpha); diff --git a/api_tests/src/post.spec.ts b/api_tests/src/post.spec.ts index b2f12298c..82545528e 100644 --- a/api_tests/src/post.spec.ts +++ b/api_tests/src/post.spec.ts @@ -261,7 +261,7 @@ test('Remove a post from admin and community on same instance', async () => { expect(removePostRes.post_view.post.removed).toBe(true); // Make sure lemmy alpha sees post is removed - let alphaPost = await getPost(alpha, postRes.post_view.post.id); + // let alphaPost = await getPost(alpha, postRes.post_view.post.id); // expect(alphaPost.post_view.post.removed).toBe(true); // TODO this shouldn't be commented // assertPostFederation(alphaPost.post_view, removePostRes.post_view); diff --git a/api_tests/src/shared.ts b/api_tests/src/shared.ts index d5be61ac3..d4b75c7e4 100644 --- a/api_tests/src/shared.ts +++ b/api_tests/src/shared.ts @@ -11,6 +11,7 @@ import { PostResponse, SearchResponse, FollowCommunity, + FollowCommunityResponse, CommunityResponse, GetPostResponse, Register, @@ -298,7 +299,7 @@ export async function banPersonFromSite( api: API, person_id: number, ban: boolean, - remove_data: boolean, + remove_data: boolean ): Promise { // Make sure lemmy-beta/c/main is cached on lemmy_alpha let form: BanPerson = { @@ -331,7 +332,7 @@ export async function followCommunity( api: API, follow: boolean, community_id: number -): Promise { +): Promise { let form: FollowCommunity = { community_id, follow, @@ -558,7 +559,7 @@ export async function saveUserSettings( } export async function deleteUser( - api: API, + api: API ): Promise { let form: DeleteAccount = { auth: api.auth, @@ -602,7 +603,7 @@ export async function unfollowRemotes( return siteRes; } -export async function followBeta(api: API): Promise { +export async function followBeta(api: API): Promise { let betaCommunity = (await resolveBetaCommunity(api)).community; if (betaCommunity) { let follow = await followCommunity(api, true, betaCommunity.community.id); @@ -613,7 +614,7 @@ export async function followBeta(api: API): Promise { export async function reportPost( api: API, post_id: number, - reason: string, + reason: string ): Promise { let form: CreatePostReport = { post_id, @@ -633,7 +634,7 @@ export async function listPostReports(api: API): Promise { let form: CreateCommentReport = { comment_id, diff --git a/api_tests/src/user.spec.ts b/api_tests/src/user.spec.ts index 29029ac1e..7e45760e5 100644 --- a/api_tests/src/user.spec.ts +++ b/api_tests/src/user.spec.ts @@ -7,7 +7,7 @@ import { saveUserSettings, getSite, createPost, - gamma, + // gamma, resolveCommunity, createComment, resolveBetaCommunity, diff --git a/api_tests/yarn.lock b/api_tests/yarn.lock index c60da9dad..e618b26a1 100644 --- a/api_tests/yarn.lock +++ b/api_tests/yarn.lock @@ -3076,10 +3076,10 @@ language-tags@^1.0.5: dependencies: language-subtag-registry "~0.3.2" -lemmy-js-client@0.16.0-rc.1: - version "0.16.0-rc.1" - resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.16.0-rc.1.tgz#14c4a526abf4b171c8afe4efbe2a62dcaf6a6f17" - integrity sha512-0hR/gHHsokp46whIHGMBQO2zBKWM7bT6mwKNMZxPvyJo+YW9EbKTO5edjF5E4v8nf3FuIE+gFtm5NFAjCaeWJg== +lemmy-js-client@0.17.0-rc.1: + version "0.17.0-rc.1" + resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.17.0-rc.1.tgz#153fae5a06f047fe59a00847589b80736a30277b" + integrity sha512-dHkL5eXHTSxchyxn8yXj33iuh1UQ8OmebUJY6PstQPxL8ZOFBKlVEJs8UlXBJgeDkDTc2OObNpUd2uFqhEt6jg== leven@^3.1.0: version "3.1.0"