Fix logged in user tests

Author: gustavlrsn

lib/__tests__/LoggedInUser.test.js

@@ -1,46 +1,51 @@
 import LoggedInUser from '../LoggedInUser';
 
 // Define some test collectives
-const randomCollective = { id: 1, type: 'COLLECTIVE', slug: 'random-collective' };
-const backedCollective = { id: 2, type: 'COLLECTIVE', slug: 'backed-collective' };
-const adminCollective = { id: 3, type: 'COLLECTIVE', slug: 'admin-collective' };
-const memberCollective = { id: 4, type: 'COLLECTIVE', slug: 'member-collective' };
-const hostAdmin = { id: 5, type: 'ORGANIZATION', slug: 'admin-host', isHost: true };
-const hostAdminCollective = { id: 6, type: 'COLLECTIVE', slug: 'admin-host-collective', host: hostAdmin };
-const hostedCollective = { id: 7, type: 'COLLECTIVE', slug: 'hosted-collective' };
+const randomCollective = { legacyId: 1, type: 'COLLECTIVE', slug: 'random-collective' };
+const backedCollective = { legacyId: 2, type: 'COLLECTIVE', slug: 'backed-collective' };
+const adminCollective = { legacyId: 3, type: 'COLLECTIVE', slug: 'admin-collective' };
+const memberCollective = { legacyId: 4, type: 'COLLECTIVE', slug: 'member-collective' };
+const hostAdmin = { legacyId: 5, type: 'ORGANIZATION', slug: 'admin-host', isHost: true };
+const hostAdminCollective = { legacyId: 6, type: 'COLLECTIVE', slug: 'admin-host-collective', host: hostAdmin };
+const hostedCollective = { legacyId: 7, type: 'COLLECTIVE', slug: 'hosted-collective' };
 const randomEventCollective = {
-  id: 15,
+  legacyId: 15,
   type: 'EVENT',
   slug: 'random-event-collective',
   parentCollective: randomCollective,
 };
 const adminEventCollective = {
-  id: 16,
+  legacyId: 16,
   type: 'EVENT',
   slug: 'admin-event-collective',
   parentCollective: randomCollective,
 };
 const adminEventCollectiveParent = {
-  id: 17,
+  legacyId: 17,
   type: 'EVENT',
   slug: 'admin-event-collective-parent',
   parentCollective: adminCollective,
 };
 
 const testUser = new LoggedInUser({
-  id: 2,
-  memberOf: [
-    { collective: backedCollective, role: 'BACKER' },
-    { collective: adminCollective, role: 'ADMIN' },
-    { collective: memberCollective, role: 'MEMBER' },
-    { collective: adminEventCollective, role: 'ADMIN' },
-    { collective: hostAdmin, role: 'ADMIN' },
-    { collective: hostedCollective, role: 'HOST' },
-  ],
-  CollectiveId: 1000,
-  collective: {
-    id: 1000,
-    slug: 'test-user-collective',
+  legacyId: 1000,
+  slug: 'test-user-collective',
+  memberOf: {
+    nodes: [
+      { account: backedCollective, role: 'BACKER' },
+      { account: adminCollective, role: 'ADMIN' },
+      { account: memberCollective, role: 'MEMBER' },
+      { account: adminEventCollective, role: 'ADMIN' },
+      { account: hostAdmin, role: 'ADMIN' },
+      { account: hostedCollective, role: 'HOST' },
+    ],
+  },
+  workspaces: {
+    nodes: [
+      { account: adminCollective, role: 'ADMIN' },
+      { account: adminEventCollective, role: 'ADMIN' },
+      { account: hostAdmin, role: 'ADMIN' },
+    ],
   },
 });
 
@@ -89,7 +94,7 @@ describe('Collectives', () => {
       expect(testUser.isAdminOfCollectiveOrHost(adminCollective)).toBe(true);
       expect(testUser.isAdminOfCollectiveOrHost(adminEventCollective)).toBe(true);
       expect(testUser.isAdminOfCollectiveOrHost(adminEventCollectiveParent)).toBe(true);
-      expect(testUser.isAdminOfCollectiveOrHost(testUser.collective)).toBe(true);
+      expect(testUser.isAdminOfCollectiveOrHost(testUser)).toBe(true);
     });
   });
 
@@ -104,7 +109,7 @@ describe('Collectives', () => {
       expect(testUser.isAdminOfCollective(adminCollective)).toBe(true);
       expect(testUser.isAdminOfCollective(adminEventCollective)).toBe(true);
       expect(testUser.isAdminOfCollective(adminEventCollectiveParent)).toBe(true);
-      expect(testUser.isAdminOfCollective(testUser.collective)).toBe(true);
+      expect(testUser.isAdminOfCollective(testUser)).toBe(true);
     });
   });
 });
@@ -131,7 +136,7 @@ describe('Comments', () => {
 
       expect(testUser.canEditComment({ account: adminCollective })).toBe(true);
       expect(testUser.canEditComment({ account: adminEventCollective })).toBe(true);
-      expect(testUser.canEditComment({ account: randomCollective, fromAccount: testUser.collective })).toBe(true);
+      expect(testUser.canEditComment({ account: randomCollective, fromAccount: testUser })).toBe(true);
       expect(testUser.canEditComment({ account: adminEventCollectiveParent })).toBe(true);
     });
   });