From 4cea48aeb8aa72541ab104764f20e16e33cef56f Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 11 Apr 2023 09:44:21 +0200 Subject: [PATCH] Fix order of the communities --- .../resolver/CommunityResolver.test.ts | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/backend/src/graphql/resolver/CommunityResolver.test.ts b/backend/src/graphql/resolver/CommunityResolver.test.ts index 5b4b26cad..46407e80f 100644 --- a/backend/src/graphql/resolver/CommunityResolver.test.ts +++ b/backend/src/graphql/resolver/CommunityResolver.test.ts @@ -56,7 +56,7 @@ describe('CommunityResolver', () => { homeCom1.foreign = false homeCom1.publicKey = Buffer.from('publicKey-HomeCommunity') homeCom1.apiVersion = '1_0' - homeCom1.endPoint = 'http://localhost' + homeCom1.endPoint = 'http://localhost/api' homeCom1.createdAt = new Date() await DbCommunity.insert(homeCom1) @@ -64,7 +64,7 @@ describe('CommunityResolver', () => { homeCom2.foreign = false homeCom2.publicKey = Buffer.from('publicKey-HomeCommunity') homeCom2.apiVersion = '1_1' - homeCom2.endPoint = 'http://localhost' + homeCom2.endPoint = 'http://localhost/api' homeCom2.createdAt = new Date() await DbCommunity.insert(homeCom2) @@ -72,7 +72,7 @@ describe('CommunityResolver', () => { homeCom3.foreign = false homeCom3.publicKey = Buffer.from('publicKey-HomeCommunity') homeCom3.apiVersion = '2_0' - homeCom3.endPoint = 'http://localhost' + homeCom3.endPoint = 'http://localhost/api' homeCom3.createdAt = new Date() await DbCommunity.insert(homeCom3) }) @@ -82,14 +82,14 @@ describe('CommunityResolver', () => { data: { getCommunities: [ { - id: 1, - foreign: homeCom1.foreign, + id: 3, + foreign: homeCom3.foreign, publicKey: expect.stringMatching('publicKey-HomeCommunity'), - url: expect.stringMatching('http://localhost/api/1_0'), + url: expect.stringMatching('http://localhost/api/2_0'), lastAnnouncedAt: null, verifiedAt: null, lastErrorAt: null, - createdAt: homeCom1.createdAt.toISOString(), + createdAt: homeCom3.createdAt.toISOString(), updatedAt: null, }, { @@ -104,14 +104,14 @@ describe('CommunityResolver', () => { updatedAt: null, }, { - id: 3, - foreign: homeCom3.foreign, + id: 1, + foreign: homeCom1.foreign, publicKey: expect.stringMatching('publicKey-HomeCommunity'), - url: expect.stringMatching('http://localhost/api/2_0'), + url: expect.stringMatching('http://localhost/api/1_0'), lastAnnouncedAt: null, verifiedAt: null, lastErrorAt: null, - createdAt: homeCom3.createdAt.toISOString(), + createdAt: homeCom1.createdAt.toISOString(), updatedAt: null, }, ], @@ -128,7 +128,7 @@ describe('CommunityResolver', () => { foreignCom1.foreign = true foreignCom1.publicKey = Buffer.from('publicKey-ForeignCommunity') foreignCom1.apiVersion = '1_0' - foreignCom1.endPoint = 'http://remotehost' + foreignCom1.endPoint = 'http://remotehost/api' foreignCom1.createdAt = new Date() await DbCommunity.insert(foreignCom1) @@ -136,7 +136,7 @@ describe('CommunityResolver', () => { foreignCom2.foreign = true foreignCom2.publicKey = Buffer.from('publicKey-ForeignCommunity') foreignCom2.apiVersion = '1_1' - foreignCom2.endPoint = 'http://remotehost' + foreignCom2.endPoint = 'http://remotehost/api' foreignCom2.createdAt = new Date() await DbCommunity.insert(foreignCom2) @@ -144,7 +144,7 @@ describe('CommunityResolver', () => { foreignCom3.foreign = true foreignCom3.publicKey = Buffer.from('publicKey-ForeignCommunity') foreignCom3.apiVersion = '1_2' - foreignCom3.endPoint = 'http://remotehost' + foreignCom3.endPoint = 'http://remotehost/api' foreignCom3.createdAt = new Date() await DbCommunity.insert(foreignCom3) }) @@ -154,14 +154,14 @@ describe('CommunityResolver', () => { data: { getCommunities: [ { - id: 1, - foreign: homeCom1.foreign, + id: 3, + foreign: homeCom3.foreign, publicKey: expect.stringMatching('publicKey-HomeCommunity'), - url: expect.stringMatching('http://localhost/api/1_0'), + url: expect.stringMatching('http://localhost/api/2_0'), lastAnnouncedAt: null, verifiedAt: null, lastErrorAt: null, - createdAt: homeCom1.createdAt.toISOString(), + createdAt: homeCom3.createdAt.toISOString(), updatedAt: null, }, { @@ -176,25 +176,25 @@ describe('CommunityResolver', () => { updatedAt: null, }, { - id: 3, - foreign: homeCom3.foreign, + id: 1, + foreign: homeCom1.foreign, publicKey: expect.stringMatching('publicKey-HomeCommunity'), - url: expect.stringMatching('http://localhost/api/2_0'), + url: expect.stringMatching('http://localhost/api/1_0'), lastAnnouncedAt: null, verifiedAt: null, lastErrorAt: null, - createdAt: homeCom3.createdAt.toISOString(), + createdAt: homeCom1.createdAt.toISOString(), updatedAt: null, }, { - id: 4, - foreign: foreignCom1.foreign, + id: 6, + foreign: foreignCom3.foreign, publicKey: expect.stringMatching('publicKey-ForeignCommunity'), - url: expect.stringMatching('http://remotehost/api/1_0'), + url: expect.stringMatching('http://remotehost/api/1_2'), lastAnnouncedAt: null, verifiedAt: null, lastErrorAt: null, - createdAt: foreignCom1.createdAt.toISOString(), + createdAt: foreignCom3.createdAt.toISOString(), updatedAt: null, }, { @@ -209,14 +209,14 @@ describe('CommunityResolver', () => { updatedAt: null, }, { - id: 6, - foreign: foreignCom3.foreign, + id: 4, + foreign: foreignCom1.foreign, publicKey: expect.stringMatching('publicKey-ForeignCommunity'), - url: expect.stringMatching('http://remotehost/api/1_2'), + url: expect.stringMatching('http://remotehost/api/1_0'), lastAnnouncedAt: null, verifiedAt: null, lastErrorAt: null, - createdAt: foreignCom3.createdAt.toISOString(), + createdAt: foreignCom1.createdAt.toISOString(), updatedAt: null, }, ],