git.delta.rocks / unique-network / refs/commits / e358d8144394

--- a/js-packages/tests/sub/governance/council.test.ts
+++ b/js-packages/tests/sub/governance/council.test.ts
@@ -211,14 +211,14 @@
     expect(finCouncilMembers).to.contains(newFinCouncilMember.address);
   });
 
-  itSub.skip('Council member can add Fellowship member', async ({helper}) => {
+  itSub('Council member can add Fellowship member', async ({helper}) => {
     const newFellowshipMember = helper.arrange.createEmptyAccount();
     await expect(helper.council.collective.execute(
       counselors.alex,
       helper.fellowship.collective.addMemberCall(newFellowshipMember.address),
     )).to.be.fulfilled;
-    const fellowshipMembers = (await helper.callRpc('api.query.fellowshipCollective.members')).toJSON();
-    expect(fellowshipMembers).to.contains(newFellowshipMember.address);
+    expect(await helper.fellowship.collective.getMembers()).to.be.deep.contain(newFellowshipMember.address);
+    await clearFellowship(sudoer);
   });
 
   itSub('>50% Council can promote Fellowship member', async ({helper}) => {
@@ -246,16 +246,14 @@
     await clearFellowship(sudoer);
   });
 
-  itSub('>50% Council can add\remove Fellowship member', async ({helper}) => {
+  itSub('>50% Council can remove Fellowship member', async ({helper}) => {
     try {
-      const newMember = helper.arrange.createEmptyAccount();
+      const fellowship = await initFellowship(donor, sudoer);
+      const memberRank6 = fellowship[6][0];
 
-      const proposalAdd = helper.fellowship.collective.addMemberCall(newMember.address);
-      const proposalRemove = helper.fellowship.collective.removeMemberCall(newMember.address, fellowshipRankLimit);
-      await expect(proposalFromMoreThanHalfCouncil(proposalAdd)).to.be.fulfilled;
-      expect(await helper.fellowship.collective.getMembers()).to.be.deep.contain(newMember.address);
+      const proposalRemove = helper.fellowship.collective.removeMemberCall(memberRank6.address, fellowshipRankLimit);
       await expect(proposalFromMoreThanHalfCouncil(proposalRemove)).to.be.fulfilled;
-      expect(await helper.fellowship.collective.getMembers()).to.be.not.deep.contain(newMember.address);
+      expect(await helper.fellowship.collective.getMembers()).to.be.not.deep.contain(memberRank6.address);
     }
     finally {
       await clearFellowship(sudoer);

119    Event.FellowshipReferenda.Cancelled.expect(cancelProposal);119    Event.FellowshipReferenda.Cancelled.expect(cancelProposal);
120  });120  });
121121
122  itSub.skip('TechComm member can add a Fellowship member', async ({helper}) => {122  itSub('TechComm member can add a Fellowship member', async ({helper}) => {
123    const newFellowshipMember = helper.arrange.createEmptyAccount();123    const newFellowshipMember = helper.arrange.createEmptyAccount();
124    await expect(helper.technicalCommittee.collective.execute(124    await expect(helper.technicalCommittee.collective.execute(
125      techcomms.andy,125      techcomms.andy,
126      helper.fellowship.collective.addMemberCall(newFellowshipMember.address),126      helper.fellowship.collective.addMemberCall(newFellowshipMember.address),
127    )).to.be.fulfilled;127    )).to.be.fulfilled;
128    const fellowshipMembers = (await helper.callRpc('api.query.fellowshipCollective.members')).toJSON();
129    expect(fellowshipMembers).to.contains(newFellowshipMember.address);128    expect(await helper.fellowship.collective.getMembers()).to.be.deep.contain(newFellowshipMember.address);
130    await clearFellowship(sudoer);129    await clearFellowship(sudoer);
131  });130  });
132131
235  });234  });
236235
237236
238  itSub.skip('[Negative] TechComm cannot promote/demote Fellowship member', async () => {237  itSub('[Negative] TechComm cannot promote/demote Fellowship member', async ({helper}) => {
239238    const fellowship = await initFellowship(donor, sudoer);
239    const memberWithRankOne = fellowship[1][0];
240
241    const promoteProposal = helper.fellowship.collective.promoteCall(memberWithRankOne.address);
242    await expect(proposalFromAllCommittee(promoteProposal)).rejectedWith('BadOrigin');
243
244    const demoteProposal = helper.fellowship.collective.demoteCall(memberWithRankOne.address);
245    await expect(proposalFromAllCommittee(demoteProposal)).rejectedWith('BadOrigin');
246
247    await clearFellowship(sudoer);
240  });248  });
241249
242  itSub.skip('[Negative] TechComm member cannot promote/demote Fellowship member', async () => {250  itSub('[Negative] TechComm member cannot promote/demote Fellowship member', async ({helper}) => {
243251    const fellowship = await initFellowship(donor, sudoer);
252    const memberWithRankOne = fellowship[1][0];
253
254    const promoteProposal = helper.fellowship.collective.promoteCall(memberWithRankOne.address);
255    await expect(helper.technicalCommittee.collective.execute(
256      techcomms.andy,
257      promoteProposal,
258    )).to.be.rejectedWith('BadOrigin');
259
260    const demoteProposal = helper.fellowship.collective.demoteCall(memberWithRankOne.address);
261    await expect(helper.technicalCommittee.collective.execute(
262      techcomms.andy,
263      demoteProposal,
264    )).to.be.rejectedWith('BadOrigin');
265
266    await clearFellowship(sudoer);
244  });267  });
245268
246  itSub('[Negative] TechComm cannot add/remove a Council member', async ({helper}) => {269  itSub('[Negative] TechComm cannot add/remove a Council member', async ({helper}) => {