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

difftreelog

Merge pull request #1078 from UniqueNetwork/fix/gov-tests-1.9

Yaroslav Bolyukin2024-07-16parents: #f48afb4 #05c81ca.patch.diff
in: master

2 files changed

modifiedjs-packages/tests/sub/governance/council.test.tsdiffbeforeafterboth
211 expect(finCouncilMembers).to.contains(newFinCouncilMember.address);211 expect(finCouncilMembers).to.contains(newFinCouncilMember.address);
212 });212 });
213213
214 itSub.skip('Council member can add Fellowship member', async ({helper}) => {214 itSub('Council member can add Fellowship member', async ({helper}) => {
215 const newFellowshipMember = helper.arrange.createEmptyAccount();215 const newFellowshipMember = helper.arrange.createEmptyAccount();
216 await expect(helper.council.collective.execute(216 await expect(helper.council.collective.execute(
217 counselors.alex,217 counselors.alex,
218 helper.fellowship.collective.addMemberCall(newFellowshipMember.address),218 helper.fellowship.collective.addMemberCall(newFellowshipMember.address),
219 )).to.be.fulfilled;219 )).to.be.fulfilled;
220 const fellowshipMembers = (await helper.callRpc('api.query.fellowshipCollective.members')).toJSON();220 expect(await helper.fellowship.collective.getMembers()).to.be.deep.contain(newFellowshipMember.address);
221 expect(fellowshipMembers).to.contains(newFellowshipMember.address);221 await clearFellowship(sudoer);
222 });222 });
223223
224 itSub('>50% Council can promote Fellowship member', async ({helper}) => {224 itSub('>50% Council can promote Fellowship member', async ({helper}) => {
246 await clearFellowship(sudoer);246 await clearFellowship(sudoer);
247 });247 });
248248
249 itSub('>50% Council can add\remove Fellowship member', async ({helper}) => {249 itSub('>50% Council can remove Fellowship member', async ({helper}) => {
250 try {250 try {
251 const newMember = helper.arrange.createEmptyAccount();251 const fellowship = await initFellowship(donor, sudoer);
252
253 const proposalAdd = helper.fellowship.collective.addMemberCall(newMember.address);252 const memberRank6 = fellowship[6][0];
253
254 const proposalRemove = helper.fellowship.collective.removeMemberCall(newMember.address, fellowshipRankLimit);254 const proposalRemove = helper.fellowship.collective.removeMemberCall(memberRank6.address, fellowshipRankLimit);
255 await expect(proposalFromMoreThanHalfCouncil(proposalAdd)).to.be.fulfilled;
256 expect(await helper.fellowship.collective.getMembers()).to.be.deep.contain(newMember.address);
257 await expect(proposalFromMoreThanHalfCouncil(proposalRemove)).to.be.fulfilled;255 await expect(proposalFromMoreThanHalfCouncil(proposalRemove)).to.be.fulfilled;
258 expect(await helper.fellowship.collective.getMembers()).to.be.not.deep.contain(newMember.address);256 expect(await helper.fellowship.collective.getMembers()).to.be.not.deep.contain(memberRank6.address);
259 }257 }
260 finally {258 finally {
261 await clearFellowship(sudoer);259 await clearFellowship(sudoer);
modifiedjs-packages/tests/sub/governance/technicalCommittee.test.tsdiffbeforeafterboth
--- a/js-packages/tests/sub/governance/technicalCommittee.test.ts
+++ b/js-packages/tests/sub/governance/technicalCommittee.test.ts
@@ -119,14 +119,13 @@
     Event.FellowshipReferenda.Cancelled.expect(cancelProposal);
   });
 
-  itSub.skip('TechComm member can add a Fellowship member', async ({helper}) => {
+  itSub('TechComm member can add a Fellowship member', async ({helper}) => {
     const newFellowshipMember = helper.arrange.createEmptyAccount();
     await expect(helper.technicalCommittee.collective.execute(
       techcomms.andy,
       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);
   });
 
@@ -235,12 +234,36 @@
   });
 
 
-  itSub.skip('[Negative] TechComm cannot promote/demote Fellowship member', async () => {
+  itSub('[Negative] TechComm cannot promote/demote Fellowship member', async ({helper}) => {
+    const fellowship = await initFellowship(donor, sudoer);
+    const memberWithRankOne = fellowship[1][0];
 
+    const promoteProposal = helper.fellowship.collective.promoteCall(memberWithRankOne.address);
+    await expect(proposalFromAllCommittee(promoteProposal)).rejectedWith('BadOrigin');
+
+    const demoteProposal = helper.fellowship.collective.demoteCall(memberWithRankOne.address);
+    await expect(proposalFromAllCommittee(demoteProposal)).rejectedWith('BadOrigin');
+
+    await clearFellowship(sudoer);
   });
 
-  itSub.skip('[Negative] TechComm member cannot promote/demote Fellowship member', async () => {
+  itSub('[Negative] TechComm member cannot promote/demote Fellowship member', async ({helper}) => {
+    const fellowship = await initFellowship(donor, sudoer);
+    const memberWithRankOne = fellowship[1][0];
+
+    const promoteProposal = helper.fellowship.collective.promoteCall(memberWithRankOne.address);
+    await expect(helper.technicalCommittee.collective.execute(
+      techcomms.andy,
+      promoteProposal,
+    )).to.be.rejectedWith('BadOrigin');
+
+    const demoteProposal = helper.fellowship.collective.demoteCall(memberWithRankOne.address);
+    await expect(helper.technicalCommittee.collective.execute(
+      techcomms.andy,
+      demoteProposal,
+    )).to.be.rejectedWith('BadOrigin');
 
+    await clearFellowship(sudoer);
   });
 
   itSub('[Negative] TechComm cannot add/remove a Council member', async ({helper}) => {